winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
849 discussions
Start a n
N
ew thread
Rico Schüller : d3dx9: Implement ID3DXEffect:: GetDevice().
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Implement ID3DXEffect::GetPool( ).
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Fix some style issues.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Add ID3DXEffectCompiler interface.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Forward ID3DXEffect to ID3DXBaseEffect.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Add ID3DXBaseEffect interface.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : include: Fix ID3DXEffectCompiler interface.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9/tests: Add refcount test for the device.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
Rico Schüller : d3dx9: Handle pool and device in ID3DXEffect.
by Alexandre Julliard
29 Mar '11
29 Mar '11
Module: wine Branch: master Commit: eb1faf6155eda67028637ed6b252c46d38d803fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb1faf6155eda67028637ed6b…
Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:28 2011 +0200 d3dx9: Handle pool and device in ID3DXEffect. --- dlls/d3dx9_36/effect.c | 39 ++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 15683df..fec95be 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -32,6 +32,9 @@ typedef struct ID3DXEffectImpl { ID3DXEffect ID3DXEffect_iface; LONG ref; + LPDIRECT3DDEVICE9 device; + LPD3DXEFFECTPOOL pool; + UINT parameter_count; UINT technique_count; } ID3DXEffectImpl; @@ -55,6 +58,18 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } +static void free_effect(struct ID3DXEffectImpl *effect) +{ + TRACE("Free effect %p\n", effect); + + if (effect->pool) + { + effect->pool->lpVtbl->Release(effect->pool); + } + + IDirect3DDevice9_Release(effect->device); +} + static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) { return (0xfeff0000 | ((major) << 8) | (minor)); @@ -103,7 +118,10 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect* iface) TRACE("(%p)->(): Release from %u\n", This, ref + 1); if (!ref) + { + free_effect(This); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -899,15 +917,24 @@ static HRESULT d3dx9_parse_effect(ID3DXEffectImpl *effect, const char *data, UIN return S_OK; } -static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE_T data_size) +static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, + const char *data, SIZE_T data_size, LPD3DXEFFECTPOOL pool) { DWORD tag, offset; const char *ptr = data; HRESULT hr; + TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; + if (pool) pool->lpVtbl->AddRef(pool); + effect->pool = pool; + + IDirect3DDevice9_AddRef(device); + effect->device = device; + read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -928,11 +955,17 @@ static HRESULT d3dx9_effect_init(ID3DXEffectImpl *effect, const char *data, SIZE if (hr != S_OK) { FIXME("Failed to parse effect.\n"); - return hr; + goto err_out; } } return S_OK; + +err_out: + + free_effect(effect); + + return hr; } HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, @@ -969,7 +1002,7 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, return E_OUTOFMEMORY; } - hr = d3dx9_effect_init(object, srcdata, srcdatalen); + hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); if (FAILED(hr)) { WARN("Failed to initialize shader reflection\n"); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8b23536..f4e0f9a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "initguid.h" #include "wine/test.h" #include "d3dx9.h" @@ -24,10 +26,11 @@ static const char effect_desc[] = "{\n" "}\n"; -static void test_create_effect(IDirect3DDevice9* device) +static void test_create_effect(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffect* effect; + ID3DXEffect *effect; + ULONG count; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -44,13 +47,16 @@ static void test_create_effect(IDirect3DDevice9* device) hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - effect->lpVtbl->Release(effect); + count = effect->lpVtbl->Release(effect); + ok(count == 0, "Release failed %u\n", count); } -static void test_create_effect_pool(void) +static void test_create_effect_pool(IDirect3DDevice9 *device) { HRESULT hr; - ID3DXEffectPool* pool; + ID3DXEffectPool *pool, *pool2; + ULONG count; + IDirect3DDevice9 *device2; hr = D3DXCreateEffectPool(NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -58,7 +64,29 @@ static void test_create_effect_pool(void) hr = D3DXCreateEffectPool(&pool); ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); - pool->lpVtbl->Release(pool); + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); + + hr = D3DXCreateEffectPool(&pool); + ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); + + hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, pool, NULL, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = pool2->lpVtbl->Release(pool2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + hr = device->lpVtbl->QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + count = device2->lpVtbl->Release(device2); + ok(count == 1, "Release failed, got %u, expected 1\n", count); + + count = pool->lpVtbl->Release(pool); + ok(count == 0, "Release failed %u\n", count); } START_TEST(effect) @@ -93,7 +121,7 @@ START_TEST(effect) } test_create_effect(device); - test_create_effect_pool(); + test_create_effect_pool(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);
1
0
0
0
Rico Schüller : d3dx9: Use size of variable instead of type.
by Alexandre Julliard
29 Mar '11
29 Mar '11
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
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
85
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
Results per page:
10
25
50
100
200