August 2012 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9: Avoid desc copy in ID3DXConstantTable::GetSamplerIndex().
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 77632f0880a76b51d04bd3c73c2e0b35453d261a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77632f0880a76b51d04bd3c73… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:43:14 2012 +0200 d3dx9: Avoid desc copy in ID3DXConstantTable::GetSamplerIndex(). --- dlls/d3dx9_36/shader.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 4b831e3..33b86f6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -942,20 +942,18 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(ID3DXConstantTable *iface, D3DXHANDLE constant) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - UINT count = 1; - HRESULT res; + struct ctab_constant *c = get_valid_constant(This, constant); TRACE("(%p)->(%p)\n", This, constant); - res = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &count); - if (FAILED(res)) - return (UINT)-1; - - if (desc.RegisterSet != D3DXRS_SAMPLER) + if (!c || c->desc.RegisterSet != D3DXRS_SAMPLER) + { + WARN("Invalid argument specified\n"); return (UINT)-1; + } - return desc.RegisterIndex; + TRACE("Returning RegisterIndex %u\n", c->desc.RegisterIndex); + return c->desc.RegisterIndex; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable *iface, D3DXHANDLE constant, UINT index)

1 0

Rico Schüller : d3dx9: Remove min() in set_matrix_array(), uses always the desc value.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: edb802a84777ae2ed193daf462d7fe78fab68c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb802a84777ae2ed193daf46… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:43:09 2012 +0200 d3dx9: Remove min() in set_matrix_array(), uses always the desc value. --- dlls/d3dx9_36/shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fa72cfc..4b831e3 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1187,13 +1187,13 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev { if (desc->Class == D3DXPC_VECTOR) return D3D_OK; - num_rows = min(desc->Rows, rows); - num_columns = min(desc->Columns, columns); + num_rows = desc->Rows; + num_columns = desc->Columns; } else { - num_rows = min(desc->Columns, columns); - num_columns = min(desc->Rows, rows); + num_rows = desc->Columns; + num_columns = desc->Rows; } registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: f41d3bf40d700ccc494911fe0db1e239e2817fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41d3bf40d700ccc494911fe0… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 28 11:58:35 2012 +0200 po: Update German translation. --- po/de.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 85d1056..d225ef0 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-08-15 20:07+0200\n" +"PO-Revision-Date: 2012-08-27 01:14+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3454,8 +3454,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" -"Nach dem deaktivieren oder aktivieren eines Gerätes, wird der verbundene " -"Controller hier bis zum Neustart des Applets nicht mehr aktualisiert." +"Nach dem De-/Aktivieren eines Gerätes wird die Liste der verbundenen " +"Controller bis zum Neustart dieses Applets nicht mehr aktualisiert." #: joy.rc:47 msgid "Test Joystick"

1 0

Jacek Caban : unknwn.idl: Don't use inline wrappers for IUnknown calls.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 9d1bec6077bbf25b6551e759f661332d974935e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1bec6077bbf25b6551e759f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:15:12 2012 +0200 unknwn.idl: Don't use inline wrappers for IUnknown calls. --- include/unknwn.idl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/unknwn.idl b/include/unknwn.idl index 9071973..d6799f4 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -20,7 +20,10 @@ import "wtypes.idl"; #endif -/* Interfaces */ +cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#undef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") [ local, @@ -39,6 +42,10 @@ interface IUnknown ULONG Release(); } +cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") + [ object, uuid(00000001-0000-0000-C000-000000000046),

1 0

