June 2007 - Wine-Commits - list.winehq.org

Rob Shearman : rpcrt4: Use the offset to array data in embedded pointer format descriptions.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 0f826e7cc17f5ec4bf263c1a1e9ddb65b9d369d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f826e7cc17f5ec4bf263c1a1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:12:00 2007 +0100 rpcrt4: Use the offset to array data in embedded pointer format descriptions. --- dlls/rpcrt4/ndr_marshall.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index adf7aba..de6f509 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1137,10 +1137,10 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, } for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + (i * stride); - unsigned char *bufbase = Mark + (i * stride); + unsigned char *membase = pMemory + ofs + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; - /* ofs doesn't seem to matter in this context */ + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1210,9 +1210,10 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = *ppMemory + (i * stride); - unsigned char *bufbase = Mark + (i * stride); + unsigned char *membase = *ppMemory + ofs + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1272,11 +1273,11 @@ static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 8; break; } - /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + (i * stride); + unsigned char *membase = pMemory + ofs + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; @@ -1338,7 +1339,7 @@ static unsigned long EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *bufbase = Mark + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1395,11 +1396,11 @@ static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 8; break; } - /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; unsigned char *membase = pMemory + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory;

1 0

Rob Shearman : widl: Always write out pointers if the structure is a pointer structure. Pointer are optional for conformant varying structures.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 4050c5f035cb63ebcfababd8e285568464d812c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4050c5f035cb63ebcfababd8e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:11:05 2007 +0100 widl: Always write out pointers if the structure is a pointer structure. Pointer are optional for conformant varying structures. --- tools/widl/typegen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 300a881..823f6e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1624,7 +1624,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, print_file(file, 2, "NdrFcShort(0x0),\t/* FIXME: pointer stuff */\n"); *tfsoff += 2; } - else if (has_pointers) + else if ((type->type == RPC_FC_PSTRUCT) || + (type->type == RPC_FC_CPSTRUCT) || + (type->type == RPC_FC_CVSTRUCT && has_pointers)) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD);

1 0

