January 2008 - Wine-Commits

Rob Shearman : rpcrt4: Implement I_RpcMapWin32Status.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: f296a8ca6c14fe533bfda4c382c70fd2447b78fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f296a8ca6c14fe533bfda4c38… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 10:18:34 2008 +0000 rpcrt4: Implement I_RpcMapWin32Status. Add a test for this function. --- dlls/rpcrt4/rpcrt4_main.c | 123 ++++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/rpc.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f296a8ca6c14fe533bfda…

1 0

Francois Gouget : wintab32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 327534f6ef320e943259ccf70a0fa8eed52d8a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327534f6ef320e943259ccf70… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 7 11:16:27 2008 +0100 wintab32: Add a trailing '\n' to a Wine trace. --- dlls/wintab32/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 4b382ec..609ec22 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -114,7 +114,7 @@ static inline void DUMPPACKET(WTPACKET packet) static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - TRACE("context: %s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", + TRACE("context: %s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask,

1 0

Rob Shearman : widl: Fix the conditions under which array freeing code is output.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: e998892a23d8923feb3adc1523ec21a8d2c13540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e998892a23d8923feb3adc152… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 10:17:32 2008 +0000 widl: Fix the conditions under which array freeing code is output. It doesn't matter whether or not the array is declared as a pointer or is declared using array subscripts - the array is still allocated by the unmarshalling function and so needs to be freed. Fix a typo that caused varying arrays never to be freed. Fix another typo with the check for conformant arrays being performed twice, redundantly. --- tools/widl/typegen.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3953b96..bed46aa 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2819,14 +2819,13 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (pointer_type != RPC_FC_RP) array_type = "Pointer"; print_phase_function(file, indent, array_type, phase, var, start_offset); - if (phase == PHASE_FREE && type->declarray && pointer_type == RPC_FC_RP) + if (phase == PHASE_FREE && pointer_type == RPC_FC_RP) { - /* these are all unmarshalled by pointing into the buffer on the - * server side */ + /* these are all unmarshalled by allocating memory */ if (type->type == RPC_FC_BOGUS_ARRAY || type->type == RPC_FC_CVARRAY || - (type->type == RPC_FC_SMVARRAY && type->type == RPC_FC_LGVARRAY && in_attr) || - (type->type == RPC_FC_CARRAY && type->type == RPC_FC_CARRAY && !in_attr)) + ((type->type == RPC_FC_SMVARRAY || type->type == RPC_FC_LGVARRAY) && in_attr) || + (type->type == RPC_FC_CARRAY && !in_attr)) { print_file(file, indent, "if (%s)\n", var->name); indent++;

1 0

Rob Shearman : include: I_RpcBindingInqTransportType and I_RpcMapWin32Status should be always defined .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 1255eaf8b4a73dfd06506987a63a86b1c8314b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1255eaf8b4a73dfd06506987a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 10:17:45 2008 +0000 include: I_RpcBindingInqTransportType and I_RpcMapWin32Status should be always defined. --- include/rpcdcep.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 5514790..b93c9a6 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -183,11 +183,6 @@ RPCRTAPI UINT RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetWMsgEndpoint( WCHAR* Endpoint ); -RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); - -RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); - #endif #else @@ -212,6 +207,11 @@ RPCRTAPI UINT RPC_ENTRY #endif +RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); + +RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); + #ifdef __cplusplus } #endif

1 0

Francois Gouget : msxml3/tests: Add the trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: ca64f7c75a95cb77a608a12839771bdb223aff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca64f7c75a95cb77a608a1283… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 7 11:16:33 2008 +0100 msxml3/tests: Add the trailing '\n' to an ok() call. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4f8882..67897e3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1827,7 +1827,7 @@ static void test_xmlTypes(void) IXMLDOMNode *pNewChild = (IXMLDOMNode *)0x1; hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); - ok(pNewChild == NULL, "pNewChild not NULL"); + ok(pNewChild == NULL, "pNewChild not NULL\n"); hr = IXMLDOMElement_get_attributes(pElement, &pAttribs); ok(hr == S_OK, "ret %08x\n", hr );

1 0

Aric Stewart : imm32: ImmNotifyIMM with CPS_CANCEL fully clears the composition string. Also enable respective tests.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 6bc088b28cef4ebc0362f217eef0c4a891054d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc088b28cef4ebc0362f217e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 4 12:22:03 2008 -0600 imm32: ImmNotifyIMM with CPS_CANCEL fully clears the composition string. Also enable respective tests. --- dlls/imm32/imm.c | 11 +++++++---- dlls/imm32/tests/imm32.c | 4 ---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index da39261..4acbde3 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1406,15 +1406,18 @@ BOOL WINAPI ImmNotifyIME( case CPS_CANCEL: TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); { - HIMCC newCompStr; + BOOL send; + if (pX11DRV_ForceXIMReset) pX11DRV_ForceXIMReset(root_context->IMC.hWnd); - newCompStr = updateCompStr(root_context->IMC.hCompStr, NULL, 0); + send = (root_context->IMC.hCompStr!=NULL); + ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = newCompStr; + root_context->IMC.hCompStr = NULL; - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + if (send) + ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, GCS_COMPSTR); rc = TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 895c801..d948f54 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -183,11 +183,9 @@ static int test_ImmNotifyIME(void) { ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " "empty composition string succeeds.\n"); - todo_wine { ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - } msg_spy_flush_msgs(); @@ -203,11 +201,9 @@ static int test_ImmNotifyIME(void) { ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " "empty composition string succeeds.\n"); - todo_wine { ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - } msg_spy_flush_msgs(); ImmReleaseContext(hwnd, imc);

