d3dx11_43: Implement D3DX11GetImageInfoFromMemory

dlls/d3dx11_42/Makefile.in

@@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42
 MODULE    = d3dx11_42.dll
 IMPORTLIB = d3dx11_42
 IMPORTS = d3dcompiler
+DELAYIMPORTS = windowscodecs
 PARENTSRC = ../d3dx11_43
 
 EXTRADLLFLAGS = -Wb,--prefer-native

dlls/d3dx11_43/Makefile.in

@@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=43
 MODULE = d3dx11_43.dll
 IMPORTLIB = d3dx11
 IMPORTS   = d3dcompiler
+DELAYIMPORTS = windowscodecs
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 

dlls/d3dx11_43/main.c

@@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
 
     return E_NOTIMPL;
 }
-
-HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
-        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
-{
-    FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n",
-            src_data, src_data_size, pump, img_info, hresult);
-
-    return E_NOTIMPL;
-}

dlls/d3dx11_43/texture.c

@@ -15,14 +15,190 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#define COBJMACROS
 
 #include "d3dx11.h"
 #include "d3dcompiler.h"
+#include "wincodec.h"
 
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
+HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **imaging_factory);
+
+static const struct
+{
+    const GUID *wic_container_guid;
+    D3DX11_IMAGE_FILE_FORMAT d3dx_file_format;
+}
+file_formats[] =
+{
+    { &GUID_ContainerFormatBmp,  D3DX11_IFF_BMP },
+    { &GUID_ContainerFormatJpeg, D3DX11_IFF_JPG },
+    { &GUID_ContainerFormatPng,  D3DX11_IFF_PNG },
+    { &GUID_ContainerFormatDds,  D3DX11_IFF_DDS },
+    { &GUID_ContainerFormatTiff, D3DX11_IFF_TIFF },
+    { &GUID_ContainerFormatGif,  D3DX11_IFF_GIF },
+    { &GUID_ContainerFormatWmp,  D3DX11_IFF_WMP },
+};
+
+static D3DX11_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 D3DX11_IFF_FORCE_DWORD;
+}
+
+static D3D11_RESOURCE_DIMENSION wic_dimension_to_d3dx11_dimension(WICDdsDimension wic_dimension)
+{
+    switch (wic_dimension)
+    {
+        case WICDdsTexture1D:
+            return D3D11_RESOURCE_DIMENSION_TEXTURE1D;
+        case WICDdsTexture2D:
+        case WICDdsTextureCube:
+            return D3D11_RESOURCE_DIMENSION_TEXTURE2D;
+        case WICDdsTexture3D:
+            return D3D11_RESOURCE_DIMENSION_TEXTURE3D;
+        default:
+            return D3D11_RESOURCE_DIMENSION_UNKNOWN;
+    }
+}
+
+static const DXGI_FORMAT to_be_converted_format[] =
+{
+    DXGI_FORMAT_UNKNOWN,
+    DXGI_FORMAT_R8_UNORM,
+    DXGI_FORMAT_R8G8_UNORM,
+    DXGI_FORMAT_B5G6R5_UNORM,
+    DXGI_FORMAT_B4G4R4A4_UNORM,
+    DXGI_FORMAT_B5G5R5A1_UNORM,
+    DXGI_FORMAT_B8G8R8X8_UNORM,
+    DXGI_FORMAT_B8G8R8A8_UNORM
+};
+
+static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format)
+{
+    unsigned int i;
+
+    for (i = 0; i < ARRAY_SIZE(to_be_converted_format); ++i)
+    {
+        if (format == to_be_converted_format[i])
+            return DXGI_FORMAT_R8G8B8A8_UNORM;
+    }
+    return format;
+}
+
+HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
+        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
+{
+    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 %Iu, pump %p, img_info %p, hresult %p.\n",
+            src_data, src_data_size, pump, img_info, hresult);
+
+    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 == D3DX11_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 == D3DX11_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_d3dx11_dimension(dds_params.Dimension);
+        img_info->Format = get_d3dx11_dds_format(dds_params.DxgiFormat);
+        img_info->MiscFlags = 0;
+        if (dds_params.Dimension == WICDdsTextureCube)
+        {
+            img_info->MiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE;
+            img_info->ArraySize *= 6;
+        }
+    }
+    else
+    {
+        img_info->ArraySize = 1;
+        img_info->Depth = 1;
+        img_info->MipLevels = 1;
+        img_info->ResourceDimension = D3D11_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;
+}
+
 HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data,
         SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
         ID3D11ShaderResourceView **view, HRESULT *hresult)