Module: wine Branch: master Commit: 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aadb08212a5269ebefcb100cf...
Author: Andrey Gusev andrey.goosev@gmail.com Date: Fri Jul 29 21:21:25 2016 +0300
d3dx10: Add D3DX10CreateTextureFromMemory stub.
Signed-off-by: Andrey Gusev andrey.goosev@gmail.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index f410be8..8c71cce 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -44,7 +44,7 @@ @ stub D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 7308373..3f81088 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -187,6 +187,17 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; }
+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) +{ + FIXME("device %p, src_data %p, src_data_size %lu, loadinfo %p, pump %p, texture %p, " + "hresult %p, stub!\n", + device, src_data, src_data_size, loadinfo, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter) { FIXME("texture %p, src_level %u, filter %#x stub!\n", texture, src_level, filter);