Jacek Caban : d3d10core: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 57074556d2d8512a827a788444b54f82131ed2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57074556d2d8512a827a78844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:45 2012 +0200 d3d10core: Use proper helpers for iface calls. --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d10core/texture.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b0907ba..57a61c4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -367,7 +367,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (ps) - ID3D10VertexShader_Release(ps); + ID3D10PixelShader_Release(ps); } START_TEST(device) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 718d019..41bd80f 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -50,7 +50,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D if (This->dxgi_surface) { TRACE("Forwarding to dxgi surface\n"); - return IDXGISurface_QueryInterface(This->dxgi_surface, riid, object); + return IUnknown_QueryInterface(This->dxgi_surface, riid, object); } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); @@ -76,7 +76,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_wined3d_object_released(void *pare { struct d3d10_texture2d *This = parent; - if (This->dxgi_surface) IDXGISurface_Release(This->dxgi_surface); + if (This->dxgi_surface) IUnknown_Release(This->dxgi_surface); HeapFree(GetProcessHeap(), 0, This); } @@ -270,7 +270,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic { WARN("Failed to create wined3d texture, hr %#x.\n", hr); if (texture->dxgi_surface) - IDXGISurface_Release(texture->dxgi_surface); + IUnknown_Release(texture->dxgi_surface); return hr; }

1 0

Piotr Caban : msvcp80: Fixed basic_string::rbegin and basic_string:: rend implementation.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: f9ff5fe3e6ebfa95cb814a587a4bb5a3c103e00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ff5fe3e6ebfa95cb814a587… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 28 12:13:34 2012 +0200 msvcp80: Fixed basic_string::rbegin and basic_string::rend implementation. --- dlls/msvcp80/Makefile.in | 3 + dlls/msvcp80/msvcp80.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 48 ++++++++-------- 3 files changed, 162 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ff5fe3e6ebfa95cb814…

1 0

Rico Schüller : d3dx9: Improve set_matrix_array().
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: a4dde8151b3a07dbdad600fd5d6798b86867b768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dde8151b3a07dbdad600fd5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:42:55 2012 +0200 d3dx9: Improve set_matrix_array(). --- dlls/d3dx9_36/shader.c | 64 ++++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1295f08..832ba40 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1158,84 +1158,70 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev UINT count, D3DXPARAMETER_CLASS class, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT registers_per_matrix; - UINT i, desc_count = 1; - UINT num_rows, num_columns; - UINT row_offset, column_offset; + struct ctab_constant *c = get_valid_constant(This, constant); + D3DXCONSTANT_DESC *desc; + UINT registers_per_matrix, num_rows, num_columns, i; + UINT row_offset = 1, column_offset = 1; const DWORD *data_ptr; FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) + if (!c) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + WARN("Invalid argument specified\n"); return D3DERR_INVALIDCALL; } + desc = &c->desc; - if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + if (desc->Class == D3DXPC_MATRIX_ROWS + || desc->Class == D3DXPC_MATRIX_COLUMNS + || desc->Class == D3DXPC_SCALAR) { - if (desc.Class == class) - { - column_offset = 1; - row_offset = 4; - } - else - { - column_offset = 4; - row_offset = 1; - } + if (desc->Class == class) row_offset = 4; + else column_offset = 4; if (class == D3DXPC_MATRIX_ROWS) { - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); + num_rows = min(desc->Rows, rows); + num_columns = min(desc->Columns, columns); } else { - num_rows = min(desc.Columns, columns); - num_columns = min(desc.Rows, rows); + num_rows = min(desc->Columns, columns); + num_columns = min(desc->Rows, rows); } - registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; - } - else if (desc.Class == D3DXPC_SCALAR) - { - column_offset = 1; - row_offset = 1; - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); - registers_per_matrix = 1; + registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows; } else { - FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc.Class)); + FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class)); return D3D_OK; } - switch (desc.RegisterSet) + switch (desc->RegisterSet) { case D3DXRS_FLOAT4: data_ptr = data; for (i = 0; i < count; i++) { - if (registers_per_matrix * (i + 1) > desc.RegisterCount) + HRESULT hr; + + if (registers_per_matrix * (i + 1) > desc->RegisterCount) break; - hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); + hr = set_float_matrix(matrix, desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); if (FAILED(hr)) return hr; - set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + set_float_shader_constant(This, device, desc->RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); data_ptr += rows * columns; } break; default: - FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet)); + FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet)); return E_NOTIMPL; }

1 0

Francois Gouget : msvcp100: Remove some unused functions.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: c19855bc967f8f05be38b1f7820c62444a5816ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19855bc967f8f05be38b1f78… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 28 00:41:40 2012 +0200 msvcp100: Remove some unused functions. --- dlls/msvcp100/ios.c | 588 ------------------------------------- dlls/msvcp100/locale.c | 139 --------- dlls/msvcp100/math.c | 81 ----- dlls/msvcp100/msvcp.h | 1 - dlls/msvcp100/string.c | 762 ------------------------------------------------ 5 files changed, 0 insertions(+), 1571 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19855bc967f8f05be38b…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 242f9acdf6cc9282332e9be235c1b7eae852964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=242f9acdf6cc9282332e9be23… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 27 11:17:11 2012 +0900 po: Update Korean translation. --- po/ko.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/ko.po b/po/ko.po index 510ac6b..1513900 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3437,6 +3437,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"장치를 사용하거나 안사용하게 한 후에, 연결된 조이스틱은 애플랫을 다시 시작하" +"기까지는 작동하지 않을 것입니다." #: joy.rc:47 msgid "Test Joystick"

1 0

