January 2008 - Wine-Commits

Rob Shearman : rpcrt4: Add stubs for NdrCorrelationInitialize, NdrCorrelationPass and NdrCorrelationFree.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 23c9b6c1619b3d0a96b03b5748b933df65aee561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c9b6c1619b3d0a96b03b574… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:20:16 2008 +0000 rpcrt4: Add stubs for NdrCorrelationInitialize, NdrCorrelationPass and NdrCorrelationFree. --- dlls/rpcrt4/ndr_marshall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 6 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f8f8973..8d358cf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6370,3 +6370,56 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, return ContextHandle; } + +/*********************************************************************** + * NdrCorrelationInitialize [RPCRT4.@] + * + * Initializes correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * pMemory [I] Pointer to memory to use as a cache. + * CacheSize [I] Size of the memory pointed to by pMemory. + * Flags [I] Reserved. Set to zero. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) +{ + FIXME("(%p, %p, %d, 0x%x): stub\n", pStubMsg, pMemory, CacheSize, Flags); + pStubMsg->fHasNewCorrDesc = TRUE; +} + +/*********************************************************************** + * NdrCorrelationPass [RPCRT4.@] + * + * Performs correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} + +/*********************************************************************** + * NdrCorrelationFree [RPCRT4.@] + * + * Frees any resources used while unmarshalling parameters that need + * correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 93f6d31..8b3e502 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -201,9 +201,9 @@ @ stdcall NdrContextHandleSize(ptr ptr ptr) @ stdcall NdrConvert2(ptr ptr long) @ stdcall NdrConvert(ptr ptr) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass +@ stdcall NdrCorrelationFree(ptr) +@ stdcall NdrCorrelationInitialize(ptr ptr long long) +@ stdcall NdrCorrelationPass(ptr) @ stub NdrDcomAsyncClientCall @ stub NdrDcomAsyncStubCall @ stdcall NdrDllCanUnloadNow(ptr)

1 0

Rob Shearman : rpcrt4: Call NdrCorrelationInitialize and NdrCorrelationFree from NdrClientCall2 if new correlation descriptors have been specified .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 807a203f7704028caeda48810e1755b8e4cd9519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807a203f7704028caeda48810… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:20:25 2008 +0000 rpcrt4: Call NdrCorrelationInitialize and NdrCorrelationFree from NdrClientCall2 if new correlation descriptors have been specified. --- dlls/rpcrt4/ndr_stubless.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 5c90aa0..fb76a2f 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -562,6 +562,8 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; + /* correlation cache */ + unsigned long NdrCorrCache[256]; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -663,8 +665,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ - FIXME("new correlation description not implemented\n"); - stubMsg.fHasNewCorrDesc = TRUE; + NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); } /* order of phases: @@ -744,7 +745,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ - /* NdrCorrelationFree(&stubMsg); */ + NdrCorrelationFree(&stubMsg); } if (Oif_flags.HasPipes)

1 0

Rob Shearman : rpcrt4: ndr_stubless.h should include ndrtypes. h as it depends on types it defines.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: f9a54a58d5401b22f859c4fd1e08f9dbf6c4f993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a54a58d5401b22f859c4fd1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:20:05 2008 +0000 rpcrt4: ndr_stubless.h should include ndrtypes.h as it depends on types it defines. --- dlls/rpcrt4/ndr_stubless.c | 1 - dlls/rpcrt4/ndr_stubless.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c21b809..5c90aa0 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -37,7 +37,6 @@ #include "objbase.h" #include "rpc.h" #include "rpcproxy.h" -#include "ndrtypes.h" #include "wine/debug.h" #include "wine/rpcfc.h" diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 1bd3a95..02850d1 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ndrtypes.h" + /* there can't be any alignment with the structures in this file */ #include "pshpack1.h"

1 0

Rob Shearman : ole32: Fix memory leaks caused by not calling the channel hook function when extension_size is zero .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: f2b1a1106b04948c4e8a3409585138c3af4a49ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b1a1106b04948c4e8a34095… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 17:15:17 2008 +0000 ole32: Fix memory leaks caused by not calling the channel hook function when extension_size is zero. Instead free the allocated memory outside of the channel hook function. --- dlls/ole32/rpc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ad6a39f..31b9eb1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -248,8 +248,6 @@ static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, LeaveCriticalSection(&csChannelHook); - HeapFree(GetProcessHeap(), 0, data); - return buffer; } @@ -370,8 +368,6 @@ static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, LeaveCriticalSection(&csChannelHook); - HeapFree(GetProcessHeap(), 0, data); - return buffer; } @@ -563,6 +559,8 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, } } + HeapFree(GetProcessHeap(), 0, channel_hook_data); + /* store the prefixed data length so that we can restore the real buffer * later */ message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthat; @@ -751,6 +749,8 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, msg->BufferLength -= message_state->prefix_data_len; } + HeapFree(GetProcessHeap(), 0, channel_hook_data); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status);

