Robert Shearman : rpcrt4:
Rename NonEncapsulatedUnionSize to NdrNonEncapsulatedUnionMemorySize.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed May 10 12:56:49 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 5616c4150c0ab97d5ecba67935fd86e492a5f48b
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5616c4150c0ab97d5ecba67935fd86e492a5f48b
Author: Robert Shearman <rob at codeweavers.com>
Date: Wed May 10 13:12:20 2006 +0100
rpcrt4: Rename NonEncapsulatedUnionSize to NdrNonEncapsulatedUnionMemorySize.
---
dlls/rpcrt4/ndr_marshall.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 836b6ca..ac38bce 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -1427,20 +1427,6 @@ void WINAPI NdrSimpleStructFree(PMIDL_ST
}
-static long NonEncapsulatedUnionSize(PMIDL_STUB_MESSAGE pStubMsg,
- PFORMAT_STRING pFormat)
-{
- pFormat += 2;
- if (pStubMsg->fHasNewCorrDesc)
- pFormat += 6;
- else
- pFormat += 4;
-
- pFormat += *(const SHORT*)pFormat;
- TRACE("size %d\n", *(const SHORT*)pFormat);
- return *(const SHORT*)pFormat;
-}
-
unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat)
{
@@ -1453,7 +1439,7 @@ unsigned long WINAPI EmbeddedComplexSize
case RPC_FC_USER_MARSHAL:
return *(const WORD*)&pFormat[4];
case RPC_FC_NON_ENCAPSULATED_UNION:
- return NonEncapsulatedUnionSize(pStubMsg, pFormat);
+ return NdrNonEncapsulatedUnionMemorySize(pStubMsg, pFormat);
default:
FIXME("unhandled embedded type %02x\n", *pFormat);
}
@@ -3109,8 +3095,15 @@ void WINAPI NdrNonEncapsulatedUnionBuffe
unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat)
{
- FIXME("stub\n");
- return 0;
+ pFormat += 2;
+ if (pStubMsg->fHasNewCorrDesc)
+ pFormat += 6;
+ else
+ pFormat += 4;
+
+ pFormat += *(const SHORT*)pFormat;
+ TRACE("size %d\n", *(const SHORT*)pFormat);
+ return *(const SHORT*)pFormat;
}
/***********************************************************************
More information about the wine-cvs
mailing list