Jacek Caban : d3d9/tests: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 9bb70e27399b3c399ee2a52a2f4e75583f70aaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb70e27399b3c399ee2a52a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:25 2012 +0200 d3d9/tests: Use proper helpers for iface calls. --- dlls/d3d9/tests/device.c | 12 ++++++------ dlls/d3d9/tests/stateblock.c | 18 +++++++++--------- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/vertexdeclaration.c | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7994a2a..8fd72cf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -107,7 +107,7 @@ static HRESULT reset_device(IDirect3DDevice9 *device, HWND device_window, BOOL w #define CHECK_RELEASE(obj,d,rc) \ if (obj) { \ int tmp1, rc_new = rc; \ - IUnknown_Release( obj ); \ + IUnknown_Release( (IUnknown*)obj ); \ tmp1 = get_refcount( (IUnknown *)d ); \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } @@ -154,7 +154,7 @@ static void check_mipmap_levels(IDirect3DDevice9 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %08x\n", hr); - if (texture) IUnknown_Release( texture ); + if (texture) IDirect3DBaseTexture9_Release( texture ); } static void test_mipmap_levels(void) @@ -196,10 +196,10 @@ static void test_mipmap_levels(void) cleanup: if (pDevice) { - UINT refcount = IUnknown_Release( pDevice ); + UINT refcount = IDirect3DDevice9_Release( pDevice ); ok(!refcount, "Device has %u references left.\n", refcount); } - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) IDirect3D9_Release( pD3d ); DestroyWindow( hwnd ); } @@ -255,10 +255,10 @@ static void test_checkdevicemultisampletype(void) cleanup: if (pDevice) { - UINT refcount = IUnknown_Release( pDevice ); + UINT refcount = IDirect3DDevice9_Release( pDevice ); ok(!refcount, "Device has %u references left.\n", refcount); } - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) IDirect3D9_Release( pD3d ); DestroyWindow( hwnd ); } diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index e33c7b4..0e05f7b 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -281,13 +281,13 @@ static int switch_render_target(IDirect3DDevice9 *device, struct event_data *eve ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) goto error; - IUnknown_Release(backbuffer); + IDirect3DSurface9_Release(backbuffer); event_data->new_swap_chain = swapchain; return EVENT_OK; error: - if (backbuffer) IUnknown_Release(backbuffer); - if (swapchain) IUnknown_Release(swapchain); + if (backbuffer) IDirect3DSurface9_Release(backbuffer); + if (swapchain) IDirect3DSwapChain9_Release(swapchain); return EVENT_ERROR; } @@ -299,12 +299,12 @@ static int revert_render_target(IDirect3DDevice9 *device, struct event_data *eve hret = IDirect3DDevice9_SetRenderTarget(device, 0, event_data->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(event_data->original_render_target); + IDirect3DSurface9_Release(event_data->original_render_target); return EVENT_ERROR; } - IUnknown_Release(event_data->original_render_target); - IUnknown_Release(event_data->new_swap_chain); + IDirect3DSurface9_Release(event_data->original_render_target); + IDirect3DSwapChain9_Release(event_data->new_swap_chain); return EVENT_OK; } @@ -361,7 +361,7 @@ static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_dat static int release_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_OK; } @@ -372,11 +372,11 @@ static int apply_stateblock(IDirect3DDevice9 *device, struct event_data *event_d hret = IDirect3DStateBlock9_Apply(event_data->stateblock); ok(hret == D3D_OK, "Apply returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_ERROR; } - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_OK; } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index ac1a287..36d2dac 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -181,7 +181,7 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) ok(rc.Pitch == pitch, "Wrong pitch for DXT%d lvl[%d (%dx%d)]: expected %d got %d\n", i + 1, j, descr.Width, descr.Height, pitch, rc.Pitch); } - IUnknown_Release( pTexture ); + IDirect3DTexture9_Release( pTexture ); } } diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 9d507a1..04a4289 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -267,11 +267,11 @@ static HRESULT test_fvf_to_decl(IDirect3DDevice9 *device, IDirect3DVertexDeclara else if (compare_elements(result_decl, expected_elements) != S_OK) goto fail; - if (result_decl) IUnknown_Release( result_decl ); + if (result_decl) IDirect3DVertexDeclaration9_Release( result_decl ); return S_OK; fail: - if (result_decl) IUnknown_Release( result_decl ); + if (result_decl) IDirect3DVertexDeclaration9_Release( result_decl ); return E_FAIL; } @@ -308,12 +308,12 @@ static HRESULT test_decl_to_fvf(IDirect3DDevice9* device, DWORD default_fvf, if (test_fvf != result_fvf) goto fail; IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); - if (vdecl) IUnknown_Release( vdecl ); + if (vdecl) IDirect3DVertexDeclaration9_Release( vdecl ); return S_OK; fail: IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); - if (vdecl) IUnknown_Release( vdecl ); + if (vdecl) IDirect3DVertexDeclaration9_Release( vdecl ); return E_FAIL; } @@ -644,7 +644,7 @@ static void test_fvf_decl_conversion(IDirect3DDevice9 *pDevice) cleanup: IDirect3DDevice9_SetVertexDeclaration ( pDevice, NULL ); - if ( default_decl ) IUnknown_Release (default_decl); + if ( default_decl ) IDirect3DVertexDeclaration9_Release (default_decl); } /* Check whether a declaration converted from FVF is shared.

1 0