Andrey Gusev : d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: b123472b25d1fe89ad07b3b70de52d028c6cc016
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b123472b25d1fe89ad07b3b70de52d028c6cc016

Author: Andrey Gusev <andrey.goosev at gmail.com>
Date:   Mon Jan 30 14:00:56 2017 +0200

d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.

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

---

 dlls/d3dx11_42/d3dx11_42.spec |  2 +-
 dlls/d3dx11_43/d3dx11_43.spec |  2 +-
 dlls/d3dx11_43/texture.c      | 10 ++++++++++
 include/d3dx11tex.h           |  4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec
index f97ec24..815c162 100644
--- a/dlls/d3dx11_42/d3dx11_42.spec
+++ b/dlls/d3dx11_42/d3dx11_42.spec
@@ -17,7 +17,7 @@
 @ stub D3DX11CreateAsyncTextureProcessor
 @ stub D3DX11CreateShaderResourceViewFromFileA
 @ stub D3DX11CreateShaderResourceViewFromFileW
-@ stub D3DX11CreateShaderResourceViewFromMemory
+@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateShaderResourceViewFromResourceA
 @ stub D3DX11CreateShaderResourceViewFromResourceW
 @ stub D3DX11CreateTextureFromFileA
diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec
index 217cad1..452e513 100644
--- a/dlls/d3dx11_43/d3dx11_43.spec
+++ b/dlls/d3dx11_43/d3dx11_43.spec
@@ -17,7 +17,7 @@
 @ stub D3DX11CreateAsyncTextureProcessor
 @ stub D3DX11CreateShaderResourceViewFromFileA
 @ stub D3DX11CreateShaderResourceViewFromFileW
-@ stub D3DX11CreateShaderResourceViewFromMemory
+@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
 @ stub D3DX11CreateShaderResourceViewFromResourceA
 @ stub D3DX11CreateShaderResourceViewFromResourceW
 @ stub D3DX11CreateTextureFromFileA
diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
index 65598a6..fe291d9 100644
--- a/dlls/d3dx11_43/texture.c
+++ b/dlls/d3dx11_43/texture.c
@@ -25,6 +25,16 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
+HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data,
+        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
+        ID3D11ShaderResourceView **view, HRESULT *hresult)
+{
+    FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n",
+            device, data, data_size, load_info, pump, view, 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 bd22f32..16b280a 100644
--- a/include/d3dx11tex.h
+++ b/include/d3dx11tex.h
@@ -86,6 +86,10 @@ typedef struct D3DX11_IMAGE_LOAD_INFO
 extern "C" {
 #endif
 
+HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data,
+        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
+        ID3D11ShaderResourceView **view, 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);