ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx10: Implement D3DX10GetImageInfoFromMemory(). 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48856
Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ziqing Hui 2020-07-09 21:35:48 +02:00 committed by Alexandre Julliard
parent 9f59bdd9d2
commit 99aa8b5ddc
3 changed files with 147 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3dx10_43/Makefile.in
View File

@ -1,6 +1,7 @@
MODULE = d3dx10_43.dll
IMPORTLIB = d3dx10
IMPORTS = d3d10_1 d3dcompiler dxguid
DELAYIMPORTS = windowscodecs
EXTRADLLFLAGS = -mno-cygwin

146
dlls/d3dx10_43/d3dx10_43_main.c
View File

@ -32,9 +32,56 @@
#include "d3d10_1.h"
#include "d3dx10.h"
#include "wincodec.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **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 *container_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(WICDdsDimension 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)
{
switch (fdwReason)
@ -229,10 +276,105 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi
HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
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);
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_format);
if (img_info->ImageFileFormat == D3DX10_IFF_FORCE_DWORD)
{
hr = E_FAIL;
WARN("Unsupported image file format %s.\n", debugstr_guid(&container_format));
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->Height);
if (FAILED(hr))
goto end;
if (img_info->ImageFileFormat == D3DX10_IFF_DDS)
{
hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&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_params.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)

7
dlls/d3dx10_43/tests/d3dx10.c
View File

@ -1051,23 +1051,21 @@ static void test_get_image_info(void)
CoInitialize(NULL);
todo_wine {
hr = D3DX10GetImageInfoFromMemory(test_image[0].data, 0, NULL, &image_info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
hr = D3DX10GetImageInfoFromMemory(NULL, test_image[0].size, NULL, &image_info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
hr = D3DX10GetImageInfoFromMemory(&dword, sizeof(dword), NULL, &image_info, NULL);
ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
}
for (i = 0; i < ARRAY_SIZE(test_image); ++i)
{
hr = D3DX10GetImageInfoFromMemory(test_image[i].data, test_image[i].size, NULL, &image_info, NULL);
todo_wine ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP)
ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
if (hr != S_OK)
continue;
todo_wine {
ok(image_info.Width == test_image[i].expected.Width,
"Test %u: Got unexpected Width %u, expected %u.\n",
i, image_info.Width, test_image[i].expected.Width);
@ -1095,7 +1093,6 @@ static void test_get_image_info(void)
ok(image_info.ImageFileFormat == test_image[i].expected.ImageFileFormat,
"Test %u: Got unexpected ImageFileFormat %u, expected %u.\n",
i, image_info.ImageFileFormat, test_image[i].expected.ImageFileFormat);
}
}
CoUninitialize();