January 2007 - Wine-Commits

Andrew Talbot : widl: Fix memory leaks.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: d3972880c0170a0539db7ed0a5e6db41f4ea1b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3972880c0170a0539db7ed0a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 4 16:57:54 2007 +0000 widl: Fix memory leaks. --- tools/widl/write_msft.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a624e6d..b2ec44a 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2525,7 +2525,11 @@ int create_msft_typelib(typelib_t *typel if (ctl2_alloc_segment(msft, MSFT_SEG_GUIDHASH, 0x80, 0x80)) { failed = 1; } if (ctl2_alloc_segment(msft, MSFT_SEG_NAMEHASH, 0x200, 0x200)) { failed = 1; } - if(failed) return 0; + if(failed) + { + free(msft); + return 0; + } msft->typelib_guidhash_segment = (int *)msft->typelib_segment_data[MSFT_SEG_GUIDHASH]; msft->typelib_namehash_segment = (int *)msft->typelib_segment_data[MSFT_SEG_NAMEHASH]; @@ -2557,5 +2561,6 @@ int create_msft_typelib(typelib_t *typel add_entry(msft, entry); save_all_changes(msft); + free(msft); return 1; }

1 0

Andrew Talbot : dmband: Declare some functions static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: c8df290e3c05c68a258233d52b2199f20752893b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8df290e3c05c68a258233d52… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 4 17:04:06 2007 +0000 dmband: Declare some functions static. --- dlls/dmband/dmutils.c | 207 +++++++++++++++++++++++++------------------------ dlls/dmband/dmutils.h | 11 --- 2 files changed, 104 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8df290e3c05c68a25823…

1 0

Andrew Talbot : ddraw: Declare some functions static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 386fdd81e96a2111c23bd18fb41496d2b8278b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386fdd81e96a2111c23bd18fb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 4 17:07:43 2007 +0000 ddraw: Declare some functions static. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/utils.c | 39 ++++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 8828aad..ca3bc76 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -631,7 +631,6 @@ typedef struct } member_info; /* Structure copy */ -#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) #define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) } #define DD_STRUCT_COPY_BYSIZE(to,from) \ diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index bf31780..a80688c 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -void DDRAW_dump_flags_(DWORD flags, const flag_info* names, size_t num_names, int newline); /***************************************************************************** * PixelFormat_WineD3DtoDD @@ -629,6 +628,25 @@ DDRAW_dump_DDCOLORKEY(const DDCOLORKEY * { DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } + +#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) +static void +DDRAW_dump_flags_(DWORD flags, + const flag_info* names, + size_t num_names, + int newline) +{ + unsigned int i; + + for (i=0; i < num_names; i++) + if ((flags & names[i].val) || /* standard flag value */ + ((!flags) && (!names[i].val))) /* zero value only */ + DPRINTF("%s ", names[i].name); + + if (newline) + DPRINTF("\n"); +} + void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) { static const flag_info flags[] = { @@ -702,23 +720,6 @@ DDRAW_dump_DDSCAPS(const DDSCAPS *in) DDRAW_dump_DDSCAPS2(&in_bis); } -void -DDRAW_dump_flags_(DWORD flags, - const flag_info* names, - size_t num_names, - int newline) -{ - unsigned int i; - - for (i=0; i < num_names; i++) - if ((flags & names[i].val) || /* standard flag value */ - ((!flags) && (!names[i].val))) /* zero value only */ - DPRINTF("%s ", names[i].name); - - if (newline) - DPRINTF("\n"); -} - static void DDRAW_dump_pixelformat_flag(DWORD flagmask) { @@ -743,7 +744,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagma DDRAW_dump_flags_(flagmask, flags, sizeof(flags)/sizeof(flags[0]), 0); } -void +static void DDRAW_dump_members(DWORD flags, const void* data, const member_info* mems,

1 0

