Ziqing Hui : d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 94edc0b3f1c5aba038d4db71c078a0c174c2591e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=94edc0b3f1c5aba038d4db71c...

Author: Ziqing Hui 
Date:   Fri Sep  4 09:31:16 2020 +0800

d3dx10: Add D3DX10GetImageInfoFromResource{A, W}() stub implementation.

Signed-off-by: Ziqing Hui 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx10_43/d3dx10_43.spec   |  4 ++--
 dlls/d3dx10_43/d3dx10_43_main.c | 18 ++++++++++++++++++
 include/d3dx10tex.h             |  6 ++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index 0ce059dc5e..a00b3402a5 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -52,8 +52,8 @@
 @ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
 @ stdcall D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr)
 @ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr)
-@ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr)
-@ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr)
+@ stdcall D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr)
+@ stdcall D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr)
 @ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr)
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c
index aa5c961d0e..32d69ff8af 100644
--- a/dlls/d3dx10_43/d3dx10_43_main.c
+++ b/dlls/d3dx10_43/d3dx10_43_main.c
@@ -313,6 +313,24 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
     return E_NOTIMPL;
 }

+HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,
+        D3DX10_IMAGE_INFO *info, HRESULT *result)
+{
+    FIXME("module %p, resource %s, pump %p, info %p, result %p\n",
+            module, debugstr_a(resource), pump, info, result);
+
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
+        D3DX10_IMAGE_INFO *info, HRESULT *result)
+{
+    FIXME("module %p, resource %s, pump %p, info %p, result %p\n",
+            module, debugstr_w(resource), pump, info, result);
+
+    return E_NOTIMPL;
+}
+
 HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
         D3DX10_IMAGE_INFO *img_info, HRESULT *hresult)
 {
diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h
index 6efd6b0734..0f92fd38e6 100644
--- a/include/d3dx10tex.h
+++ b/include/d3dx10tex.h
@@ -147,6 +147,12 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP
         HRESULT *result);
 #define        D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile)

+HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,
+        D3DX10_IMAGE_INFO *info, HRESULT *result);
+HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
+        D3DX10_IMAGE_INFO *info, HRESULT *result);
+#define        D3DX10GetImageInfoFromResource WINELIB_NAME_AW(D3DX10GetImageInfoFromResource)
+
 HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
         D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);