Michael Stefaniuc : include: Use ULONG in rpcdcep.h for Win64 compatibility .

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Sun Jan 11 00:17:01 2009 +0100

include: Use ULONG in rpcdcep.h for Win64 compatibility.

---

dlls/rpcrt4/tests/ndr_marshall.c |    4 ++--
 include/rpcdcep.h                |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index de49848..83a80d9 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -1143,7 +1143,7 @@ static void test_client_init(void)
     /* Note: ReservedForRuntime not tested */
     TEST_POINTER_UNSET(ManagerEpv);
     TEST_POINTER_UNSET(ImportContext);
-    ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%lx\n", rpcMsg.RpcFlags);
+    ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%x\n", rpcMsg.RpcFlags);
 #undef TEST_POINTER_UNSET

#define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field)
@@ -1978,7 +1978,7 @@ static void test_ndr_buffer(void)
     ok(RpcMessage.BufferLength == 10 ||
        broken(RpcMessage.BufferLength == 12), /* win2k */
        "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength);
-    ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%lx\n", RpcMessage.RpcFlags);
+    ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%x\n", RpcMessage.RpcFlags);
     ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n");
     ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart);
     ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd);
diff --git a/include/rpcdcep.h b/include/rpcdcep.h
index 1bdfb47..0169586 100644
--- a/include/rpcdcep.h
+++ b/include/rpcdcep.h
@@ -36,7 +36,7 @@ typedef struct _RPC_SYNTAX_IDENTIFIER {
 typedef struct _RPC_MESSAGE
 {
     RPC_BINDING_HANDLE Handle;
-    unsigned long DataRepresentation;
+    ULONG DataRepresentation;
     void* Buffer;
     unsigned int BufferLength;
     unsigned int ProcNum;
@@ -45,7 +45,7 @@ typedef struct _RPC_MESSAGE
     void* ReservedForRuntime;
     RPC_MGR_EPV* ManagerEpv;
     void* ImportContext;
-    unsigned long RpcFlags;
+    ULONG RpcFlags;
 } RPC_MESSAGE, *PRPC_MESSAGE;

/* or'ed with ProcNum */
@@ -202,13 +202,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY
 typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent);

RPCRTAPI RPC_STATUS RPC_ENTRY
-  I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, unsigned long ServerTid );
+  I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, ULONG ServerTid );

RPCRTAPI RPC_STATUS RPC_ENTRY
   I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient );

RPCRTAPI UINT RPC_ENTRY
-  I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, unsigned long lParam );
+  I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, ULONG lParam );

#endif