[cwittich] 31857: rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings. <rob at codeweavers.com>

Author: cwittich
Date: Fri Jan 18 14:28:18 2008
New Revision: 31857

URL: http://svn.reactos.org/svn/reactos?rev=31857&view=rev
Log:
rpcrt4: Add support for calculating the memory size of complex types with embedded non-conformant strings. <rob at codeweavers.com>

Modified:
    trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c

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 (original)
+++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 14:28:18 2008
@@ -2127,6 +2127,7 @@
   case RPC_FC_BOGUS_STRUCT:
   case RPC_FC_SMFARRAY:
   case RPC_FC_SMVARRAY:
+  case RPC_FC_CSTRING:
     return *(const WORD*)&pFormat[2];
   case RPC_FC_USER_MARSHAL:
     return *(const WORD*)&pFormat[4];
@@ -2141,6 +2142,8 @@
     return *(const SHORT*)pFormat;
   case RPC_FC_IP:
     return sizeof(void *);
+  case RPC_FC_WSTRING:
+    return *(const WORD*)&pFormat[2] * 2;
   default:
     FIXME("unhandled embedded type %02x\n", *pFormat);
   }