January 2008 - Wine-commits

Eric Pouech : richedit: Only copy the charset when it's defined.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a3597cbe3b617b6f87f121880a5d29939f4c5dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3597cbe3b617b6f87f121880… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:12:03 2008 +0100 richedit: Only copy the charset when it's defined. --- dlls/riched20/style.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 91b8c36..453c15b 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -321,7 +321,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; - lf->lfCharSet = s->fmt.bCharSet; + if (s->fmt.dwMask & CFM_CHARSET) + lf->lfCharSet = s->fmt.bCharSet; } void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt)

1 0

Eric Pouech : richedit: Initialize all the cursors at editor creation.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: f33a27517bdc484ed45103aa8aefe6bd3a0fab4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33a27517bdc484ed45103aa8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:12:09 2008 +0100 richedit: Initialize all the cursors at editor creation. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a9948b2..43c27d1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1172,6 +1172,8 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->pCursors[0].nOffset = 0; ed->pCursors[1].pRun = ME_FindItemFwd(ed->pBuffer->pFirst, diRun); ed->pCursors[1].nOffset = 0; + ed->pCursors[2] = ed->pCursors[0]; + ed->pCursors[3] = ed->pCursors[1]; ed->nLastTotalLength = ed->nTotalLength = 0; ed->nHeight = 0; ed->nUDArrowX = -1;

1 0

Eric Pouech : richedit: Check return of GetScrollInfo before accessing the returned structure.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: cb4f8a80dee8bf5c3c2a29b76a09166c2228d448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4f8a80dee8bf5c3c2a29b76… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:12:14 2008 +0100 richedit: Check return of GetScrollInfo before accessing the returned structure. --- dlls/riched20/paint.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 91e283a..03a588c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -697,8 +697,7 @@ int ME_GetYScrollPos(ME_TextEditor *editor) SCROLLINFO si; si.cbSize = sizeof(si); si.fMask = SIF_POS; - GetScrollInfo(editor->hWnd, SB_VERT, &si); - return si.nPos; + return GetScrollInfo(editor->hWnd, SB_VERT, &si) ? si.nPos : 0; } BOOL ME_GetYScrollVisible(ME_TextEditor *editor)

1 0

Eric Pouech : richedit: Uniformly handle the bPitchAndFamily field out of CHARFORMAT.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d65daea45476791964afdb317a6e8e5a44709ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65daea45476791964afdb317… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:12:20 2008 +0100 richedit: Uniformly handle the bPitchAndFamily field out of CHARFORMAT. --- dlls/riched20/editor.c | 1 + dlls/riched20/run.c | 3 ++- dlls/riched20/style.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 43c27d1..85ac5b2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -419,6 +419,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; + fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; } } break; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 5a3119d..2da891e 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -950,7 +950,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p { if (!(tmp.dwMask & CFM_FACE)) pFmt->dwMask &= ~CFM_FACE; - else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName)) + else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName) || + pFmt->bPitchAndFamily != tmp.bPitchAndFamily) pFmt->dwMask &= ~CFM_FACE; } if (pFmt->yHeight != tmp.yHeight) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 453c15b..ba7d6d3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -320,7 +320,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT)) lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ - lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; + if (s->fmt.dwMask & CFM_FACE) + lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; if (s->fmt.dwMask & CFM_CHARSET) lf->lfCharSet = s->fmt.bCharSet; }

1 0

Rob Shearman : svchost: Add a FIXME for an undocumented function ( SvchostPushServiceGlobals) that some native services expect to be called by native svchost.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 3a0e472ada2b893cea31434ecc776452ed096a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0e472ada2b893cea31434ec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 17:23:36 2008 +0000 svchost: Add a FIXME for an undocumented function (SvchostPushServiceGlobals) that some native services expect to be called by native svchost. --- programs/svchost/svchost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 43112f7..573a6a3 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -229,6 +229,12 @@ static BOOL AddServiceElem(LPWSTR service_name, goto cleanup; } + if (GetProcAddress(library, "SvchostPushServiceGlobals")) + { + WINE_FIXME("library %s expects undocumented SvchostPushServiceGlobals function to be called\n", + wine_dbgstr_w(dll_name_long)); + } + /* Fill in the service table entry */ service_table_entry->lpServiceName = service_name; service_table_entry->lpServiceProc = service_main_func;

1 0

