wine/dlls/rpcrt4 ndr_marshall.c

[Alexandre Julliard]

ChangeSet ID:	21487
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/28 05:05:54

Modified files:
	dlls/rpcrt4    : ndr_marshall.c 

Log message:
	Robert Shearman <rob at codeweavers.com>
	Implement FC_STRUCTPAD2 for complex types.

Patch: http://cvs.winehq.org/patch.py?id=21487

Old revision  New revision  Changes     Path
 1.34          1.35          +15 -0      wine/dlls/rpcrt4/ndr_marshall.c

Index: wine/dlls/rpcrt4/ndr_marshall.c
diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.34 wine/dlls/rpcrt4/ndr_marshall.c:1.35
--- wine/dlls/rpcrt4/ndr_marshall.c:1.34	28 Nov 2005 11: 5:54 -0000
+++ wine/dlls/rpcrt4/ndr_marshall.c	28 Nov 2005 11: 5:54 -0000
@@ -1442,6 +1442,9 @@ unsigned char * WINAPI ComplexMarshall(P
     case RPC_FC_ALIGNM8:
       ALIGN_POINTER(pMemory, 7);
       break;
+    case RPC_FC_STRUCTPAD2:
+      pMemory += 2;
+      break;
     case RPC_FC_EMBEDDED_COMPLEX:
       pMemory += pFormat[1];
       pFormat += 2;
@@ -1505,6 +1508,9 @@ unsigned char * WINAPI ComplexUnmarshall
     case RPC_FC_ALIGNM8:
       ALIGN_POINTER(pMemory, 7);
       break;
+    case RPC_FC_STRUCTPAD2:
+      pMemory += 2;
+      break;
     case RPC_FC_EMBEDDED_COMPLEX:
       pMemory += pFormat[1];
       pFormat += 2;
@@ -1562,6 +1568,9 @@ unsigned char * WINAPI ComplexBufferSize
     case RPC_FC_ALIGNM8:
       ALIGN_POINTER(pMemory, 7);
       break;
+    case RPC_FC_STRUCTPAD2:
+      pMemory += 2;
+      break;
     case RPC_FC_EMBEDDED_COMPLEX:
       pMemory += pFormat[1];
       pFormat += 2;
@@ -1615,6 +1624,9 @@ unsigned char * WINAPI ComplexFree(PMIDL
     case RPC_FC_ALIGNM8:
       ALIGN_POINTER(pMemory, 7);
       break;
+    case RPC_FC_STRUCTPAD2:
+      pMemory += 2;
+      break;
     case RPC_FC_EMBEDDED_COMPLEX:
       pMemory += pFormat[1];
       pFormat += 2;
@@ -1662,6 +1674,9 @@ unsigned long WINAPI ComplexStructSize(P
     case RPC_FC_ALIGNM8:
       ALIGN_LENGTH(size, 7);
       break;
+    case RPC_FC_STRUCTPAD2:
+      size += 2;
+      break;
     case RPC_FC_EMBEDDED_COMPLEX:
       size += pFormat[1];
       pFormat += 2;