Alexandre Julliard : ntdll: Improved the stub behavior of NtQuerySystemInformation( SystemModuleInformation).
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 5817e366346fc9c0e23d30c9d65cbf47c5815e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5817e366346fc9c0e23d30c9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 19 16:58:42 2007 +0200 ntdll: Improved the stub behavior of NtQuerySystemInformation(SystemModuleInformation). --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/nt.c | 15 ++------------- dlls/ntdll/tests/info.c | 6 ++---- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 77e5308..2826d19 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1859,6 +1859,7 @@ NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, char* ptr; PLIST_ENTRY mark, entry; PLDR_MODULE mod; + WORD id = 0; smi->ModulesCount = 0; @@ -1875,7 +1876,7 @@ NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, sm->ImageBaseAddress = mod->BaseAddress; sm->ImageSize = mod->SizeOfImage; sm->Flags = mod->Flags; - sm->Id = 0; /* FIXME */ + sm->Id = id++; sm->Rank = 0; /* FIXME */ sm->Unknown = 0; /* FIXME */ str.Length = 0; diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3332821..ed707c0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -844,19 +844,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( } break; case SystemModuleInformation: - { - SYSTEM_MODULE_INFORMATION smi; - - memset(&smi, 0, sizeof(smi)); - len = sizeof(smi); - - if ( Length >= len) - { - if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else memcpy( SystemInformation, &smi, len); - } - else ret = STATUS_INFO_LENGTH_MISMATCH; - } + /* FIXME: should be system-wide */ + ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); break; case SystemHandleInformation: { diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4837211..526c62e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -382,10 +382,8 @@ static void test_query_module(void) ModuleCount = smi->ModulesCount; sm = &smi->Modules[0]; - todo_wine{ - /* our implementation is a stub for now */ - ok( ModuleCount > 0, "Expected some modules to be loaded\n"); - } + /* our implementation is a stub for now */ + ok( ModuleCount > 0, "Expected some modules to be loaded\n"); /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ for (i = 0; i < ModuleCount ; i++)

1 0

Rob Shearman : widl: Fix detection of structures with non-conformant strings.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: be4cdefbf35c44bff7aa6e3097b63380e6a3ffe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4cdefbf35c44bff7aa6e309… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:08:26 2007 +0100 widl: Fix detection of structures with non-conformant strings. --- tools/widl/parser.y | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5f30ccc..4933c43 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1691,7 +1691,8 @@ static int get_struct_type(var_list_t *fields) { if (is_string_type(field->attrs, field->type)) { - has_conformance = 1; + if (is_conformant_array(field->type)) + has_conformance = 1; has_variance = 1; continue; }

1 0

Rob Shearman : widl: Write out embedded pointers for the element type when writing out arrays.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 4292776b83d22cf545ff1f4f23f560a325ffb47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4292776b83d22cf545ff1f4f2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:09:18 2007 +0100 widl: Write out embedded pointers for the element type when writing out arrays. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f74e886..300a881 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1518,7 +1518,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; - write_pointer_description(file, type, 0, 0, typestring_offset); + write_pointer_description(file, type->ref, 0, 0, typestring_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 1; }

1 0

Rob Shearman : widl: Implement pointer descriptions for all embedded pointer types.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 6ad13f3ed189a3492d69d793a8821921b359a01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad13f3ed189a3492d69d793a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:05:25 2007 +0100 widl: Implement pointer descriptions for all embedded pointer types. --- tools/widl/typegen.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 347 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad13f3ed189a3492d69d…

1 0

James Hawkins : ntoskrnl.exe: Add a stub implementation of KeInitializeTimer.
by Alexandre Julliard June 19, 2007

June 19, 2007

Module: wine Branch: master Commit: fbbd91544f2ad1cb179ee6f3cbe124f8a9b79f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbd91544f2ad1cb179ee6f3c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 18 14:19:09 2007 -0700 ntoskrnl.exe: Add a stub implementation of KeInitializeTimer. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3bbb205..d793d1a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -419,6 +419,15 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) /*********************************************************************** + * KeInitializeTimer (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimer( PKTIMER Timer ) +{ + FIXME("%p\n", Timer); +} + + +/*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) */ void WINAPI KeQuerySystemTime( LARGE_INTEGER *time ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 192e255..45449a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -553,7 +553,7 @@ @ stub KeInitializeQueue @ stub KeInitializeSemaphore @ stub KeInitializeSpinLock -@ stub KeInitializeTimer +@ stdcall KeInitializeTimer(ptr) @ stub KeInitializeTimerEx @ stub KeInsertByKeyDeviceQueue @ stub KeInsertDeviceQueue diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 38b3625..8aabf79 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -780,6 +780,14 @@ typedef struct _MDL { ULONG ByteOffset; } MDL, *PMDL; +typedef struct _KTIMER { + DISPATCHER_HEADER Header; + ULARGE_INTEGER DueTime; + LIST_ENTRY TimerListEntry; + struct _KDPC *Dpc; + LONG Period; +} KTIMER, *PKTIMER; + typedef struct _KSYSTEM_TIME { ULONG LowPart; LONG High1Time;

1 0

Tim Schwartz : net.exe: Add NET STOP.
by Alexandre Julliard June 19, 2007

June 19, 2007

Module: wine Branch: master Commit: c46cacc81683ae7d443d9a9383baa2bf8622f165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46cacc81683ae7d443d9a938… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon Jun 18 12:48:06 2007 -0500 net.exe: Add NET STOP. --- programs/net/net.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 3a6c39a..4af72ae 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -21,6 +21,38 @@ #include <windows.h> #define NET_START 0001 +#define NET_STOP 0002 + +static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) +{ + LPENUM_SERVICE_STATUS dependencies = NULL; + DWORD buffer_size = 0; + DWORD count = 0, counter; + BOOL result; + SC_HANDLE dependent_serviceHandle; + SERVICE_STATUS_PROCESS ssp; + + result = EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count); + + if(!result && (GetLastError() == ERROR_MORE_DATA)) + { + dependencies = HeapAlloc(GetProcessHeap(), 0, buffer_size); + if(EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count)) + { + for(counter = 0; counter < count; counter++) + { + printf("Stopping dependent service: %s\n", dependencies[counter].lpDisplayName); + dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); + if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); + if(!result) printf("Could not stop service %s\n", dependencies[counter].lpDisplayName); + } + } + } + + if(result) result = ControlService(serviceHandle, SERVICE_CONTROL_STOP, (LPSERVICE_STATUS)&ssp); + HeapFree(GetProcessHeap(), 0, dependencies); + return result; +} static BOOL net_service(int operation, char *service_name) { @@ -57,6 +89,14 @@ static BOOL net_service(int operation, char *service_name) if(!result) printf("failed to start.\n"); else printf("was started successfully.\n"); break; + case NET_STOP: + printf("The %s service is stopping.\n", service_display_name); + result = StopService(SCManager, serviceHandle); + + printf("The %s service ", service_display_name); + if(!result) printf("failed to stop.\n"); + else printf("was stopped successfully.\n"); + break; } CloseServiceHandle(serviceHandle); @@ -70,7 +110,7 @@ int main(int argc, char *argv[]) if (argc < 2) { printf("The syntax of this command is:\n\n"); - printf("NET [ HELP | START ]\n"); + printf("NET [ HELP | START | STOP ]\n"); return 1; } @@ -79,7 +119,7 @@ int main(int argc, char *argv[]) printf("The syntax of this command is:\n\n"); printf("NET HELP command\n -or-\nNET command /HELP\n\n"); printf(" Commands available are:\n"); - printf(" NET HELP NET START\n"); + printf(" NET HELP NET START NET STOP\n"); } if(!strcasecmp(argv[1], "start")) @@ -97,5 +137,20 @@ int main(int argc, char *argv[]) return 0; } + if(!strcasecmp(argv[1], "stop")) + { + if(argc < 3) + { + printf("Specify service name to stop.\n"); + return 1; + } + + if(!net_service(NET_STOP, argv[2])) + { + return 1; + } + return 0; + } + return 0; }

1 0

Stefan Dösinger : d3d9: Hold the lock in stateblock methods.
by Alexandre Julliard June 19, 2007

June 19, 2007

Module: wine Branch: master Commit: 80f792f350f253fca653c713bd17ab74d70ed34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f792f350f253fca653c713b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 12 13:50:51 2007 +0200 d3d9: Hold the lock in stateblock methods. --- dlls/d3d9/stateblock.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 5bfc870..2cd79ea 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DStateBlock_Release(This->wineD3DStateBlock); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,20 +69,35 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface /* IDirect3DStateBlock9 Interface follow: */ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(LPDIRECT3DSTATEBLOCK9 iface, IDirect3DDevice9** ppDevice) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; - TRACE("(%p) Relay\n", This); - return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + HRESULT hr; + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 iface) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DStateBlock_Capture(This->wineD3DStateBlock); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + HRESULT hr; + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DStateBlock_Apply(This->wineD3DStateBlock); + LeaveCriticalSection(&d3d9_cs); + return hr; } @@ -110,7 +127,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3 object->lpVtbl = &Direct3DStateBlock9_Vtbl; object->ref = 1; + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown*)object); + LeaveCriticalSection(&d3d9_cs); if(hrc != D3D_OK){ FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", This); HeapFree(GetProcessHeap(), 0, object); @@ -126,8 +145,13 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3 HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(LPDIRECT3DDEVICE9 iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - TRACE("(%p) Relay\n", This); - return IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); + HRESULT hr; + TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9 iface, IDirect3DStateBlock9** ppSB) { @@ -141,7 +165,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9 iface, IDi /* Tell wineD3D to endstatablock before anything else (in case we run out * of memory later and cause locking problems) */ + EnterCriticalSection(&d3d9_cs); hr=IWineD3DDevice_EndStateBlock(This->WineD3DDevice,&wineD3DStateBlock); + LeaveCriticalSection(&d3d9_cs); if(hr!= D3D_OK){ FIXME("IWineD3DDevice_EndStateBlock returned an error\n"); return hr;

1 0

Stefan Dösinger : d3d9: Release the wined3d query when the d3d9 query is destroyed.
by Alexandre Julliard June 19, 2007

June 19, 2007

Module: wine Branch: master Commit: 9570cd5be461208a58d3f0c2a2029c97ae6ba0d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9570cd5be461208a58d3f0c2a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 12 10:17:20 2007 +0200 d3d9: Release the wined3d query when the d3d9 query is destroyed. --- dlls/d3d9/query.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index a11aace..94cd7ec 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -57,6 +57,9 @@ static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); + IWineD3DQuery_Release(This->wineD3DQuery); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); }

1 0