Rob Shearman : kernel32: Implement RegisterWaitForSingleObjectEx.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 628a515b83c317388ddb4fa9a7b29a42135acee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628a515b83c317388ddb4fa9a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 17:43:56 2008 +0000 kernel32: Implement RegisterWaitForSingleObjectEx. --- dlls/kernel32/sync.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 168a00f..b8b8f0c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -270,9 +270,19 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject, WAITORTIMERCALLBACK Callback, PVOID Context, ULONG dwMilliseconds, ULONG dwFlags ) { - FIXME("%p %p %p %d %d\n", + NTSTATUS status; + HANDLE hNewWaitObject; + + TRACE("%p %p %p %d %d\n", hObject,Callback,Context,dwMilliseconds,dwFlags); - return 0; + + status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + return hNewWaitObject; } /***********************************************************************

1 0

Rob Shearman : ole32: Clear the RPC_MESSAGE structure before using it.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: cf8da82ad37eb07b48c8ae6eae0fce5f0571a52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8da82ad37eb07b48c8ae6ea… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 17:44:01 2008 +0000 ole32: Clear the RPC_MESSAGE structure before using it. The RPC runtime could use some of the parameters, expecting them to be initialised. --- dlls/ole32/oleproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 9af6c59..bc87997 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -376,9 +376,9 @@ static HRESULT WINAPI CFProxy_CreateInstance( * * Data: Only the 'IID'. */ + memset(&msg, 0, sizeof(msg)); msg.iMethod = 3; msg.cbBuffer = sizeof(*riid); - msg.Buffer = NULL; hres = IRpcChannelBuffer_GetBuffer(This->chanbuf,&msg,&IID_IClassFactory); if (hres) { FIXME("IRpcChannelBuffer_GetBuffer failed with %x?\n",hres);

1 0

Rob Shearman : rpcrt4: Add some tests for NdrGetBuffer and NdrFreeBuffer.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 1bb6c1b4d121a89ff90b0e22bcaceb021c9ff1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb6c1b4d121a89ff90b0e22b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 17:37:31 2008 +0000 rpcrt4: Add some tests for NdrGetBuffer and NdrFreeBuffer. --- dlls/rpcrt4/tests/ndr_marshall.c | 82 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index eadb9c7..86ec190 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -72,6 +72,31 @@ static const MIDL_STUB_DESC Object_StubDesc = 0 /* Reserved5 */ }; +static RPC_DISPATCH_FUNCTION IFoo_table[] = +{ + 0 +}; + +static RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = +{ + 0, + IFoo_table +}; + +static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = +{ + sizeof(RPC_SERVER_INTERFACE), + {{0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x34}},{0,0}}, + {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, + &IFoo_v0_0_DispatchTable, + 0, + 0, + 0, + 0, + 0, +}; + +static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; static void test_ndr_simple_type(void) { @@ -1509,6 +1534,62 @@ static void test_nonconformant_string(void) HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); } +static void test_ndr_buffer(void) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char endpoint[] = "winetest:" __FILE__; + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc = Object_StubDesc; + unsigned char *ret; + unsigned char *binding; + RPC_BINDING_HANDLE Handle; + RPC_STATUS status; + + StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; + + ok(RPC_S_OK == RpcServerUseProtseqEp(ncalrpc, 20, endpoint, NULL), "RpcServerUseProtseqEp\n"); + ok(RPC_S_OK == RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL), "RpcServerRegisterIf\n"); + ok(RPC_S_OK == RpcServerListen(1, 20, TRUE), "RpcServerListen\n"); + + status = RpcStringBindingCompose(NULL, ncalrpc, NULL, endpoint, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status); + + status = RpcBindingFromStringBinding(binding, &Handle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", status); + + NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 5); + + ret = NdrGetBuffer(&StubMsg, 10, Handle); + ok(ret == StubMsg.Buffer, "NdrGetBuffer should have returned the same value as StubMsg.Buffer instead of %p\n", ret); + ok(RpcMessage.Handle != NULL, "RpcMessage.Handle should not have been NULL\n"); + ok(RpcMessage.Buffer != NULL, "RpcMessage.Buffer should not have been NULL\n"); + ok(RpcMessage.BufferLength == 10, "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); + ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%lx\n", RpcMessage.RpcFlags); + ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); + ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart); + ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd); +todo_wine + ok(StubMsg.BufferLength == 0, "BufferLength should have left as 0 instead of being set to %d\n", StubMsg.BufferLength); + ok(StubMsg.fBufferValid == TRUE, "fBufferValid should have been TRUE instead of 0x%x\n", StubMsg.fBufferValid); + + StubMsg.BufferLength = 1; + NdrFreeBuffer(&StubMsg); + ok(RpcMessage.Handle != NULL, "RpcMessage.Handle should not have been NULL\n"); +todo_wine + ok(RpcMessage.Buffer != NULL, "RpcMessage.Buffer should not have been NULL\n"); + ok(RpcMessage.BufferLength == 10, "RpcMessage.BufferLength should have been left as 10 instead of %d\n", RpcMessage.BufferLength); + ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); + ok(StubMsg.BufferLength == 1, "BufferLength should have left as 1 instead of being set to %d\n", StubMsg.BufferLength); + ok(StubMsg.fBufferValid == FALSE, "fBufferValid should have been FALSE instead of 0x%x\n", StubMsg.fBufferValid); + + /* attempt double-free */ + NdrFreeBuffer(&StubMsg); + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -1521,4 +1602,5 @@ START_TEST( ndr_marshall ) test_conformant_array(); test_conformant_string(); test_nonconformant_string(); + test_ndr_buffer(); }