Andrew Talbot : d3d9: Declare some functions static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 590bca8425f8a7238100fac15eea4c333ab77305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590bca8425f8a7238100fac15… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 4 17:01:21 2007 +0000 d3d9: Declare some functions static. --- dlls/d3d9/directx.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index f49c11c..f360b4e 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -213,9 +213,9 @@ ULONG WINAPI D3D9CB_DestroyRenderTarget( return IDirect3DSurface9_Release((IDirect3DSurface9*) surfaceParent); } -HRESULT WINAPI D3D9CB_CreateAdditionalSwapChain(IUnknown *device, - WINED3DPRESENT_PARAMETERS* pPresentationParameters, - IWineD3DSwapChain ** ppSwapChain) { +static HRESULT WINAPI D3D9CB_CreateAdditionalSwapChain(IUnknown *device, + WINED3DPRESENT_PARAMETERS* pPresentationParameters, + IWineD3DSwapChain ** ppSwapChain) { HRESULT res = D3D_OK; IDirect3DSwapChain9Impl *d3dSwapChain = NULL; D3DPRESENT_PARAMETERS localParameters; @@ -308,9 +308,10 @@ ULONG WINAPI D3D9CB_DestroyDepthStencilS return IDirect3DSurface9_Release((IDirect3DSurface9*) surfaceParent); } -HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, - DWORD BehaviourFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, - IDirect3DDevice9** ppReturnedDeviceInterface) { +static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + IDirect3DDevice9** ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; IDirect3DDevice9Impl *object = NULL;

1 0

Rob Shearman : wininet: Remove the custom thread pool implementation and use QueueUserWorkItem instead .
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 02c89e5c6f7cf34bdaaa8e83f755c6373bf7dfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c89e5c6f7cf34bdaaa8e83f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:26:31 2007 +0000 wininet: Remove the custom thread pool implementation and use QueueUserWorkItem instead. --- dlls/wininet/internet.c | 182 +++++------------------------------------------ dlls/wininet/internet.h | 3 - 2 files changed, 18 insertions(+), 167 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6a155c5..cef4526 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -#define MAX_IDLE_WORKER 1000*60*1 -#define MAX_WORKER_THREADS 10 #define RESPONSE_TIMEOUT 30 typedef struct @@ -83,18 +81,8 @@ typedef struct static VOID INTERNET_CloseHandle(LPWININETHANDLEHEADER hdr); HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext); -static VOID INTERNET_ExecuteWork(void); static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; -static LONG dwNumThreads; -static LONG dwNumIdleThreads; -static LONG dwNumJobs; -static HANDLE hEventArray[2]; -#define hQuitEvent hEventArray[0] -#define hWorkEvent hEventArray[1] -static CRITICAL_SECTION csQueue; -static LPWORKREQUEST lpHeadWorkQueue; -static LPWORKREQUEST lpWorkQueueTail; static HMODULE WININET_hModule; #define HANDLE_CHUNK_SIZE 0x10 @@ -246,16 +234,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; - hQuitEvent = CreateEventW(0, TRUE, FALSE, NULL); - hWorkEvent = CreateEventW(0, FALSE, FALSE, NULL); - InitializeCriticalSection(&csQueue); - URLCacheContainers_CreateDefaults(); - dwNumThreads = 0; - dwNumIdleThreads = 0; - dwNumJobs = 0; - WININET_hModule = (HMODULE)hinstDLL; case DLL_THREAD_ATTACH: @@ -278,12 +258,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, HeapFree(GetProcessHeap(), 0, TlsGetValue(g_dwTlsErrIndex)); TlsFree(g_dwTlsErrIndex); } - - SetEvent(hQuitEvent); - - CloseHandle(hQuitEvent); - CloseHandle(hWorkEvent); - DeleteCriticalSection(&csQueue); break; } @@ -3084,107 +3058,18 @@ DWORD INTERNET_GetLastError(void) */ static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) { - DWORD dwWaitRes; - - while (1) - { - if(dwNumJobs > 0) { - INTERNET_ExecuteWork(); - continue; - } - dwWaitRes = WaitForMultipleObjects(2, hEventArray, FALSE, MAX_IDLE_WORKER); - - if (dwWaitRes == WAIT_OBJECT_0 + 1) - INTERNET_ExecuteWork(); - else - break; - - InterlockedIncrement(&dwNumIdleThreads); - } - - InterlockedDecrement(&dwNumIdleThreads); - InterlockedDecrement(&dwNumThreads); - TRACE("Worker thread exiting\n"); - return TRUE; -} - - -/*********************************************************************** - * INTERNET_InsertWorkRequest (internal) - * - * Insert work request into queue - * - * RETURNS - * - */ -static BOOL INTERNET_InsertWorkRequest(LPWORKREQUEST lpWorkRequest) -{ - BOOL bSuccess = FALSE; - LPWORKREQUEST lpNewRequest; - - TRACE("\n"); - - lpNewRequest = HeapAlloc(GetProcessHeap(), 0, sizeof(WORKREQUEST)); - if (lpNewRequest) - { - memcpy(lpNewRequest, lpWorkRequest, sizeof(WORKREQUEST)); - lpNewRequest->prev = NULL; - - EnterCriticalSection(&csQueue); - - lpNewRequest->next = lpWorkQueueTail; - if (lpWorkQueueTail) - lpWorkQueueTail->prev = lpNewRequest; - lpWorkQueueTail = lpNewRequest; - if (!lpHeadWorkQueue) - lpHeadWorkQueue = lpWorkQueueTail; - - LeaveCriticalSection(&csQueue); - - bSuccess = TRUE; - InterlockedIncrement(&dwNumJobs); - } - - return bSuccess; -} - - -/*********************************************************************** - * INTERNET_GetWorkRequest (internal) - * - * Retrieves work request from queue - * - * RETURNS - * - */ -static BOOL INTERNET_GetWorkRequest(LPWORKREQUEST lpWorkRequest) -{ - BOOL bSuccess = FALSE; - LPWORKREQUEST lpRequest = NULL; + LPWORKREQUEST lpRequest = lpvParam; + WORKREQUEST workRequest; TRACE("\n"); - EnterCriticalSection(&csQueue); - - if (lpHeadWorkQueue) - { - lpRequest = lpHeadWorkQueue; - lpHeadWorkQueue = lpHeadWorkQueue->prev; - if (lpRequest == lpWorkQueueTail) - lpWorkQueueTail = lpHeadWorkQueue; - } - - LeaveCriticalSection(&csQueue); + memcpy(&workRequest, lpRequest, sizeof(WORKREQUEST)); + HeapFree(GetProcessHeap(), 0, lpRequest); - if (lpRequest) - { - memcpy(lpWorkRequest, lpRequest, sizeof(WORKREQUEST)); - HeapFree(GetProcessHeap(), 0, lpRequest); - bSuccess = TRUE; - InterlockedDecrement(&dwNumJobs); - } + workRequest.asyncproc(&workRequest); - return bSuccess; + WININET_Release( workRequest.hdr ); + return TRUE; } @@ -3198,60 +3083,29 @@ static BOOL INTERNET_GetWorkRequest(LPWO */ BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) { - HANDLE hThread; - DWORD dwTID; - BOOL bSuccess = FALSE; + BOOL bSuccess; + LPWORKREQUEST lpNewRequest; TRACE("\n"); - if (InterlockedDecrement(&dwNumIdleThreads) < 0) - { - InterlockedIncrement(&dwNumIdleThreads); + lpNewRequest = HeapAlloc(GetProcessHeap(), 0, sizeof(WORKREQUEST)); + if (!lpNewRequest) + return FALSE; - if (InterlockedIncrement(&dwNumThreads) > MAX_WORKER_THREADS || - !(hThread = CreateThread(NULL, 0, - INTERNET_WorkerThreadFunc, NULL, 0, &dwTID))) - { - InterlockedDecrement(&dwNumThreads); - INTERNET_SetLastError(ERROR_INTERNET_ASYNC_THREAD_FAILED); - goto lerror; - } + memcpy(lpNewRequest, lpWorkRequest, sizeof(WORKREQUEST)); - TRACE("Created new thread\n"); + bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpNewRequest, WT_EXECUTELONGFUNCTION); + if (!bSuccess) + { + HeapFree(GetProcessHeap(), 0, lpNewRequest); + INTERNET_SetLastError(ERROR_INTERNET_ASYNC_THREAD_FAILED); } - bSuccess = TRUE; - INTERNET_InsertWorkRequest(lpWorkRequest); - SetEvent(hWorkEvent); - -lerror: - return bSuccess; } /*********************************************************************** - * INTERNET_ExecuteWork (internal) - * - * RETURNS - * - */ -static VOID INTERNET_ExecuteWork(void) -{ - WORKREQUEST workRequest; - - TRACE("\n"); - - if (!INTERNET_GetWorkRequest(&workRequest)) - return; - - workRequest.asyncproc(&workRequest); - - WININET_Release( workRequest.hdr ); -} - - -/*********************************************************************** * INTERNET_GetResponseBuffer (internal) * * RETURNS diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4015ee0..1524139 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -374,9 +374,6 @@ typedef struct WORKREQ struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; } u; - struct WORKREQ *next; - struct WORKREQ *prev; - } WORKREQUEST, *LPWORKREQUEST; HINTERNET WININET_AllocHandle( LPWININETHANDLEHEADER info );

1 0

Rob Shearman : ntdll: Fix some test failures of RtlGUIDFromString and RtlStringFromGUID
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 40b39b06d47d2a7feb88929ccbe90319d2ae6a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b39b06d47d2a7feb88929cc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 16:56:16 2007 +0000 ntdll: Fix some test failures of RtlGUIDFromString and RtlStringFromGUID by setting the length correctly and by doing a case-insentive compare on the GUID string that is returned. --- dlls/ntdll/tests/rtlstr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index cc1606a..5c70eda 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1684,14 +1684,14 @@ static void test_RtlGUIDFromString(void) UNICODE_STRING str; NTSTATUS ret; - str.Length = str.MaximumLength = (sizeof(szGuid) - 1) / sizeof(WCHAR); + str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid; ret = pRtlGUIDFromString(&str, &guid); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); ok(memcmp(&guid, &IID_Endianess, sizeof(guid)) == 0, "Endianess broken\n"); - str.Length = str.MaximumLength = (sizeof(szGuid2) - 1) / sizeof(WCHAR); + str.Length = str.MaximumLength = sizeof(szGuid2) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid2; ret = pRtlGUIDFromString(&str, &guid); @@ -1708,7 +1708,7 @@ static void test_RtlStringFromGUID(void) ret = pRtlStringFromGUID(&IID_Endianess, &str); ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); - ok(str.Buffer && !lstrcmpW(str.Buffer, szGuid), "Endianess broken\n"); + ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianess broken\n"); } START_TEST(rtlstr)

