April 2007 - Wine-commits - list.winehq.org

Hans Leidekker : kernel32: Allow any amount of whitespace between the words ANSI and SCSI in /proc/ scsi/scsi.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: ce0da3e75f07765f33b52173b52d0557563b8678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0da3e75f07765f33b52173b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 11 16:00:58 2007 +0200 kernel32: Allow any amount of whitespace between the words ANSI and SCSI in /proc/scsi/scsi. --- dlls/kernel32/oldconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index c386450..cf892e8 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -313,7 +313,7 @@ static int SCSI_getprocentry( FILE * procfile, struct LinuxProcScsiDevice * dev } result = fscanf( procfile, - " Type:%*3[ ]%32c%*1[ ]ANSI%*1[ ]SCSI%*1[ ]revision:%*1[ ]%x\n", + " Type:%*3[ ]%32c%*1[ ]ANSI SCSI%*1[ ]revision:%*1[ ]%x\n", dev->type, &dev->ansirev ); if( result != 2 )

1 0

Paul Vriens : advapi32/tests: Fix RegQueryValueExA test for win9x and ME.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 402f4e9c74681a9aaf00487f18d2bdf026eb2692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402f4e9c74681a9aaf00487f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Apr 11 20:33:02 2007 +0200 advapi32/tests: Fix RegQueryValueExA test for win9x and ME. --- dlls/advapi32/tests/registry.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9d2a544..2d84058 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -369,13 +369,20 @@ static void test_query_value_ex(void) size = 0xdeadbeef; ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, NULL, &size); ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret); - ok(size == 0, "size should have been set to 0 instead of %d\n", size); /* the type parameter is cleared on Win9x, but is set to a random value on - * NT, so don't do this test there */ + * NT, so don't do that test there. The size parameter is left untouched on Win9x + * but cleared on NT+, this can be tested on all platforms. + */ if (GetVersion() & 0x80000000) + { ok(type == 0, "type should have been set to 0 instead of 0x%x\n", type); + ok(size == 0xdeadbeef, "size should have been left untouched (0xdeadbeef)\n"); + } else + { trace("test_query_value_ex: type set to: 0x%08x\n", type); + ok(size == 0, "size should have been set to 0 instead of %d\n", size); + } size = sizeof(buffer); ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, buffer, &size);

1 0

Andrew Talbot : ntdll: Void functions should not return a value.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: a7aa7cb8b5172eb0ad8c7d0657863ddbface6350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7aa7cb8b5172eb0ad8c7d065… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 11 21:30:30 2007 +0100 ntdll: Void functions should not return a value. --- dlls/ntdll/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 92aa808..ae56aae 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -98,7 +98,7 @@ void * __cdecl NTDLL_bsearch( const void *key, const void *base, size_t nmemb, void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *) ) { - return qsort( base, nmemb, size, compar ); + qsort( base, nmemb, size, compar ); }

1 0

Andrew Talbot : ntdll: Remove superfluous semicolons.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: ab2a48ae437da1168dd61cfe8c4d78b055867294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2a48ae437da1168dd61cfe8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 11 21:42:56 2007 +0100 ntdll: Remove superfluous semicolons. --- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/signal_i386.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index be82a84..7f0da0c 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -391,7 +391,7 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ) #else void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) { @@ -483,7 +483,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID un /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlUnwind, 16, 16 ); +DEFINE_REGS_ENTRYPOINT( RtlUnwind, 16, 16 ) #else void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip, PEXCEPTION_RECORD pRecord, PVOID returnEax ) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 75dbe7c..09419b5 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -472,7 +472,7 @@ void WINAPI __regs_relay_call_from_32_regs( struct relay_descr *descr, unsigned } } extern void WINAPI relay_call_from_32_regs(void); -DEFINE_REGS_ENTRYPOINT( relay_call_from_32_regs, 16, 16 ); +DEFINE_REGS_ENTRYPOINT( relay_call_from_32_regs, 16, 16 ) /*********************************************************************** @@ -945,8 +945,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT86 *context ) } /* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0, 0 ); -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ) #else /* __i386__ */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 106ebed..69ae4dd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -732,7 +732,7 @@ void WINAPI __regs_get_cpu_context( CONTEXT *context, CONTEXT *regs ) *context = *regs; save_fpu( context ); } -DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ) /***********************************************************************

