From 754c68182623657b4862d7700afbf781b4555c77 Mon Sep 17 00:00:00 2001
From: Andrey Gusev <andrey.goosev@gmail.com>
Date: Thu, 16 Jun 2016 16:32:53 +0300
Subject: [PATCH] d3dx11: Add D3DX11GetImageInfoFromMemory stub.

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/d3dx11_42/d3dx11_42.spec |  2 +-
 dlls/d3dx11_43/d3dx11_43.c    | 16 ++++++++++++++++
 dlls/d3dx11_43/d3dx11_43.spec |  2 +-
 include/d3dx11tex.h           |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec
index a2a32ff87e7..632e20131bd 100644
--- a/dlls/d3dx11_42/d3dx11_42.spec
+++ b/dlls/d3dx11_42/d3dx11_42.spec
@@ -29,7 +29,7 @@
 @ stub D3DX11FilterTexture
 @ stub D3DX11GetImageInfoFromFileA
 @ stub D3DX11GetImageInfoFromFileW
-@ stub D3DX11GetImageInfoFromMemory
+@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory
 @ stub D3DX11GetImageInfoFromResourceA
 @ stub D3DX11GetImageInfoFromResourceW
 @ stub D3DX11LoadTextureFromTexture
diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c
index 149d953acd7..201f3fb9f30 100644
--- a/dlls/d3dx11_43/d3dx11_43.c
+++ b/dlls/d3dx11_43/d3dx11_43.c
@@ -26,7 +26,14 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "objbase.h"
+
 #include "d3dx11.h"
+#include "d3dx11core.h"
+#include "d3dx11tex.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
 BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
 {
@@ -53,3 +60,12 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
 
     return FALSE;
 }
+
+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 %lu, pump %p, img_info %p, hresult %p stub!\n",
+            src_data, src_data_size, pump, img_info, hresult);
+
+    return E_NOTIMPL;
+}
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index a2a32ff87e7..cb76d5fa640 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -29,7 +29,7 @@
 @ stub D3DX11FilterTexture
 @ stub D3DX11GetImageInfoFromFileA
 @ stub D3DX11GetImageInfoFromFileW
-@ stub D3DX11GetImageInfoFromMemory
+@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
 @ stub D3DX11GetImageInfoFromResourceA
 @ stub D3DX11GetImageInfoFromResourceW
 @ stub D3DX11LoadTextureFromTexture
diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h
index 54c77b7d5cb..0217777d782 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -89,6 +89,9 @@ extern "C" {
 HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size,
         D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);
 
+HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
+        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);
+
 #ifdef __cplusplus
 }
 #endif