[RPCRT4]

Add a missing format type to unmarshall_discriminant().

svn path=/trunk/; revision=49146

diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c
index 9946bd1..839a4ca 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_marshall.c
+++ b/reactos/dll/win32/rpcrt4/ndr_marshall.c
@@ -6032,6 +6032,7 @@ static LONG unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg,
     case RPC_FC_WCHAR:
     case RPC_FC_SHORT:
     case RPC_FC_USHORT:
     case RPC_FC_WCHAR:
     case RPC_FC_SHORT:
     case RPC_FC_USHORT:

+    case RPC_FC_ENUM16:

     {
         USHORT d;
         ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT));
     {
         USHORT d;
         ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT));

diff --git a/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff b/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff
index 548e18a..a3309f0 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff
+++ b/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff
@@ -15,6 +15,18 @@ Index: epm_towers.h
  #define EPM_PROTOCOL_OSI_TP4                  0x05
  #define EPM_PROTOCOL_OSI_CLNS                 0x06
  #define EPM_PROTOCOL_TCP              0x07
  #define EPM_PROTOCOL_OSI_TP4                  0x05
  #define EPM_PROTOCOL_OSI_CLNS                 0x06
  #define EPM_PROTOCOL_TCP              0x07

+Index: ndr_marshall.c
+===================================================================
+--- ndr_marshall.c     (working copy)
++++ ndr_marshall.c     (working copy)
+@@ -6032,6 +6032,7 @@
+     case RPC_FC_WCHAR:
+     case RPC_FC_SHORT:
+     case RPC_FC_USHORT:
++    case RPC_FC_ENUM16:
+     {
+         USHORT d;
+         ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT));

 Index: rpc_epmap.c
 ===================================================================
 --- rpc_epmap.c        (working copy)
 Index: rpc_epmap.c
 ===================================================================
 --- rpc_epmap.c        (working copy)