1 0

Kai Blin : ntdll: Don't use settimeofday() to attempt to set the timezone.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 21e6beed5c75ac795f8e3aa43a2c2ebaeb88d39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e6beed5c75ac795f8e3aa43… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Apr 11 14:18:23 2007 +0200 ntdll: Don't use settimeofday() to attempt to set the timezone. --- dlls/ntdll/time.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index ffec919..2a05f09 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1054,23 +1054,9 @@ NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION *tzinfo) * Success: STATUS_SUCCESS. * Failure: An NTSTATUS error code indicating the problem. * - * BUGS - * Uses the obsolete unix timezone structure and tz_dsttime member. */ NTSTATUS WINAPI RtlSetTimeZoneInformation( const RTL_TIME_ZONE_INFORMATION *tzinfo ) { -#ifdef HAVE_SETTIMEOFDAY - struct timezone tz; - - tz.tz_minuteswest = tzinfo->Bias; -#ifdef DST_NONE - tz.tz_dsttime = DST_NONE; -#else - tz.tz_dsttime = 0; -#endif - if(!settimeofday(NULL, &tz)) - return STATUS_SUCCESS; -#endif return STATUS_PRIVILEGE_NOT_HELD; }

1 0

Stefan Dösinger : wined3d: Dirtify the shader and declaration states if the bound interface is destroyed .
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 0d88a38238088ed5a36bbe56ec5c9b62106fa8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d88a38238088ed5a36bbe56e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 11 14:02:38 2007 +0200 wined3d: Dirtify the shader and declaration states if the bound interface is destroyed. --- dlls/wined3d/pixelshader.c | 12 ++++++++++++ dlls/wined3d/vertexdeclaration.c | 5 +++++ dlls/wined3d/vertexshader.c | 5 +++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 962b3d5..6627c06 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -73,6 +73,18 @@ static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + /* SetPixelShader does not AddRef. If the bound pixel shader is destroyed, the pointer in the stateblock remains + * unchanged. Drawing again will most likely crash, even on windows. A problem can occur if the application creates + * a new pixel shader which resides at the same address. Then SetPixelShader will think it is a NOP change, and won't + * dirtify the state. + * + * Do NOT call GetPixelShader here. This will addRef and cause a recursion. And do NOT set the pixel shader to NULL, + * Windows does not do that(Although no test exists since they'd crash randomly) + */ + if(iface == ((IWineD3DDeviceImpl *) This->baseShader.device)->stateBlock->pixelShader) { + IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *) This->baseShader.device, STATE_PIXELSHADER); + } + if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { struct list *linked_programs = &This->baseShader.linked_programs; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 099129b..bdf07b6 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -98,6 +98,11 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + if(iface == This->wineD3DDevice->stateBlock->vertexDecl) { + /* See comment in PixelShader::Release */ + IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_VDECL); + } + HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 22c49c2..f02dcdb 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -464,6 +464,11 @@ static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + if(iface == ((IWineD3DDeviceImpl *) This->baseShader.device)->stateBlock->vertexShader) { + /* See comment in PixelShader::Release */ + IWineD3DDeviceImpl_MarkStateDirty((IWineD3DDeviceImpl *) This->baseShader.device, STATE_VSHADER); + } + if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { struct list *linked_programs = &This->baseShader.linked_programs;

1 0

Stefan Dösinger : d3d9: AddRef the device in IDirect3DVertexDeclaration9::AddRef.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 2db7691ec8930e64884ae86dc74deca849982052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db7691ec8930e64884ae86dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 7 22:56:42 2007 +0200 d3d9: AddRef the device in IDirect3DVertexDeclaration9::AddRef. --- dlls/d3d9/vertexdeclaration.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 315107e..84d4359 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -202,6 +202,10 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_AddRef(LPDIRECT3DVERTEXDECLA TRACE("(%p) : AddRef from %d\n", This, ref - 1); + if(ref == 1) { + IUnknown_AddRef(This->parentDevice); + } + return ref; } @@ -324,7 +328,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 } object->lpVtbl = &Direct3DVertexDeclaration9_Vtbl; - object->ref = 1; + object->ref = 0; object->elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(D3DVERTEXELEMENT9)); if (!object->elements) { @@ -347,9 +351,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 HeapFree(GetProcessHeap(), 0, object->elements); HeapFree(GetProcessHeap(), 0, object); } else { - IUnknown_AddRef(iface); object->parentDevice = iface; *ppDecl = (LPDIRECT3DVERTEXDECLARATION9) object; + IUnknown_AddRef(*ppDecl); TRACE("(%p) : Created vertex declaration %p\n", This, object); } return hr;

