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

Henri Verbeet : wined3d: Get rid of IWineD3DVertexShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 49725ba58319f0d9ed5dee6301a64271758c2dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49725ba58319f0d9ed5dee630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:47 2011 +0200 wined3d: Get rid of IWineD3DVertexShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 8 +---- dlls/d3d8/d3d8_private.h | 7 ++--- dlls/d3d8/device.c | 14 ++++++---- dlls/d3d8/shader.c | 12 ++++---- dlls/d3d8/vertexdeclaration.c | 5 ++- dlls/d3d9/d3d9_private.h | 10 ++----- dlls/d3d9/device.c | 8 +++--- dlls/d3d9/shader.c | 8 +++--- dlls/wined3d/device.c | 50 +++++++++++++++++++++--------------- dlls/wined3d/shader.c | 17 ++++++------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 8 ++--- include/wine/wined3d.idl | 15 ++-------- 14 files changed, 81 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49725ba58319f0d9ed5de…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DPixelShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 3d4fe0b7505b5d261db375c817bcd0b18a95a9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4fe0b7505b5d261db375c81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:49 2011 +0200 wined3d: Get rid of IWineD3DPixelShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 8 +---- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 17 ++++++----- dlls/d3d8/shader.c | 6 ++-- dlls/d3d9/d3d9_private.h | 8 +---- dlls/d3d9/device.c | 8 +++--- dlls/d3d9/shader.c | 8 +++--- dlls/wined3d/device.c | 53 ++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/shader.c | 17 +++++------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 8 ++--- include/wine/wined3d.idl | 15 ++-------- 14 files changed, 77 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d4fe0b7505b5d261db37…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DGeometryShader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 9ea2ee5f4e85afb98154661b06aeaf1b28720f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea2ee5f4e85afb98154661b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:48 2011 +0200 wined3d: Get rid of IWineD3DGeometryShader. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/shader.c | 4 +--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/shader.c | 17 ++++++++--------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 11 +---------- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 131790f..bdfbc34 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -182,7 +182,7 @@ struct d3d10_geometry_shader const struct ID3D10GeometryShaderVtbl *vtbl; LONG refcount; - IWineD3DGeometryShader *wined3d_shader; + IWineD3DBaseShader *wined3d_shader; struct wined3d_shader_signature output_signature; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 5f41927..a1140fe 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -307,9 +307,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - IWineD3DGeometryShader_Release(This->wined3d_shader); - } + IWineD3DBaseShader_Release(This->wined3d_shader); return refcount; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ab4a4c..6aebf7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1546,7 +1546,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *iface, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops, - IWineD3DGeometryShader **shader) + IWineD3DBaseShader **shader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_geometryshader *object; @@ -1568,7 +1568,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *if } TRACE("Created geometry shader %p.\n", object); - *shader = (IWineD3DGeometryShader *)object; + *shader = (IWineD3DBaseShader *)object; return WINED3D_OK; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 413de0a..3343363 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1892,13 +1892,12 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryShader *iface, +static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_IWineD3DGeometryShader) - || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + if (IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DBase) || IsEqualGUID(riid, &IID_IUnknown)) { @@ -1913,7 +1912,7 @@ static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryS return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *iface) +static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) { struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); @@ -1924,7 +1923,7 @@ static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *ifa } /* Do not call while under the GL lock. */ -static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *iface) +static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DBaseShader *iface) { struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); @@ -1941,21 +1940,21 @@ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *if return refcount; } -static void * STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DGeometryShader *iface) +static void * STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DBaseShader *iface) { TRACE("iface %p.\n", iface); return ((IWineD3DBaseShaderImpl *)iface)->baseShader.parent; } -static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShader *iface, void *data, UINT *data_size) +static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DBaseShader *iface, void *data, UINT *data_size) { TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DBaseShader *iface, UINT start_idx, const float *src_data, UINT count) { TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); @@ -1964,7 +1963,7 @@ static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeome start_idx, src_data, count); } -static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = +static const IWineD3DBaseShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ geometryshader_QueryInterface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ac14d7..4fecd9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2832,7 +2832,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * struct wined3d_geometryshader { - const struct IWineD3DGeometryShaderVtbl *vtbl; + const struct IWineD3DBaseShaderVtbl *vtbl; IWineD3DBaseShaderClass base_shader; }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0055659..934f23f 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2405,15 +2405,6 @@ interface IWineD3DBaseShader : IWineD3DBase [ object, local, - uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd) -] -interface IWineD3DGeometryShader : IWineD3DBaseShader -{ -} - -[ - object, - local, uuid(818503da-6f30-11d9-c687-00046142c14f) ] interface IWineD3DPixelShader : IWineD3DBaseShader @@ -2554,7 +2545,7 @@ interface IWineD3DDevice : IUnknown [in] const struct wined3d_shader_signature *output_signature, [in] void *parent, [in] const struct wined3d_parent_ops *parent_ops, - [out] IWineD3DGeometryShader **shader + [out] IWineD3DBaseShader **shader ); HRESULT CreatePixelShader( [in] const DWORD *function,

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVertexShaderImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: dab01d435ea006c0a40dac093b7b25e312f4aae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab01d435ea006c0a40dac093… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:50 2011 +0200 wined3d: Get rid of IWineD3DVertexShaderImpl. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++----------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/glsl_shader.c | 22 ++++++++++---------- dlls/wined3d/shader.c | 27 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 38 +++++++++++++++++------------------- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dab01d435ea006c0a40da…

1 0

Henri Verbeet : wined3d: Get rid of struct wined3d_geometryshader.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 4674b94d237c99e51a4c701ef71812e76d83d8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4674b94d237c99e51a4c701ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:51 2011 +0200 wined3d: Get rid of struct wined3d_geometryshader. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 14 ++++---------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d40041..6fe66ae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1549,7 +1549,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *if IWineD3DBaseShader **shader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct wined3d_geometryshader *object; + IWineD3DBaseShaderImpl *object; HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e7e5a18..0eaf728 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1913,8 +1913,8 @@ static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DBaseShade static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) { - struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; - ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; + ULONG refcount = InterlockedIncrement(&shader->baseShader.ref); TRACE("%p increasing refcount to %u.\n", shader, refcount); @@ -1924,15 +1924,15 @@ static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DBaseShader *iface) /* Do not call while under the GL lock. */ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DBaseShader *iface) { - struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; - ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; + ULONG refcount = InterlockedDecrement(&shader->baseShader.ref); TRACE("%p decreasing refcount to %u.\n", shader, refcount); if (!refcount) { - shader_cleanup((IWineD3DBaseShaderImpl *)shader); - shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); + shader_cleanup(shader); + shader->baseShader.parent_ops->wined3d_object_destroyed(shader->baseShader.parent); HeapFree(GetProcessHeap(), 0, shader); } @@ -1975,24 +1975,24 @@ static const IWineD3DBaseShaderVtbl wined3d_geometryshader_vtbl = geometryshader_SetLocalConstantsF, }; -HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, +HRESULT geometryshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops) { HRESULT hr; - shader->vtbl = &wined3d_geometryshader_vtbl; - shader_init(&shader->base_shader, device, parent, parent_ops); + shader->lpVtbl = &wined3d_geometryshader_vtbl; + shader_init(&shader->baseShader, device, parent, parent_ops); - hr = shader_set_function((IWineD3DBaseShaderImpl *)shader, byte_code, output_signature, 0); + hr = shader_set_function(shader, byte_code, output_signature, 0); if (FAILED(hr)) { WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup((IWineD3DBaseShaderImpl *)shader); + shader_cleanup(shader); return hr; } - shader->base_shader.load_local_constsF = FALSE; + shader->baseShader.load_local_constsF = FALSE; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b61c86f..3c3a325 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2738,6 +2738,10 @@ typedef struct IWineD3DBaseShaderImpl { } u; } IWineD3DBaseShaderImpl; +HRESULT geometryshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + void find_vs_compile_args(const struct wined3d_state *state, IWineD3DBaseShaderImpl *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; HRESULT vertexshader_init(IWineD3DBaseShaderImpl *shader, IWineD3DDeviceImpl *device, @@ -2828,16 +2832,6 @@ static inline BOOL shader_constant_is_local(IWineD3DBaseShaderImpl* This, DWORD } -struct wined3d_geometryshader -{ - const struct IWineD3DBaseShaderVtbl *vtbl; - IWineD3DBaseShaderClass base_shader; -}; - -HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, - const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3DPixelShader implementation structure */

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DPixelShaderImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 99bed5d41d456b681ab1253ea7844b4030bba40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bed5d41d456b681ab1253ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:52 2011 +0200 wined3d: Get rid of IWineD3DPixelShaderImpl. --- dlls/wined3d/arb_program_shader.c | 66 ++++++++++++++++++++---------------- dlls/wined3d/device.c | 6 ++-- dlls/wined3d/glsl_shader.c | 68 ++++++++++++++++++------------------ dlls/wined3d/shader.c | 63 ++++++++++++++++------------------ dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 54 ++++++++++++----------------- 6 files changed, 129 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99bed5d41d456b681ab12…

1 0

Vincent Povirk : winejack.drv: Fix build.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0adc1b60d872b5f06cf4a33bb9bfe1a783518a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adc1b60d872b5f06cf4a33bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 12:43:06 2011 -0500 winejack.drv: Fix build. --- dlls/winejack.drv/audio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index ac8a0c0..5d339ee 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -34,6 +34,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdarg.h> @@ -47,6 +48,7 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winerror.h" #include "mmddk.h" #include "dsound.h"

1 0

Rico Schüller : d3dx9/tests: Add ID3DXEffectCompiler test.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9ea9a053b9d28cff9ae3aa1d2c684192d1df2e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea9a053b9d28cff9ae3aa1d2… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:13:02 2011 +0200 d3dx9/tests: Add ID3DXEffectCompiler test. --- dlls/d3dx9_36/tests/effect.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6f4b674..483efd4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -117,6 +117,60 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(count == 0, "Release failed %u\n", count); } +static void test_create_effect_compiler(void) +{ + HRESULT hr; + ID3DXEffectCompiler *compiler, *compiler2; + ID3DXBaseEffect *base; + IUnknown *unknown; + ULONG count; + + hr = D3DXCreateEffectCompiler(NULL, 0, NULL, NULL, 0, &compiler, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, 0, NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, &compiler, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + count = compiler->lpVtbl->Release(compiler); + ok(count == 0, "Release failed %u\n", count); + + hr = D3DXCreateEffectCompiler(effect_desc, 0, NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, sizeof(effect_desc), NULL, NULL, 0, &compiler, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(NULL, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectCompiler(effect_desc, sizeof(effect_desc), NULL, NULL, 0, &compiler, NULL); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_ID3DXBaseEffect, (void **)&base); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_ID3DXEffectCompiler, (void **)&compiler2); + ok(hr == D3D_OK, "QueryInterface failed, got %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = compiler->lpVtbl->QueryInterface(compiler, &IID_IUnknown, (void **)&unknown); + ok(hr == D3D_OK, "QueryInterface failed, got %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + count = unknown->lpVtbl->Release(unknown); + ok(count == 2, "Release failed, got %u, expected %u\n", count, 2); + + count = compiler2->lpVtbl->Release(compiler2); + ok(count == 1, "Release failed, got %u, expected %u\n", count, 1); + + count = compiler->lpVtbl->Release(compiler); + ok(count == 0, "Release failed %u\n", count); +} + START_TEST(effect) { HWND wnd; @@ -150,6 +204,7 @@ START_TEST(effect) } test_create_effect_and_pool(device); + test_create_effect_compiler(); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Rico Schüller : d3dx9: ID3DXEffect::QueryInterface() does not support IID_ID3DXBaseEffect.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: dccbfe32ad289f38d53afea0ad5857a6895d0199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccbfe32ad289f38d53afea0a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:12:57 2011 +0200 d3dx9: ID3DXEffect::QueryInterface() does not support IID_ID3DXBaseEffect. --- dlls/d3dx9_36/effect.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c90e492..d06c9ac 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -723,7 +723,6 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXBaseEffect) || IsEqualGUID(riid, &IID_ID3DXEffect)) { This->ID3DXEffect_iface.lpVtbl->AddRef(iface);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXEffect::GetPool( ) and ID3DXEffect::GetDevice() tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: f1bfecd616522757bce575bbbfe2b22f61bbc05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bfecd616522757bce575bbb… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 27 22:13:00 2011 +0200 d3dx9/tests: Add ID3DXEffect::GetPool() and ID3DXEffect::GetDevice() tests. --- dlls/d3dx9_36/tests/effect.c | 53 +++++++++++++++++++++++++++++++---------- 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2c9034f..6f4b674 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -26,11 +26,14 @@ static const char effect_desc[] = "{\n" "}\n"; -static void test_create_effect(IDirect3DDevice9 *device) +static void test_create_effect_and_pool(IDirect3DDevice9 *device) { HRESULT hr; ID3DXEffect *effect; + ID3DXBaseEffect *base; ULONG count; + IDirect3DDevice9 *device2; + ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2; 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); @@ -47,16 +50,27 @@ 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); + hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x (E_NOINTERFACE)\n", hr, E_NOINTERFACE); + + hr = effect->lpVtbl->GetPool(effect, &pool); + ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); + ok(!pool, "GetPool failed, got %p\n", pool); + + hr = effect->lpVtbl->GetPool(effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "GetPool failed, got %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetDevice(effect, &device2); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = effect->lpVtbl->GetDevice(effect, NULL); + ok(hr == D3DERR_INVALIDCALL, "GetDevice failed, got %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + count = IDirect3DDevice9_Release(device2); + ok(count == 2, "Release failed, got %u, expected 2\n", count); + count = effect->lpVtbl->Release(effect); ok(count == 0, "Release failed %u\n", count); -} - -static void test_create_effect_pool(IDirect3DDevice9 *device) -{ - HRESULT hr; - 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); @@ -75,16 +89,30 @@ static void test_create_effect_pool(IDirect3DDevice9 *device) hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3DXEffectPool, (void **)&pool2); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(pool == pool2, "Release failed, got %p, expected %p\n", pool2, pool); 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); + hr = IDirect3DDevice9_QueryInterface(device, &IID_IDirect3DDevice9, (void **)&device2); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - count = device2->lpVtbl->Release(device2); + count = IDirect3DDevice9_Release(device2); ok(count == 1, "Release failed, got %u, expected 1\n", count); + hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, pool, &effect, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = effect->lpVtbl->GetPool(effect, &pool); + ok(hr == D3D_OK, "GetPool failed, got %x, expected 0 (D3D_OK)\n", hr); + ok(pool == pool2, "GetPool failed, got %p, expected %p\n", pool2, pool); + + count = pool2->lpVtbl->Release(pool2); + ok(count == 2, "Release failed, got %u, expected 2\n", count); + + count = effect->lpVtbl->Release(effect); + ok(count == 0, "Release failed %u\n", count); + count = pool->lpVtbl->Release(pool); ok(count == 0, "Release failed %u\n", count); } @@ -121,8 +149,7 @@ START_TEST(effect) return; } - test_create_effect(device); - test_create_effect_pool(device); + test_create_effect_and_pool(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0