1 0

Rob Shearman : rpcrt4: Set the ProcNum of RPC_MESSAGE in NdrClientInitializeNew to include RPC_VALID_FLAGS_BIT .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 31676530c2ec59886c167404467e1eb8840337f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31676530c2ec59886c1674044… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:19:57 2008 +0000 rpcrt4: Set the ProcNum of RPC_MESSAGE in NdrClientInitializeNew to include RPC_VALID_FLAGS_BIT. Mask out RPC_VALID_FLAGS_BIT from ProcNum when it is used to build a packet to send to the server. --- dlls/rpcrt4/ndr_clientserver.c | 2 +- dlls/rpcrt4/rpc_message.c | 3 ++- dlls/rpcrt4/tests/ndr_marshall.c | 1 - include/rpcdcep.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 809d4cb..8cce9d7 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -54,7 +54,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pRpcMessage, pStubMsg, pStubDesc, ProcNum); pRpcMessage->Handle = NULL; - pRpcMessage->ProcNum = ProcNum; + pRpcMessage->ProcNum = ProcNum | RPC_FLAGS_VALID_BIT; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; pRpcMessage->RpcFlags = 0; pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 9f0df05..c7282e7 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1000,7 +1000,8 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) if (status != RPC_S_OK) return status; hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, - pMsg->BufferLength, pMsg->ProcNum, + pMsg->BufferLength, + pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, &bind->ObjectUuid); if (!hdr) { diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index eebed49..c9b8fa9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -901,7 +901,6 @@ static void test_client_init(void) ok(rpcMsg.Handle == NULL, "rpcMsg.Handle should have been NULL instead of %p\n", rpcMsg.Handle); TEST_POINTER_UNSET(Buffer); ok(rpcMsg.BufferLength == 0xcccccccc, "rpcMsg.BufferLength should have been unset instead of %d\n", rpcMsg.BufferLength); - todo_wine ok(rpcMsg.ProcNum == 0x8001, "rpcMsg.ProcNum should have been 0x8001 instead of 0x%x\n", rpcMsg.ProcNum); TEST_POINTER_UNSET(TransferSyntax); ok(rpcMsg.RpcInterfaceInformation == Object_StubDesc.RpcInterfaceInformation, diff --git a/include/rpcdcep.h b/include/rpcdcep.h index b93c9a6..f0b78c1 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -48,6 +48,9 @@ typedef struct _RPC_MESSAGE unsigned long RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; +/* or'd with ProcNum */ +#define RPC_FLAGS_VALID_BIT 0x00008000 + #define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *)0xfffff00d) #define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS 0x00000000

1 0

Rob Shearman : rpcrt4: Add tests for the RPC_MESSAGE members set by NdrClientInitializeNew.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 4d6aa7ca9595e117f1af5028513ac18c9c58800d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6aa7ca9595e117f1af50285… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:19:49 2008 +0000 rpcrt4: Add tests for the RPC_MESSAGE members set by NdrClientInitializeNew. --- dlls/rpcrt4/tests/ndr_marshall.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d02135b..eebed49 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -891,11 +891,28 @@ static void test_client_init(void) MIDL_STUB_MESSAGE stubMsg; RPC_MESSAGE rpcMsg; - memset(&rpcMsg, 0, sizeof(rpcMsg)); + memset(&rpcMsg, 0xcc, sizeof(rpcMsg)); memset(&stubMsg, 0xcc, sizeof(stubMsg)); NdrClientInitializeNew(&rpcMsg, &stubMsg, &Object_StubDesc, 1); +#define TEST_POINTER_UNSET(field) ok(rpcMsg.field == (void *)0xcccccccc, #field " should have been unset instead of %p\n", rpcMsg.field) + + ok(rpcMsg.Handle == NULL, "rpcMsg.Handle should have been NULL instead of %p\n", rpcMsg.Handle); + TEST_POINTER_UNSET(Buffer); + ok(rpcMsg.BufferLength == 0xcccccccc, "rpcMsg.BufferLength should have been unset instead of %d\n", rpcMsg.BufferLength); + todo_wine + ok(rpcMsg.ProcNum == 0x8001, "rpcMsg.ProcNum should have been 0x8001 instead of 0x%x\n", rpcMsg.ProcNum); + TEST_POINTER_UNSET(TransferSyntax); + ok(rpcMsg.RpcInterfaceInformation == Object_StubDesc.RpcInterfaceInformation, + "rpcMsg.RpcInterfaceInformation should have been %p instead of %p\n", + Object_StubDesc.RpcInterfaceInformation, rpcMsg.RpcInterfaceInformation); + /* Note: ReservedForRuntime not tested */ + TEST_POINTER_UNSET(ManagerEpv); + TEST_POINTER_UNSET(ImportContext); + ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%lx\n", rpcMsg.RpcFlags); +#undef TEST_POINTER_UNSET + #define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field) #define TEST_POINTER_UNSET(field) ok(stubMsg.field == (void *)0xcccccccc, #field " should have been unset instead of %p\n", stubMsg.field) #define TEST_ULONG_UNSET(field) ok(stubMsg.field == 0xcccccccc, #field " should have been unset instead of 0x%x\n", stubMsg.field)

1 0

Rob Shearman : ole32: Fix a memory leak.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: caa9f89a18a43bf1183891e59757967aba7cfbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa9f89a18a43bf1183891e59… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 17:15:08 2008 +0000 ole32: Fix a memory leak. --- dlls/ole32/oleproxy.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index bc87997..d37c2cf 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -574,9 +574,11 @@ static HRESULT WINAPI RemUnkStub_Invoke(LPRPCSTUBBUFFER iface, *(HRESULT *)buf = hr; buf += sizeof(HRESULT); - if (hr) return hr; - /* FIXME: pQIResults is a unique pointer so pQIResults can be NULL! */ - memcpy(buf, pQIResults, cIids * sizeof(REMQIRESULT)); + if (hr == S_OK) + /* FIXME: pQIResults is a unique pointer so pQIResults can be NULL! */ + memcpy(buf, pQIResults, cIids * sizeof(REMQIRESULT)); + + CoTaskMemFree(pQIResults); break; }

1 0

Rob Shearman : ole32: Clear the RPC_FLAGS_VALID_BIT flag from the RPC_MESSAGE ProcNum when shortcutting the RPC runtime .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: e3e704bc43cb9851a65763f32b9bba4f4600e237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e704bc43cb9851a65763f32… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 17:09:52 2008 +0000 ole32: Clear the RPC_FLAGS_VALID_BIT flag from the RPC_MESSAGE ProcNum when shortcutting the RPC runtime. --- dlls/ole32/rpc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index fdb49cb..2ee8a9c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -821,6 +821,8 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac { TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); + msg->ProcNum &= ~RPC_FLAGS_VALID_BIT; + if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, (LPARAM)&message_state->params)) {

1 0

Rob Shearman : ole32: Shortcut the RPC runtime for allocation of the message when processing the COM call by just sending a message to a window in the process .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: b6553e7e297fc234aaaa632ff84ab4936c544292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6553e7e297fc234aaaa632ff… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 17:14:54 2008 +0000 ole32: Shortcut the RPC runtime for allocation of the message when processing the COM call by just sending a message to a window in the process. --- dlls/ole32/rpc.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 2ee8a9c..ad6a39f 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -118,6 +118,7 @@ struct dispatch_params IID iid; /* ID of interface being called */ IUnknown *iface; /* interface being called */ HANDLE handle; /* handle that will become signaled when call finishes */ + BOOL bypass_rpcrt; /* bypass RPC runtime? */ RPC_STATUS status; /* status (out) */ HRESULT hr; /* hresult (out) */ }; @@ -127,6 +128,7 @@ struct message_state RPC_BINDING_HANDLE binding_handle; ULONG prefix_data_len; SChannelHookCallInfo channel_hook_info; + BOOL bypass_rpcrt; /* client only */ HWND target_hwnd; @@ -513,7 +515,16 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); } - status = I_RpcGetBuffer(msg); + if (message_state->bypass_rpcrt) + { + msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); + if (msg->Buffer) + status = RPC_S_OK; + else + status = ERROR_OUTOFMEMORY; + } + else + status = I_RpcGetBuffer(msg); orpcthat = (ORPCTHAT *)msg->Buffer; msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(ORPCTHAT, extensions); @@ -663,6 +674,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, } else { + message_state->params.bypass_rpcrt = TRUE; 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 @@ -676,7 +688,17 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, /* Note: message_state->params.msg is initialised in * ClientRpcChannelBuffer_SendReceive */ - status = I_RpcGetBuffer(msg); + /* shortcut the RPC runtime */ + if (message_state->target_hwnd) + { + msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); + if (msg->Buffer) + status = RPC_S_OK; + else + status = ERROR_OUTOFMEMORY; + } + else + status = I_RpcGetBuffer(msg); msg->Handle = message_state; @@ -817,7 +839,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * from DllMain */ message_state->params.msg = olemsg; - if (message_state->target_hwnd) + if (message_state->params.bypass_rpcrt) { TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); @@ -939,7 +961,13 @@ static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface msg->BufferLength += message_state->prefix_data_len; message_state->prefix_data_len = 0; - status = I_RpcFreeBuffer(msg); + if (message_state->bypass_rpcrt) + { + HeapFree(GetProcessHeap(), 0, msg->Buffer); + status = RPC_S_OK; + } + else + status = I_RpcFreeBuffer(msg); msg->Handle = message_state; @@ -962,7 +990,13 @@ static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; msg->BufferLength += message_state->prefix_data_len; - status = I_RpcFreeBuffer(msg); + if (message_state->params.bypass_rpcrt) + { + HeapFree(GetProcessHeap(), 0, msg->Buffer); + status = RPC_S_OK; + } + else + status = I_RpcFreeBuffer(msg); HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation); msg->RpcInterfaceInformation = NULL; @@ -1286,6 +1320,7 @@ void RPC_ExecuteCall(struct dispatch_params *params) message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; message_state->binding_handle = msg->Handle; + message_state->bypass_rpcrt = params->bypass_rpcrt; message_state->channel_hook_info.iid = params->iid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); @@ -1357,6 +1392,10 @@ void RPC_ExecuteCall(struct dispatch_params *params) COM_CurrentInfo()->pending_call_count_server--; COM_CurrentInfo()->causality_id = old_causality_id; + /* the invoke allocated a new buffer, so free the old one */ + if (message_state->bypass_rpcrt && original_buffer != msg->Buffer) + HeapFree(GetProcessHeap(), 0, original_buffer); + exit_reset_state: message_state = (struct message_state *)msg->Handle; msg->Handle = message_state->binding_handle; @@ -1400,6 +1439,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) params->status = RPC_S_OK; params->hr = S_OK; params->handle = NULL; + params->bypass_rpcrt = FALSE; /* Note: this is the important difference between STAs and MTAs - we * always execute RPCs to STAs in the thread that originally created the

1 0

Rob Shearman : ntdll: Fix NtQueryValueKey for KeyValueBasicInformation.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 526cb8c375022fd2f2339401abe7e31e2e99984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=526cb8c375022fd2f2339401a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 15:36:11 2008 +0000 ntdll: Fix NtQueryValueKey for KeyValueBasicInformation. Add some tests for this. --- dlls/ntdll/reg.c | 14 +++++++++++--- dlls/ntdll/tests/reg.c | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e2a3b91..9c9509d 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -481,9 +481,17 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, switch(info_class) { case KeyValueBasicInformation: - fixed_size = (char *)((KEY_VALUE_BASIC_INFORMATION *)info)->Name - (char *)info; + { + KEY_VALUE_BASIC_INFORMATION *basic_info = info; + if (FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) < length) + { + memcpy(basic_info->Name, name->Buffer, + min(length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name), name->Length)); + } + fixed_size = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) + name->Length; data_ptr = NULL; break; + } case KeyValueFullInformation: { KEY_VALUE_FULL_INFORMATION *full_info = info; @@ -509,12 +517,12 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, { req->hkey = handle; wine_server_add_data( req, name->Buffer, name->Length ); - if (length > fixed_size) wine_server_set_reply( req, data_ptr, length - fixed_size ); + if (length > fixed_size && data_ptr) wine_server_set_reply( req, data_ptr, length - fixed_size ); if (!(ret = wine_server_call( req ))) { copy_key_value_info( info_class, info, length, reply->type, name->Length, reply->total ); - *result_len = fixed_size + reply->total; + *result_len = fixed_size + (info_class == KeyValueBasicInformation ? 0 : reply->total); if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; } } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3b983ee..14cc79f 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -67,6 +67,13 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE { ULONG DefaultLength; } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; +typedef struct _KEY_VALUE_BASIC_INFORMATION { + ULONG TitleIndex; + ULONG Type; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; + typedef struct _KEY_VALUE_PARTIAL_INFORMATION { ULONG TitleIndex; ULONG Type; @@ -464,6 +471,7 @@ static void test_NtQueryValueKey(void) NTSTATUS status; OBJECT_ATTRIBUTES attr; UNICODE_STRING ValName; + KEY_VALUE_BASIC_INFORMATION *basic_info; KEY_VALUE_PARTIAL_INFORMATION *partial_info; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len; @@ -474,6 +482,25 @@ static void test_NtQueryValueKey(void) status = pNtOpenKey(&key, KEY_READ, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); + basic_info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); + ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->Type); + ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type); + ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength); + ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len); + + basic_info = HeapReAlloc(GetProcessHeap(), 0, basic_info, len); + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status); + ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->Type); + ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type); + ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength); + ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len); + ok(!memcmp(basic_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n"); + HeapFree(GetProcessHeap(), 0, basic_info); + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); partial_info = HeapAlloc(GetProcessHeap(), 0, len); status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len);

1 0