1 0

Stefan Dösinger : d3d9: Fix the circular converted vertex declaration reference.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 35dd693a790584f4f14334461e43813d524aa2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dd693a790584f4f14334461… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 8 00:11:09 2007 +0200 d3d9: Fix the circular converted vertex declaration reference. --- dlls/d3d9/device.c | 7 +++---- dlls/d3d9/tests/visual.c | 7 ------- dlls/d3d9/vertexdeclaration.c | 22 ++++++++++++++++------ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e9c4078..8fc7511 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -62,8 +62,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { if (ref == 0) { This->inDestruction = TRUE; - if (This->convertedDecl != NULL) - IUnknown_Release(This->convertedDecl); + IDirect3DDevice9_SetVertexDeclaration(iface, NULL); IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D9CB_DestroyDepthStencilSurface, D3D9CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice); HeapFree(GetProcessHeap(), 0, This); @@ -784,14 +783,14 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) hr = IDirect3DDevice9Impl_CreateVertexDeclaration(iface, elements, &pDecl); if (hr != S_OK) goto exit; - + hr = IDirect3DDevice9Impl_SetVertexDeclaration(iface, pDecl); if (hr != S_OK) goto exit; This->convertedDecl = pDecl; - pDecl = NULL; exit: HeapFree(GetProcessHeap(), 0, elements); + /* If allocated and set correctly, this will reduce the refcount to 0, but not destroy the declaration */ if (pDecl) IUnknown_Release(pDecl); if (hr != S_OK) return hr; } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 33c4231..bde2a5b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -259,11 +259,6 @@ static void lighting_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); - - /* Hack for a bug in d3d9: SetFVF creates a converted vertex declaration, with a circular refcount. - * This prevents the screen resolution from being restored correctly on device release. Unset the vdecl - */ - IDirect3DDevice9_SetVertexDeclaration(device, NULL); } static void clear_test(IDirect3DDevice9 *device) @@ -547,8 +542,6 @@ static void fog_test(IDirect3DDevice9 *device) /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %s\n", DXGetErrorString9(hr)); - - IDirect3DDevice9_SetVertexDeclaration(device, NULL); } /* This test verifies the behaviour of cube maps wrt. texture wrapping. diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 84d4359..892f8ac 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -216,10 +216,15 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); - IUnknown_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This->elements); - HeapFree(GetProcessHeap(), 0, This); + IDirect3DDevice9 *parentDevice = This->parentDevice; + BOOL converted = ((IDirect3DDevice9Impl *) parentDevice)->convertedDecl == iface; + + if(!converted) { + IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); + HeapFree(GetProcessHeap(), 0, This->elements); + HeapFree(GetProcessHeap(), 0, This); + } + IUnknown_Release(parentDevice); } return ref; } @@ -367,12 +372,17 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 ifa TRACE("(%p) : Relay\n", iface); if (This->convertedDecl && This->convertedDecl != pDecl) { - IUnknown_Release(This->convertedDecl); + IDirect3DVertexDeclaration9Impl *iDecl = (IDirect3DVertexDeclaration9Impl *) This->convertedDecl; + + /* Will need locking once we claim to be thread safe */ + if(iDecl->ref == 0) { + IUnknown_AddRef(This->convertedDecl); + IUnknown_Release(This->convertedDecl); + } This->convertedDecl = NULL; } hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, pDeclImpl == NULL ? NULL : pDeclImpl->wineD3DVertexDeclaration); - return hr; }

1 0

Ivan Gyurdiev : d3d9: Break out two helper functions from test_fvf_to_decl.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 46c5d223ff2112d33cd5bd6e57927fb2d0731cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c5d223ff2112d33cd5bd6e5… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Oct 14 16:32:29 2006 -0400 d3d9: Break out two helper functions from test_fvf_to_decl. --- dlls/d3d9/tests/vertexdeclaration.c | 201 +++++++++++++++++++--------------- 1 files changed, 112 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46c5d223ff2112d33cd5b…

