Dan Hipschman : rpcrt4: Allow enums as union switch types.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jun 26 07:12:04 CDT 2007


Module: wine
Branch: master
Commit: ea7b1694de36742f0b3b356a6bebf5d181619583
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea7b1694de36742f0b3b356a6bebf5d181619583

Author: Dan Hipschman <dsh at linux.ucla.edu>
Date:   Mon Jun 25 18:26:42 2007 -0700

rpcrt4: Allow enums as union switch types.

---

 dlls/rpcrt4/ndr_marshall.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 2b89e50..d8395b8 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -4414,9 +4414,11 @@ static ULONG get_discriminant(unsigned char fc, unsigned char *pMemory)
     case RPC_FC_WCHAR:
     case RPC_FC_SHORT:
     case RPC_FC_USHORT:
+    case RPC_FC_ENUM16:
         return *(USHORT *)pMemory;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
+    case RPC_FC_ENUM32:
         return *(ULONG *)pMemory;
     default:
         FIXME("Unhandled base type: 0x%02x\n", fc);




More information about the wine-cvs mailing list