[ros-diffs] [cwittich] 42860: partial rpcrt4 sync with wine 1.1.28

Author: cwittich
Date: Sat Aug 22 19:23:43 2009
New Revision: 42860

URL: http://svn.reactos.org/svn/reactos?rev=42860&view=rev
Log:
partial rpcrt4 sync with wine 1.1.28

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_marsh…
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Sat Aug 22 19:23:43 2009
@@ -2727,6 +2727,9 @@
       pMemory += sizeof(void *);
       break;
     }
+    case RPC_FC_ALIGNM2:
+      ALIGN_POINTER(pMemory, 2);
+      break;
     case RPC_FC_ALIGNM4:
       ALIGN_POINTER(pMemory, 4);
       break;
@@ -2852,6 +2855,9 @@
       pMemory += sizeof(void *);
       break;
     }
+    case RPC_FC_ALIGNM2:
+      ALIGN_POINTER_CLEAR(pMemory, 2);
+      break;
     case RPC_FC_ALIGNM4:
       ALIGN_POINTER_CLEAR(pMemory, 4);
       break;
@@ -2966,6 +2972,9 @@
       pPointer += 4;
       pMemory += sizeof(void*);
       break;
+    case RPC_FC_ALIGNM2:
+      ALIGN_POINTER(pMemory, 2);
+      break;
     case RPC_FC_ALIGNM4:
       ALIGN_POINTER(pMemory, 4);
       break;
@@ -3049,6 +3058,9 @@
       pPointer += 4;
       pMemory += sizeof(void *);
       break;
+    case RPC_FC_ALIGNM2:
+      ALIGN_POINTER(pMemory, 2);
+      break;
     case RPC_FC_ALIGNM4:
       ALIGN_POINTER(pMemory, 4);
       break;
@@ -3161,6 +3173,9 @@
       size += sizeof(void *);
       break;
     }
+    case RPC_FC_ALIGNM2:
+      ALIGN_LENGTH(size, 2);
+      break;
     case RPC_FC_ALIGNM4:
       ALIGN_LENGTH(size, 4);
       break;
@@ -3223,6 +3238,9 @@
       break;
     case RPC_FC_POINTER:
       size += sizeof(void *);
+      break;
+    case RPC_FC_ALIGNM2:
+      ALIGN_LENGTH(size, 2);
       break;
     case RPC_FC_ALIGNM4:
       ALIGN_LENGTH(size, 4);