Module: wine Branch: master Commit: e2da1a4ee1b6d6a1ae01dc8c8b98f44d5d87722a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da1a4ee1b6d6a1ae01dc8c8b...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Fri Apr 1 17:44:54 2016 +1100
d3dx10: Add D3DX10UnsetAllDeviceObjects stub.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.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 | 7 +++++++ include/d3dx10core.idl | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 9edcf54..0673f6a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -64,7 +64,7 @@ @ stub D3DX10SaveTextureToFileA(ptr ptr str) @ stub D3DX10SaveTextureToFileW(ptr ptr wstr) @ stub D3DX10SaveTextureToMemory(ptr ptr ptr long) -@ stub D3DX10UnsetAllDeviceObjects(ptr) +@ stdcall D3DX10UnsetAllDeviceObjects(ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXColorAdjustContrast(ptr ptr float) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 6637af3..fa4fa79 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -116,3 +116,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz
return E_NOTIMPL; } + +HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) +{ + FIXME("device %p stub.\n", device); + + return E_NOTIMPL; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index f0d8ff6..0e2bf31 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -64,3 +64,5 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); }; + +cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);")