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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4d0f38b86cc806691cafe447bde288040f8f27b3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4d0f38b86cc806691cafe447b...

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

d3dx10: Add D3DX10GetImageInfoFromFile{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 | 16 ++++++++++++++++
 include/d3dx10tex.h             |  8 ++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index 36c7633d8e..0ce059dc5e 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -49,8 +49,8 @@
 @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr)
 @ stdcall D3DX10FilterTexture(ptr long long)
 @ stdcall D3DX10GetFeatureLevel1(ptr ptr)
-@ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr)
-@ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr)
+@ 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)
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c
index 005b234437..aa5c961d0e 100644
--- a/dlls/d3dx10_43/d3dx10_43_main.c
+++ b/dlls/d3dx10_43/d3dx10_43_main.c
@@ -297,6 +297,22 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi
     return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1);
 }

+HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,
+        HRESULT *result)
+{
+    FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_a(src_file), pump, info, result);
+
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,
+        HRESULT *result)
+{
+    FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), 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 98cb82c0c9..6efd6b0734 100644
--- a/include/d3dx10tex.h
+++ b/include/d3dx10tex.h
@@ -140,8 +140,16 @@ 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 D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter);
+
+HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,
+        HRESULT *result);
+HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,
+        HRESULT *result);
+#define        D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile)
+
 HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,
         D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);
+
 HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info,
         ID3D10Resource *dst_texture);