1 0

Rob Shearman : include: Add the strict_context_handle flag to the Irot interface.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: d7cbaf572a7c0cdda52169ddc110bb9a94a43d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7cbaf572a7c0cdda52169ddc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:26:18 2008 +0000 include: Add the strict_context_handle flag to the Irot interface. --- include/wine/irot.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/wine/irot.idl b/include/wine/irot.idl index f14af13..54d8653 100644 --- a/include/wine/irot.idl +++ b/include/wine/irot.idl @@ -28,7 +28,8 @@ typedef struct tagMonikerComparisonData { [ uuid(7a98c254-6808-11cf-b73b-00aa00b677a8), - version(0.2) + version(0.2), + strict_context_handle ] interface Irot {

1 0

Rob Shearman : rpcrt4: Pass the interface identifier to the lower-level context handle routines for context handles with the strict flag set .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: f9fc52f602ec9af5610ba14c6b2c5bbcc9ae6958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fc52f602ec9af5610ba14c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:21:21 2008 +0000 rpcrt4: Pass the interface identifier to the lower-level context handle routines for context handles with the strict flag set. --- dlls/rpcrt4/ndr_marshall.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b3c7df8..dcbb4fd 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6279,9 +6279,18 @@ void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, NULL, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, 0); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6289,6 +6298,8 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -6300,9 +6311,14 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, if_id, 0); pStubMsg->Buffer += cbNDRContext; } @@ -6310,6 +6326,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { NDR_SCONTEXT ContextHandle; + RPC_SYNTAX_IDENTIFIER *if_id = NULL; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6322,11 +6339,16 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + if_id, 0); pStubMsg->Buffer += cbNDRContext; return ContextHandle;

1 0

Rob Shearman : rpcrt4: Print fixme' s if the serialize or no-serialize flags are set on a context handle being marshalled or unmarshalled .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: a0410bef34c3012f31328c07f92e3676c29680b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0410bef34c3012f31328c07f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:26:10 2008 +0000 rpcrt4: Print fixme's if the serialize or no-serialize flags are set on a context handle being marshalled or unmarshalled. --- dlls/rpcrt4/ndr_contexthandle.c | 19 +++++++++++++++---- dlls/rpcrt4/ndr_marshall.c | 27 ++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 21d8747..7334bf6 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -218,7 +218,8 @@ void WINAPI NDRSContextMarshall(NDR_SCONTEXT SContext, NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p)\n", SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, + userRunDownIn, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -230,7 +231,8 @@ void WINAPI NDRSContextMarshallEx(RPC_BINDING_HANDLE hBinding, NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p %p)\n", hBinding, SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -252,6 +254,9 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); + if (SContext->userContext) { status = RpcServerAssoc_UpdateContextHandle(binding->Assoc, SContext, CtxGuard, userRunDownIn); @@ -287,7 +292,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall(void *pBuff, ULONG DataRepresentation) { TRACE("(%p %08x)\n", pBuff, DataRepresentation); - return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, + DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -298,7 +305,8 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(RPC_BINDING_HANDLE hBinding, ULONG DataRepresentation) { TRACE("(%p %p %08x)\n", hBinding, pBuff, DataRepresentation); - return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -319,6 +327,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); + if (!pBuff) status = RpcServerAssoc_AllocateContextHandle(binding->Assoc, CtxGuard, &SContext); diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dcbb4fd..f8f8973 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6241,7 +6241,8 @@ void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; } @@ -6263,7 +6264,7 @@ NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; return ContextHandle; @@ -6280,9 +6281,14 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6290,7 +6296,8 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, } return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, if_id, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, + flags); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6299,6 +6306,7 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); @@ -6311,6 +6319,10 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6318,7 +6330,7 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, if_id, 0); + pStubMsg->Buffer, RundownRoutine, if_id, flags); pStubMsg->Buffer += cbNDRContext; } @@ -6327,6 +6339,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, { NDR_SCONTEXT ContextHandle; RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6339,6 +6352,10 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6348,7 +6365,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - if_id, 0); + if_id, flags); pStubMsg->Buffer += cbNDRContext; return ContextHandle;

1 0

Rob Shearman : widl: Output calls for the new versions of the marshalling and unmarshalling routines for server context handles .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 807001441ddee17ad12c0eaf4a28c8a6df4f2bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807001441ddee17ad12c0eaf4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:21:03 2008 +0000 widl: Output calls for the new versions of the marshalling and unmarshalling routines for server context handles. This needs to be done to match the call to NdrContextHandleInitialize and because we default to using strict context handles. --- tools/widl/typegen.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 55fb3fa..b9d3306 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2707,10 +2707,11 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } else { - print_file(file, indent, "NdrServerContextMarshall(\n"); + print_file(file, indent, "NdrServerContextNewMarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_SCONTEXT)%s,\n", var->name); - print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown);\n", get_context_handle_type_name(var->type)); + print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown,\n", get_context_handle_type_name(var->type)); + print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", start_offset); } } else if (phase == PHASE_UNMARSHAL) @@ -2723,7 +2724,11 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, print_file(file, indent + 1, "_Handle);\n"); } else - print_file(file, indent, "%s = NdrServerContextUnmarshall(&_StubMsg);\n", var->name); + { + print_file(file, indent, "%s = NdrServerContextNewUnmarshall(\n", var->name); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", start_offset); + } } } else if (is_user_type(var->type))

1 0