1 0

Rob Shearman : ole32: Determine the destination for the COM call and initialise the necessary parameters in ClientRpcChannelBuffer_GetBuffer instead of ClientRpcChannelBuffer_SendReceive .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d84f0abb70c9e53f9d7fecdaefd206aafa906faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84f0abb70c9e53f9d7fecdae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 16:25:39 2008 +0000 ole32: Determine the destination for the COM call and initialise the necessary parameters in ClientRpcChannelBuffer_GetBuffer instead of ClientRpcChannelBuffer_SendReceive. The parameters are then freed in the matching ClientRpcChannelBuffer_FreeBuffer function. --- dlls/ole32/rpc.c | 125 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 52 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9fbff88..fdb49cb 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -129,6 +129,8 @@ struct message_state SChannelHookCallInfo channel_hook_info; /* client only */ + HWND target_hwnd; + DWORD target_tid; struct dispatch_params params; }; @@ -562,6 +564,24 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, return HRESULT_FROM_WIN32(status); } +static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This) +{ + HANDLE event = InterlockedExchangePointer(&This->event, NULL); + + /* Note: must be auto-reset event so we can reuse it without a call + * to ResetEvent */ + if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL); + + return event; +} + +static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event) +{ + if (InterlockedCompareExchangePointer(&This->event, event, NULL)) + /* already a handle cached in This */ + CloseHandle(event); +} + static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) { ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; @@ -574,6 +594,9 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, struct channel_hook_buffer_data *channel_hook_data; unsigned int channel_hook_count; ULONG extension_count; + IPID ipid; + HRESULT hr; + APARTMENT *apt = NULL; TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); @@ -597,12 +620,17 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, msg->Handle = This->bind; msg->RpcInterfaceInformation = cif; + message_state->prefix_data_len = 0; + message_state->binding_handle = This->bind; + message_state->channel_hook_info.iid = *riid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ + message_state->target_hwnd = NULL; + message_state->target_tid = 0; memset(&message_state->params, 0, sizeof(message_state->params)); extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, @@ -616,10 +644,40 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } + RpcBindingInqObject(message_state->binding_handle, &ipid); + hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, + &message_state->params.chan, + &message_state->params.iid, + &message_state->params.iface); + if (hr == S_OK) + { + /* stub, chan, iface and iid are unneeded in multi-threaded case as we go + * via the RPC runtime */ + if (apt->multi_threaded) + { + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; + message_state->params.iface = NULL; + } + else + { + message_state->target_hwnd = apartment_getwindow(apt); + message_state->target_tid = apt->tid; + /* we assume later on that this being non-NULL is the indicator that + * means call directly instead of going through RPC runtime */ + if (!message_state->target_hwnd) + ERR("window for apartment %s is NULL\n", wine_dbgstr_longlong(apt->oxid)); + } + } + if (apt) apartment_release(apt); + message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); + /* Note: message_state->params.msg is initialised in + * ClientRpcChannelBuffer_SendReceive */ + status = I_RpcGetBuffer(msg); - message_state->prefix_data_len = 0; - message_state->binding_handle = This->bind; msg->Handle = message_state; if (status == RPC_S_OK) @@ -682,24 +740,6 @@ static HRESULT WINAPI ServerRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac return E_NOTIMPL; } -static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This) -{ - HANDLE event = InterlockedExchangePointer(&This->event, NULL); - - /* Note: must be auto-reset event so we can reuse it without a call - * to ResetEvent */ - if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL); - - return event; -} - -static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event) -{ - if (InterlockedCompareExchangePointer(&This->event, event, NULL)) - /* already a handle cached in This */ - CloseHandle(event); -} - /* this thread runs an outgoing RPC */ static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) { @@ -735,8 +775,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; RPC_STATUS status; DWORD index; - APARTMENT *apt = NULL; - IPID ipid; struct message_state *message_state; ORPCTHAT orpcthat; ORPC_EXTENT_ARRAY orpc_ext_array; @@ -771,10 +809,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; msg->BufferLength += message_state->prefix_data_len; - message_state->params.msg = olemsg; - message_state->params.status = RPC_S_OK; - message_state->params.hr = S_OK; - /* Note: this is an optimization in the Microsoft OLE runtime that we need * to copy, as shown by the test_no_couninitialize_client test. without * short-circuiting the RPC runtime in the case below, the test will @@ -782,25 +816,16 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * a thread to process the RPC when this function is called indirectly * from DllMain */ - RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, - &message_state->params.chan, - &message_state->params.iid, - &message_state->params.iface); - message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); - if ((hr == S_OK) && !apt->multi_threaded) + message_state->params.msg = olemsg; + if (message_state->target_hwnd) { - TRACE("Calling apartment thread 0x%08x...\n", apt->tid); + TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); - if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, + if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, (LPARAM)&message_state->params)) { ERR("PostMessage failed with error %u\n", GetLastError()); - IRpcStubBuffer_Release(message_state->params.stub); - message_state->params.stub = NULL; - IRpcChannelBuffer_Release(message_state->params.chan); - message_state->params.chan = NULL; /* Note: message_state->params.iface doesn't have a reference and * so doesn't need to be released */ @@ -809,16 +834,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac } else { - if (hr == S_OK) - { - /* otherwise, we go via RPC runtime so the stub and channel aren't - * needed here */ - IRpcStubBuffer_Release(message_state->params.stub); - message_state->params.stub = NULL; - IRpcChannelBuffer_Release(message_state->params.chan); - message_state->params.chan = NULL; - } - /* we use a separate thread here because we need to be able to * pump the message loop in the application thread: if we do not, * any windows created by this thread will hang and RPCs that try @@ -833,7 +848,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac else hr = S_OK; } - if (apt) apartment_release(apt); if (hr == S_OK) { @@ -950,6 +964,11 @@ static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation); msg->RpcInterfaceInformation = NULL; + + if (message_state->params.stub) + IRpcStubBuffer_Release(message_state->params.stub); + if (message_state->params.chan) + IRpcChannelBuffer_Release(message_state->params.chan); HeapFree(GetProcessHeap(), 0, message_state); TRACE("-- %ld\n", status); @@ -1344,8 +1363,6 @@ exit_reset_state: exit: HeapFree(GetProcessHeap(), 0, message_state); - IRpcStubBuffer_Release(params->stub); - IRpcChannelBuffer_Release(params->chan); if (params->handle) SetEvent(params->handle); } @@ -1418,6 +1435,10 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) } hr = params->hr; + if (params->chan) + IRpcChannelBuffer_Release(params->chan); + if (params->stub) + IRpcStubBuffer_Release(params->stub); HeapFree(GetProcessHeap(), 0, params); apartment_release(apt);

1 0

Rob Shearman : widl: Make the offset of conformant string types point to the start of the conformant string format chars , not the pointer type.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 13f9c71960495c3696c40622653f9d59d18bd72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f9c71960495c3696c406226… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 4 16:24:42 2008 +0000 widl: Make the offset of conformant string types point to the start of the conformant string format chars, not the pointer type. Otherwise, writing a type at top-level could cause the pointer format string to be used in non-top-level places which may cause memory corruption during freeing. --- tools/widl/typegen.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f40399f..55fb3fa 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1472,11 +1472,9 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, const char *name, unsigned int *typestring_offset, int toplevel) { - size_t start_offset = *typestring_offset; + size_t start_offset; unsigned char rtype; - update_tfsoff(type, start_offset, file); - if (toplevel && is_declptr(type)) { unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; @@ -1494,6 +1492,9 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, } } + start_offset = *typestring_offset; + update_tfsoff(type, start_offset, file); + rtype = type->ref->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) @@ -2743,10 +2744,11 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } if ((phase == PHASE_FREE) || (pointer_type == RPC_FC_UP)) - print_phase_function(file, indent, "Pointer", phase, var, start_offset); + print_phase_function(file, indent, "Pointer", phase, var, + start_offset - (type->size_is ? 4 : 2)); else print_phase_function(file, indent, "ConformantString", phase, var, - start_offset + (type->size_is ? 4 : 2)); + start_offset); } } else if (is_array(type))

1 0