March 2011 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9: Implement ID3DXEffect:: GetDevice().
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: adbfae9b2abb3e5840179ac633b2904f429615e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbfae9b2abb3e5840179ac63… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:54 2011 +0200 d3dx9: Implement ID3DXEffect::GetDevice(). --- dlls/d3dx9_36/effect.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 795b426..c90e492 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1417,13 +1417,25 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect* iface, LPDIRECT3DDEVICE9* device) +static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, LPDIRECT3DDEVICE9 *device) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, device); + TRACE("iface %p, device %p\n", This, device); - return E_NOTIMPL; + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(This->device); + + *device = This->device; + + TRACE("Returning device %p\n", *device); + + return S_OK; } static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::GetPool( ).
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 96192306a09feed279b6741ab6c490ee33844290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96192306a09feed279b6741ab… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:52 2011 +0200 d3dx9: Implement ID3DXEffect::GetPool(). --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 00a35cd..795b426 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1303,13 +1303,28 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect* iface, LPD3DXEFFECTPOOL* pool) +static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p): stub\n", This, pool); + TRACE("iface %p, pool %p\n", This, pool); - return E_NOTIMPL; + if (!pool) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + if (This->pool) + { + This->pool->lpVtbl->AddRef(This->pool); + } + + *pool = This->pool; + + TRACE("Returning pool %p\n", *pool); + + return S_OK; } static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDLE technique)

1 0

Rico Schüller : d3dx9: Forward ID3DXEffect to ID3DXBaseEffect.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 0dff8dd3ce3fd96554d6c527f79ce7c1b3adfc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff8dd3ce3fd96554d6c527f… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:41 2011 +0200 d3dx9: Forward ID3DXEffect to ID3DXBaseEffect. --- dlls/d3dx9_36/effect.c | 554 ++++++++++++++++++++++++++---------------------- 1 files changed, 304 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dff8dd3ce3fd96554d6c…

1 0

Rico Schüller : d3dx9: Add ID3DXEffectCompiler interface.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 2f3e9673a19cd01a0a5893e48f3ef8cff06d86e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3e9673a19cd01a0a5893e48… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:45 2011 +0200 d3dx9: Add ID3DXEffectCompiler interface. --- dlls/d3dx9_36/effect.c | 1040 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 912 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f3e9673a19cd01a0a589…

1 0

Rico Schüller : d3dx9: Fix some style issues.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 27209e60973586635c46f9dac2b95f5db0dc3d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27209e60973586635c46f9dac… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:49 2011 +0200 d3dx9: Fix some style issues. --- dlls/d3dx9_36/effect.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3c3a082..00a35cd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2535,20 +2535,21 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; -typedef struct ID3DXEffectPoolImpl { +struct ID3DXEffectPoolImpl +{ ID3DXEffectPool ID3DXEffectPool_iface; LONG ref; -} ID3DXEffectPoolImpl; +}; -static inline ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) { - return CONTAINING_RECORD(iface, ID3DXEffectPoolImpl, ID3DXEffectPool_iface); + return CONTAINING_RECORD(iface, struct ID3DXEffectPoolImpl, ID3DXEffectPool_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, REFIID riid, void** object) +static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); @@ -2565,18 +2566,18 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool* iface) +static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool *iface) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool* iface) +static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool *iface) { - ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -2595,9 +2596,9 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = ID3DXEffectPoolImpl_Release }; -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) +HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool) { - ID3DXEffectPoolImpl* object; + struct ID3DXEffectPoolImpl *object; TRACE("(%p)\n", pool);

1 0

Rico Schüller : d3dx9: Add ID3DXBaseEffect interface.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: aaa06cfba4e357343508d2776416275e60f77acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa06cfba4e357343508d2776… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:38 2011 +0200 d3dx9: Add ID3DXBaseEffect interface. --- dlls/d3dx9_36/effect.c | 689 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 669 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa06cfba4e357343508d…

1 0

Rico Schüller : include: Add missing D3DXCreateEffect* declarations in d3dx9effect.h.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 1c30783c927ee9cb9a3b9e53df5a001c1b86ebd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c30783c927ee9cb9a3b9e53d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:13 2011 +0200 include: Add missing D3DXCreateEffect* declarations in d3dx9effect.h. --- include/d3dx9effect.h | 112 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 67d28b2..235b8e7 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, - LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; + LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; }; #undef INTERFACE @@ -386,6 +386,116 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, LPD3DXEFFECTCOMPILER* compiler, LPD3DXBUFFER* parse_errors); +HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFileEx WINELIB_NAME_AW(D3DXCreateEffectFromFileEx) + +HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, + LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromFile WINELIB_NAME_AW(D3DXCreateEffectFromFile) + +HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + LPCSTR skipconstants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResourceEx WINELIB_NAME_AW(D3DXCreateEffectFromResourceEx) + +HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, + LPD3DXBUFFER *compilationerrors); +#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource) + +HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromFile WINELIB_NAME_AW(D3DXCreateEffectCompilerFromFile) + +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, + LPCSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, + LPCWSTR srcresource, + const D3DXMACRO *defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER *effectcompiler, + LPD3DXBUFFER *parseerrors); +#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource) + #ifdef __cplusplus } #endif

1 0

Rico Schüller : include: Fix ID3DXEffectCompiler interface.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 2b877d758686f6e172c54e2535ecefd6c5b86e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b877d758686f6e172c54e253… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:35 2011 +0200 include: Fix ID3DXEffectCompiler interface. --- include/d3dx9effect.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 235b8e7..d014559 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -337,9 +337,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; - STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; - STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/

1 0

Rico Schüller : d3dx9/tests: Add refcount test for the device.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 68f11dabd7740624d666bbcf4bfd4c47993c85a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f11dabd7740624d666bbcf4… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:31 2011 +0200 d3dx9/tests: Add refcount test for the device. --- dlls/d3dx9_36/tests/effect.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f4e0f9a..2c9034f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -92,10 +92,11 @@ static void test_create_effect_pool(IDirect3DDevice9 *device) START_TEST(effect) { HWND wnd; - IDirect3D9* d3d; - IDirect3DDevice9* device; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; + ULONG count; wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -123,7 +124,11 @@ START_TEST(effect) test_create_effect(device); test_create_effect_pool(device); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d); + count = IDirect3DDevice9_Release(device); + ok(count == 0, "The device was not properly freed: refcount %u\n", count); + + count = IDirect3D9_Release(d3d); + ok(count == 0, "Release failed %u\n", count); + DestroyWindow(wnd); }

1 0

Rico Schüller : d3dx9: Use size of variable instead of type.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: bb88fada4bd859eb5dbe67dbbc0659b50a95be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb88fada4bd859eb5dbe67dbb… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:25 2011 +0200 d3dx9: Use size of variable instead of type. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index efb5da3..15683df 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1137,7 +1137,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectFromFileExW(device, srcfileW, defines, include, skipconstants, flags, pool, effect, compilationerrors); @@ -1274,7 +1274,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectCompilerFromFileW(srcfileW, defines, include, flags, effectcompiler, parseerrors);

1 0