1 0

Ivan Gyurdiev : d3d9: Add a test for the converted vertex decl.
by Alexandre Julliard 12 Apr '07

12 Apr '07

Module: wine Branch: master Commit: 9580c3f6c3087ccf972421b6811af1021347bb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9580c3f6c3087ccf972421b68… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Oct 14 16:32:29 2006 -0400 d3d9: Add a test for the converted vertex decl. --- dlls/d3d9/tests/vertexdeclaration.c | 75 +++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 9009f50..4290c57 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -643,6 +643,80 @@ static void test_fvf_decl_conversion(IDirect3DDevice9 *pDevice) if ( default_decl ) IUnknown_Release (default_decl); } +/* Check whether a declaration converted from FVF is shared. + * Check whether refcounts behave as expected */ +static void test_fvf_decl_management( + IDirect3DDevice9* device) { + + HRESULT hr; + IDirect3DVertexDeclaration9* result_decl1 = NULL; + IDirect3DVertexDeclaration9* result_decl2 = NULL; + IDirect3DVertexDeclaration9* result_decl3 = NULL; + int ref1, ref2, ref3; + + DWORD test_fvf1 = D3DFVF_XYZRHW; + DWORD test_fvf2 = D3DFVF_NORMAL; + CONST D3DVERTEXELEMENT9 test_elements1[] = + { { 0, 0, D3DDECLTYPE_FLOAT4, 0, D3DDECLUSAGE_POSITIONT, 0 }, D3DDECL_END() }; + CONST D3DVERTEXELEMENT9 test_elements2[] = + { { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_NORMAL, 0 }, D3DDECL_END() }; + + /* Clear down any current vertex declaration */ + hr = IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); + ok (SUCCEEDED(hr), "SetVertexDeclaration returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* Conversion */ + hr = IDirect3DDevice9_SetFVF( device, test_fvf1); + ok(SUCCEEDED(hr), "SetFVF returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* Get converted decl (#1) */ + hr = IDirect3DDevice9_GetVertexDeclaration ( device, &result_decl1); + ok(SUCCEEDED(hr), "GetVertexDeclaration returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* Get converted decl again (#2) */ + hr = IDirect3DDevice9_GetVertexDeclaration ( device, &result_decl2); + ok(SUCCEEDED(hr), "GetVertexDeclaration returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* Conversion */ + hr = IDirect3DDevice9_SetFVF( device, test_fvf2); + ok(SUCCEEDED(hr), "SetFVF returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* The contents should correspond to the second conversion */ + VDECL_CHECK(compare_elements(result_decl1, test_elements1)); + + /* Get converted decl (#3) */ + hr = IDirect3DDevice9_GetVertexDeclaration ( device, &result_decl3); + ok(SUCCEEDED(hr), "GetVertexDeclaration returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + /* The object should be the same */ + ok (result_decl1 == result_decl2, "Declaration object changes on the second Get() call\n"); + ok (result_decl2 != result_decl3, "Declaration object did not change during conversion\n"); + + /* The contents should correspond to the second conversion */ + VDECL_CHECK(compare_elements(result_decl3, test_elements2)); + + /* The refcounts should all be 1 */ + ref1 = get_refcount((IUnknown*) result_decl1); + ref2 = get_refcount((IUnknown*) result_decl2); + ref3 = get_refcount((IUnknown*) result_decl3); + ok (ref1 == 2, "Refcount #1 is %d, expected 2\n", ref1); + ok (ref2 == 2, "Refcount #2 is %d, expected 2\n", ref2); + ok (ref3 == 1, "Refcount #3 is %d, expected 1\n", ref3); + + /* Clear down any current vertex declaration */ + hr = IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); + ok (SUCCEEDED(hr), "SetVertexDeclaration returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) return; + + return; +} + START_TEST(vertexdeclaration) { static D3DVERTEXELEMENT9 simple_decl[] = { @@ -676,4 +750,5 @@ START_TEST(vertexdeclaration) test_get_set_vertex_declaration(device_ptr, decl_ptr); test_get_declaration(decl_ptr, simple_decl, simple_decl_num_elements); test_fvf_decl_conversion(device_ptr); + test_fvf_decl_management(device_ptr); }

1 0