Andrey Gusev : d3dx11: Add D3DX11CreateTextureFromFileA/W stub.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 22099befd1b43d041eb7c78de9d4095da3c48398
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=22099befd1b43d041eb7c78de...

Author: Andrey Gusev <andrey.goosev(a)gmail.com>
Date:   Sat Mar 24 16:40:22 2018 +0200

d3dx11: Add D3DX11CreateTextureFromFileA/W stub.

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 8dedf244f615b68d9013cd1aa77c0edff0d517a8)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/d3dx11_42/d3dx11_42.spec |  4 ++--
 dlls/d3dx11_43/d3dx11_43.spec |  4 ++--
 dlls/d3dx11_43/texture.c      | 20 ++++++++++++++++++++
 include/d3dx11tex.h           |  8 ++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec
index eaec2fc..e5a70fe 100644
--- a/dlls/d3dx11_42/d3dx11_42.spec
+++ b/dlls/d3dx11_42/d3dx11_42.spec
@@ -20,8 +20,8 @@
 @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateShaderResourceViewFromResourceA
 @ stub D3DX11CreateShaderResourceViewFromResourceW
-@ stub D3DX11CreateTextureFromFileA
-@ stub D3DX11CreateTextureFromFileW
+@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA
+@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW
 @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateTextureFromResourceA
 @ stub D3DX11CreateTextureFromResourceW
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index 1cafaa6..76a3916 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -20,8 +20,8 @@
 @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateShaderResourceViewFromResourceA
 @ stub D3DX11CreateShaderResourceViewFromResourceW
-@ stub D3DX11CreateTextureFromFileA
-@ stub D3DX11CreateTextureFromFileW
+@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)
+@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr)
 @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateTextureFromResourceA
 @ stub D3DX11CreateTextureFromResourceW
diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
index fe291d9..6aaf8a7 100644
--- a/dlls/d3dx11_43/texture.c
+++ b/dlls/d3dx11_43/texture.c
@@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
     return E_NOTIMPL;
 }
 
+HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename,
+        D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
+        HRESULT *hresult)
+{
+    FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+            device, debugstr_a(filename), load_info, pump, texture, hresult);
+
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename,
+        D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
+        HRESULT *hresult)
+{
+    FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+            device, debugstr_w(filename), load_info, pump, texture, hresult);
+
+    return E_NOTIMPL;
+}
+
 HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
         SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
         ID3D11Resource **texture, HRESULT *hresult)
diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h
index 584a3bd..4f792ec 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co
         SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
         ID3D11ShaderResourceView **view, HRESULT *hresult);
 
+HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename,
+        D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
+        HRESULT *hresult);
+
+HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename,
+        D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture,
+        HRESULT *hresult);
+
 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);