Commit c171379f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

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

parent ca8d5a79
...@@ -1143,7 +1143,7 @@ static void test_client_init(void) ...@@ -1143,7 +1143,7 @@ static void test_client_init(void)
/* Note: ReservedForRuntime not tested */ /* Note: ReservedForRuntime not tested */
TEST_POINTER_UNSET(ManagerEpv); TEST_POINTER_UNSET(ManagerEpv);
TEST_POINTER_UNSET(ImportContext); 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 #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) #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) ...@@ -1978,7 +1978,7 @@ static void test_ndr_buffer(void)
ok(RpcMessage.BufferLength == 10 || ok(RpcMessage.BufferLength == 10 ||
broken(RpcMessage.BufferLength == 12), /* win2k */ broken(RpcMessage.BufferLength == 12), /* win2k */
"RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); "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.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.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); ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd);
......
...@@ -36,7 +36,7 @@ typedef struct _RPC_SYNTAX_IDENTIFIER { ...@@ -36,7 +36,7 @@ typedef struct _RPC_SYNTAX_IDENTIFIER {
typedef struct _RPC_MESSAGE typedef struct _RPC_MESSAGE
{ {
RPC_BINDING_HANDLE Handle; RPC_BINDING_HANDLE Handle;
unsigned long DataRepresentation; ULONG DataRepresentation;
void* Buffer; void* Buffer;
unsigned int BufferLength; unsigned int BufferLength;
unsigned int ProcNum; unsigned int ProcNum;
...@@ -45,7 +45,7 @@ typedef struct _RPC_MESSAGE ...@@ -45,7 +45,7 @@ typedef struct _RPC_MESSAGE
void* ReservedForRuntime; void* ReservedForRuntime;
RPC_MGR_EPV* ManagerEpv; RPC_MGR_EPV* ManagerEpv;
void* ImportContext; void* ImportContext;
unsigned long RpcFlags; ULONG RpcFlags;
} RPC_MESSAGE, *PRPC_MESSAGE; } RPC_MESSAGE, *PRPC_MESSAGE;
/* or'ed with ProcNum */ /* or'ed with ProcNum */
...@@ -202,13 +202,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ...@@ -202,13 +202,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY
typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent); typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent);
RPCRTAPI RPC_STATUS RPC_ENTRY 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 RPCRTAPI RPC_STATUS RPC_ENTRY
I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient ); I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient );
RPCRTAPI UINT RPC_ENTRY 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 #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment