"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "dlls/d3dx10_43/d3dx10_43_main.c" between
wine-5.12.tar.xz and wine-5.13.tar.xz

About: Wine is an Open Source implementation of the MS Windows API on top of X, OpenGL, and Unix. Think of Wine as a compatibility layer for running Windows programs. Development release.

d3dx10_43_main.c  (wine-5.12.tar.xz):d3dx10_43_main.c  (wine-5.13.tar.xz)
skipping to change at line 35 skipping to change at line 35
#define COBJMACROS #define COBJMACROS
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
#include "d3d10_1.h" #include "d3d10_1.h"
#include "d3dx10.h" #include "d3dx10.h"
#include "wincodec.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx); WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactor
y **imaging_factory);
static const struct
{
const GUID *wic_container_guid;
D3DX10_IMAGE_FILE_FORMAT d3dx_file_format;
}
file_formats[] =
{
{ &GUID_ContainerFormatBmp, D3DX10_IFF_BMP },
{ &GUID_ContainerFormatJpeg, D3DX10_IFF_JPG },
{ &GUID_ContainerFormatPng, D3DX10_IFF_PNG },
{ &GUID_ContainerFormatDds, D3DX10_IFF_DDS },
{ &GUID_ContainerFormatTiff, D3DX10_IFF_TIFF },
{ &GUID_ContainerFormatGif, D3DX10_IFF_GIF },
{ &GUID_ContainerFormatWmp, D3DX10_IFF_WMP },
};
static D3DX10_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *containe
r_format)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(file_formats); ++i)
{
if (IsEqualGUID(file_formats[i].wic_container_guid, container_format))
return file_formats[i].d3dx_file_format;
}
return D3DX10_IFF_FORCE_DWORD;
}
static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio
n wic_dimension)
{
switch (wic_dimension)
{
case WICDdsTexture1D:
return D3D10_RESOURCE_DIMENSION_TEXTURE1D;
case WICDdsTexture2D:
case WICDdsTextureCube:
return D3D10_RESOURCE_DIMENSION_TEXTURE2D;
case WICDdsTexture3D:
return D3D10_RESOURCE_DIMENSION_TEXTURE3D;
default:
return D3D10_RESOURCE_DIMENSION_UNKNOWN;
}
}
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
switch (fdwReason) switch (fdwReason)
{ {
case DLL_WINE_PREATTACH: case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */ return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL); DisableThreadLibraryCalls(hinstDLL);
break; break;
} }
skipping to change at line 232 skipping to change at line 279
HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi ce1) HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi ce1)
{ {
TRACE("device %p, device1 %p.\n", device, device1); TRACE("device %p, device1 %p.\n", device, device1);
return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)devi ce1); return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)devi ce1);
} }
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat a_size, ID3DX10ThreadPump *pump, HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat a_size, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) D3DX10_IMAGE_INFO *img_info, HRESULT *hresult)
{ {
FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", IWICBitmapFrameDecode *frame = NULL;
IWICImagingFactory *factory = NULL;
IWICDdsDecoder *dds_decoder = NULL;
IWICBitmapDecoder *decoder = NULL;
WICDdsParameters dds_params;
IWICStream *stream = NULL;
unsigned int frame_count;
GUID container_format;
HRESULT hr;
TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n",
src_data, src_data_size, pump, img_info, hresult); src_data, src_data_size, pump, img_info, hresult);
return E_NOTIMPL; if (!src_data || !src_data_size || !img_info)
return E_FAIL;
if (pump)
FIXME("Thread pump is not supported yet.\n");
WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory);
IWICImagingFactory_CreateStream(factory, &stream);
hr = IWICStream_InitializeFromMemory(stream, (BYTE *)src_data, src_data_size
);
if (FAILED(hr))
{
WARN("Failed to initialize stream.\n");
goto end;
}
hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream *)stream,
NULL, 0, &decoder);
if (FAILED(hr))
goto end;
hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format);
if (FAILED(hr))
goto end;
img_info->ImageFileFormat = wic_container_guid_to_file_format(&container_for
mat);
if (img_info->ImageFileFormat == D3DX10_IFF_FORCE_DWORD)
{
hr = E_FAIL;
WARN("Unsupported image file format %s.\n", debugstr_guid(&container_for
mat));
goto end;
}
hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
if (FAILED(hr) || !frame_count)
goto end;
hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
if (FAILED(hr))
goto end;
hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Heigh
t);
if (FAILED(hr))
goto end;
if (img_info->ImageFileFormat == D3DX10_IFF_DDS)
{
hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (voi
d **)&dds_decoder);
if (FAILED(hr))
goto end;
hr = IWICDdsDecoder_GetParameters(dds_decoder, &dds_params);
if (FAILED(hr))
goto end;
img_info->ArraySize = dds_params.ArraySize;
img_info->Depth = dds_params.Depth;
img_info->MipLevels = dds_params.MipLevels;
img_info->ResourceDimension = wic_dimension_to_d3dx10_dimension(dds_para
ms.Dimension);
img_info->Format = dds_params.DxgiFormat;
img_info->MiscFlags = 0;
if (dds_params.Dimension == WICDdsTextureCube)
{
img_info->MiscFlags = D3D10_RESOURCE_MISC_TEXTURECUBE;
img_info->ArraySize *= 6;
}
}
else
{
img_info->ArraySize = 1;
img_info->Depth = 1;
img_info->MipLevels = 1;
img_info->ResourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D;
img_info->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
img_info->MiscFlags = 0;
}
end:
if (dds_decoder)
IWICDdsDecoder_Release(dds_decoder);
if (frame)
IWICBitmapFrameDecode_Release(frame);
if (decoder)
IWICBitmapDecoder_Release(decoder);
if (stream)
IWICStream_Release(stream);
if (factory)
IWICImagingFactory_Release(factory);
if (hr != S_OK)
{
WARN("Invalid or unsupported image file.\n");
return E_FAIL;
}
return S_OK;
} }
D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable)
{ {
FIXME("enable %#x stub.\n", enable); FIXME("enable %#x stub.\n", enable);
return D3DX_NOT_OPTIMIZED; return D3DX_NOT_OPTIMIZED;
} }
HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_ TEXTURE_LOAD_INFO *load_info, HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_ TEXTURE_LOAD_INFO *load_info,
 End of changes. 4 change blocks. 
2 lines changed or deleted 154 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)