1 0

Rob Shearman : ntdll: RtlInitUnicodeString on a string too long to fit in a UNICODE_STRING
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 5398e17d0ac88d3b300b6868c5d2a858c57d1095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5398e17d0ac88d3b300b6868c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 16:55:58 2007 +0000 ntdll: RtlInitUnicodeString on a string too long to fit in a UNICODE_STRING should set the it to have the maximum possible length and size rather than a modulus of the actual length. Fix test failures for RtlInitUnicodeString on Windows XP upwards. --- dlls/ntdll/rtlstr.c | 5 ++++- dlls/ntdll/tests/rtlstr.c | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 8e997e7..34336fd 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -215,7 +215,10 @@ void WINAPI RtlInitUnicodeString( { if ((target->Buffer = (PWSTR) source)) { - target->Length = strlenW(source) * sizeof(WCHAR); + unsigned int length = strlenW(source) * sizeof(WCHAR); + if (length > 0xfffc) + length = 0xfffc; + target->Length = length; target->MaximumLength = target->Length + sizeof(WCHAR); } else target->Length = target->MaximumLength = 0; diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 52f0ee3..cc1606a 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -246,12 +246,12 @@ static void test_RtlInitUnicodeStringEx( uni.MaximumLength = 12345; uni.Buffer = (void *) 0xdeadbeef; pRtlInitUnicodeString(&uni, teststring2); - ok(uni.Length == 33920, + ok(uni.Length == 33920 /* <= Win2000 */ || uni.Length == 65532 /* >= Win XP */, "pRtlInitUnicodeString(&uni, 0) sets Length to %u, expected %u\n", - uni.Length, 33920); - ok(uni.MaximumLength == 33922, + uni.Length, 65532); + ok(uni.MaximumLength == 33922 /* <= Win2000 */ || uni.MaximumLength == 65534 /* >= Win XP */, "pRtlInitUnicodeString(&uni, 0) sets MaximumLength to %u, expected %u\n", - uni.MaximumLength, 33922); + uni.MaximumLength, 65534); ok(uni.Buffer == teststring2, "pRtlInitUnicodeString(&uni, 0) sets Buffer to %p, expected %p\n", uni.Buffer, teststring2);

1 0

Rob Shearman : rpcrt4: Pass WT_EXECUTELONGFUNCTION to QueueUserWorkItem since the
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 98c87d0e70861a59b409ea123434882709d966a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c87d0e70861a59b409ea123… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 18:23:53 2007 +0000 rpcrt4: Pass WT_EXECUTELONGFUNCTION to QueueUserWorkItem since the function being called can sometimes take a long time to return and we almost always want a new thread to be created if there are no free threads available. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 285ef09..84090aa 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -345,7 +345,7 @@ static DWORD CALLBACK RPCRT4_io_thread(L packet->conn = conn; packet->hdr = hdr; packet->msg = msg; - QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTEDEFAULT); + QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION); #endif msg = NULL; }

1 0

Rob Shearman : ole32: Make sure to reset the message state if it has been changed in RPC_ExecuteCall before returning .
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 2db1d0de38f3090c9d3dd53deeb697c2603cd1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db1d0de38f3090c9d3dd53de… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 4 16:55:21 2007 +0000 ole32: Make sure to reset the message state if it has been changed in RPC_ExecuteCall before returning. Fix the hrFault parameter passed into the ClientNotify function in ClientRpcChannelBuffer_SendReceive so that it is correct in the case of messages dispatched with PostMessage. Only unmarshal ORPCTHAT for non-fault packets. --- dlls/ole32/rpc.c | 54 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c45e34e..455fed7 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -740,6 +740,7 @@ static HRESULT WINAPI ClientRpcChannelBu ORPCTHAT orpcthat; ORPC_EXTENT_ARRAY orpc_ext_array; WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL; + HRESULT hrFault = S_OK; TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); @@ -836,7 +837,9 @@ static HRESULT WINAPI ClientRpcChannelBu } ClientRpcChannelBuffer_ReleaseEventHandle(This, params->handle); - if (hr == S_OK) hr = params->hr; + /* for WM shortcut, faults are returned in params->hr */ + if (hr == S_OK) + hrFault = params->hr; status = params->status; HeapFree(GetProcessHeap(), 0, params); @@ -845,7 +848,21 @@ static HRESULT WINAPI ClientRpcChannelBu orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - if (status == RPC_S_OK && msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4) + /* for normal RPC calls, faults are returned in first 4 bytes of the + * buffer */ + TRACE("RPC call status: 0x%lx\n", status); + if (status == RPC_S_CALL_FAILED) + hrFault = *(HRESULT *)olemsg->Buffer; + else if (status != RPC_S_OK) + hr = HRESULT_FROM_WIN32(status); + + TRACE("hrFault = 0x%08x\n", hrFault); + + /* FIXME: this condition should be + * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extentions) + 4)" + * but we don't currently reset the message length for PostMessage + * dispatched calls */ + if (hr == S_OK && hrFault == S_OK) { HRESULT hr2; char *original_buffer = msg->Buffer; @@ -862,26 +879,22 @@ static HRESULT WINAPI ClientRpcChannelBu else message_state->prefix_data_len = 0; - ChannelHooks_ClientNotify(&message_state->channel_hook_info, - msg->DataRepresentation, - first_wire_orpc_extent, - orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0, - status == RPC_S_CALL_FAILED && msg->BufferLength >= sizeof(HRESULT) ? *(HRESULT *)msg->Buffer : S_OK); + if (hr == S_OK) + { + ChannelHooks_ClientNotify(&message_state->channel_hook_info, + msg->DataRepresentation, + first_wire_orpc_extent, + orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0, + hrFault); + } /* save away the message state again */ msg->Handle = message_state; - if (hr) return hr; - if (pstatus) *pstatus = status; - TRACE("RPC call status: 0x%lx\n", status); - if (status == RPC_S_OK) - hr = S_OK; - else if (status == RPC_S_CALL_FAILED) - hr = *(HRESULT *)olemsg->Buffer; - else - hr = HRESULT_FROM_WIN32(status); + if (hr == S_OK) + hr = hrFault; TRACE("-- 0x%08x\n", hr); @@ -1228,12 +1241,16 @@ void RPC_ExecuteCall(struct dispatch_par params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent); if (params->hr != S_OK) + { + msg->Buffer = original_buffer; goto exit; + } message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state)); if (!message_state) { params->hr = E_OUTOFMEMORY; + msg->Buffer = original_buffer; goto exit; } @@ -1283,11 +1300,11 @@ void RPC_ExecuteCall(struct dispatch_par { case SERVERCALL_REJECTED: params->hr = RPC_E_CALL_REJECTED; - goto exit; + goto exit_reset_state; case SERVERCALL_RETRYLATER: #if 0 /* FIXME: handle retries on the client side before enabling this code */ params->hr = RPC_E_RETRY; - goto exit; + goto exit_reset_state; #else FIXME("retry call later not implemented\n"); break; @@ -1310,6 +1327,7 @@ void RPC_ExecuteCall(struct dispatch_par COM_CurrentInfo()->pending_call_count_server--; COM_CurrentInfo()->causality_id = old_causality_id; +exit_reset_state: message_state = (struct message_state *)msg->Handle; msg->Handle = message_state->binding_handle; msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;

1 0

Dmitry Timoshkov : user32: Fix some failures in the MDI message test.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: d57dc9da0a88a941204b75b0d5e41e04d547fc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57dc9da0a88a941204b75b0d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 4 22:32:05 2007 +0800 user32: Fix some failures in the MDI message test. --- dlls/user32/mdi.c | 129 ++++++++++++++++++++++++++++----------------- dlls/user32/tests/msg.c | 21 +++++-- dlls/user32/win.c | 2 +- dlls/winex11.drv/window.c | 2 +- 4 files changed, 97 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d57dc9da0a88a941204b7…

1 0