rpcrt4: Avoid using long.

Michael Stefaniuc mstefani at redhat.de
Sun May 16 18:11:09 CDT 2010


---
I'm not sure about the NdrCorrCache part. I cannot find anything for it
on the internet nor is it used in Wine.


 dlls/rpcrt4/ndr_stubless.c |    4 ++--
 dlls/rpcrt4/rpcrt4_main.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 5a66c25..e1743cc 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -579,7 +579,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
     void * This = NULL;
     PFORMAT_STRING pHandleFormat;
     /* correlation cache */
-    unsigned long NdrCorrCache[256];
+    ULONG NdrCorrCache[256];
 
     TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat);
 
@@ -1636,7 +1636,7 @@ struct async_call_data
     /* number of parameters. optional for client to give it to us */
     unsigned char number_of_params;
     /* correlation cache */
-    unsigned long NdrCorrCache[256];
+    ULONG NdrCorrCache[256];
 };
 
 LONG_PTR WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc,
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 344b6d0..2d7a754 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -432,7 +432,7 @@ RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid)
 
     /* Pack the information into the UUID structure. */
 
-    Uuid->Data1  = (unsigned long)(time & 0xffffffff);
+    Uuid->Data1  = (ULONG)(time & 0xffffffff);
     Uuid->Data2  = (unsigned short)((time >> 32) & 0xffff);
     Uuid->Data3  = (unsigned short)((time >> 48) & 0x0fff);
 
-- 
1.7.1



More information about the wine-patches mailing list