Alistair Leslie-Hughes : d3dx10_43: Add D3DX10GetImageInfoFromMemory stub.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 62ede82a72a4268f8a30b910d45566fac8ceb25c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=62ede82a72a4268f8a30b910d4...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Wed May 25 11:03:11 2016 +0000

d3dx10_43: Add D3DX10GetImageInfoFromMemory stub.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3dx10_43/d3dx10_43.spec   |  2 +-
 dlls/d3dx10_43/d3dx10_43_main.c | 10 ++++++++++
 include/d3dx10tex.h             |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index 7bfd9f3..492a588 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -51,7 +51,7 @@
 @ stdcall D3DX10GetFeatureLevel1(ptr ptr)
 @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
 @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr)
-@ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
+@ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
 @ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr)
 @ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr)
 @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr)
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c
index 1654544..71d6ae8 100644
--- a/dlls/d3dx10_43/d3dx10_43_main.c
+++ b/dlls/d3dx10_43/d3dx10_43_main.c
@@ -35,6 +35,7 @@
 
 #include "d3d10_1.h"
 #include "d3dx10core.h"
+#include "d3dx10tex.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
@@ -193,3 +194,12 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi
 
     return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1);
 }
+
+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",
+            src_data, src_data_size, pump, img_info, hresult);
+
+    return E_NOTIMPL;
+}
diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h
index aa89ab4..d44edf2 100644
--- a/include/d3dx10tex.h
+++ b/include/d3dx10tex.h
@@ -87,6 +87,8 @@ extern "C" {
 HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size,
         D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult);
 
+HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
+        D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);
 
 #ifdef __cplusplus
 }