Author: cwittich Date: Mon Oct 19 23:18:07 2009 New Revision: 43626
URL: http://svn.reactos.org/svn/reactos?rev=43626&view=rev Log: partial rpcrt4 sync to wine 1.1.31
Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec
Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?r... ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -439,3 +439,15 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) NdrFullPointerXlatFree(pEsMsg->StubMsg.FullPtrXlatTables); } + +void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + +void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +}
Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsha... ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -32,6 +32,7 @@ #include <string.h> #include <limits.h>
+#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -4379,15 +4380,15 @@ if (level != 1) return RPC_S_INVALID_ARG;
- memset(&umi->Level1, 0, sizeof(umi->Level1)); + memset(&umi->u1.Level1, 0, sizeof(umi->u1.Level1)); umi->InformationLevel = level;
if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) return RPC_S_INVALID_ARG;
- umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; - umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; - umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; + umi->u1.Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; + umi->u1.Level1.pfnFree = umcb->pStubMsg->pfnFree; + umi->u1.Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer;
switch (umcb->CBType) { @@ -4403,8 +4404,8 @@ umcb->pStubMsg->Buffer > buffer_end) return ERROR_INVALID_USER_BUFFER;
- umi->Level1.Buffer = umcb->pStubMsg->Buffer; - umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; + umi->u1.Level1.Buffer = umcb->pStubMsg->Buffer; + umi->u1.Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; break; } case USER_MARSHAL_CB_BUFFER_SIZE:
Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.spe... ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Mon Oct 19 23:18:07 2009 @@ -224,11 +224,11 @@ @ stub NdrMesSimpleTypeEncode @ stub NdrMesTypeAlignSize2 @ stub NdrMesTypeAlignSize -@ stub NdrMesTypeDecode2 +@ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode @ stub NdrMesTypeEncode2 @ stub NdrMesTypeEncode -@ stub NdrMesTypeFree2 +@ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr) @ stdcall NdrNonConformantStringMarshall(ptr ptr ptr) @ stdcall NdrNonConformantStringMemorySize(ptr ptr)