[PATCH 2/4] rpcrt4: Bring the function definitions in sync with their declaration. They got out of sync due to the unsigned long to ULONG changes in the headers.

[Michael Stefaniuc]

---
 dlls/rpcrt4/ndr_clientserver.c |    6 +++---
 dlls/rpcrt4/ndr_fullpointer.c  |   16 ++++++++--------
 dlls/rpcrt4/ndr_ole.c          |    4 ++--
 dlls/rpcrt4/ndr_stubless.c     |    4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c
index cb260f1..3c17f27 100644
--- a/dlls/rpcrt4/ndr_clientserver.c
+++ b/dlls/rpcrt4/ndr_clientserver.c
@@ -129,7 +129,7 @@ unsigned char* WINAPI NdrServerInitializ
 /***********************************************************************
  *           NdrGetBuffer [RPCRT4.@]
  */
-unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle)
+unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle)
 {
   TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle);
   
@@ -195,8 +195,8 @@ unsigned char *WINAPI NdrSendReceive( MI
  *           NdrMapCommAndFaultStatus [RPCRT4.@]
  */
 RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg,
-                                               unsigned long *pCommStatus,
-                                               unsigned long *pFaultStatus,
+                                               ULONG *pCommStatus,
+                                               ULONG *pFaultStatus,
                                                RPC_STATUS Status )
 {
     FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status);
diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c
index b89b669..1cfd047 100644
--- a/dlls/rpcrt4/ndr_fullpointer.c
+++ b/dlls/rpcrt4/ndr_fullpointer.c
@@ -29,10 +29,10 @@ #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
-PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(unsigned long NumberOfPointers,
+PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers,
                                                     XLAT_SIDE XlatSide)
 {
-    unsigned long NumberOfBuckets;
+    ULONG NumberOfBuckets;
     PFULL_PTR_XLAT_TABLES pXlatTables = HeapAlloc(GetProcessHeap(), 0, sizeof(*pXlatTables));
 
     TRACE("(%ld, %d)\n", NumberOfPointers, XlatSide);
@@ -93,9 +93,9 @@ static void expand_pointer_table_if_nece
 
 int WINAPI NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES pXlatTables,
                                       void *pPointer, unsigned char QueryType,
-                                      unsigned long *pRefId )
+                                      ULONG *pRefId )
 {
-    unsigned long Hash = 0;
+    ULONG Hash = 0;
     int i;
     PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry;
 
@@ -141,8 +141,8 @@ int WINAPI NdrFullPointerQueryPointer(PF
 }
 
 int WINAPI NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES pXlatTables,
-                                    unsigned long RefId,
-                                    unsigned char QueryType, void **ppPointer)
+                                    ULONG RefId, unsigned char QueryType,
+                                    void **ppPointer)
 {
     TRACE("(%p, 0x%lx, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer);
 
@@ -168,9 +168,9 @@ int WINAPI NdrFullPointerQueryRefId(PFUL
 }
 
 void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables,
-                                      unsigned long RefId, void *pPointer)
+                                      ULONG RefId, void *pPointer)
 {
-    unsigned long Hash = 0;
+    ULONG Hash = 0;
     int i;
     PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry;
 
diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c
index 2e4c67b..e954340 100644
--- a/dlls/rpcrt4/ndr_ole.c
+++ b/dlls/rpcrt4/ndr_ole.c
@@ -321,8 +321,8 @@ void WINAPI NdrInterfacePointerBufferSiz
 /***********************************************************************
  *           NdrInterfacePointerMemorySize [RPCRT4.@]
  */
-unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
-                                                  PFORMAT_STRING pFormat)
+ULONG WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
+                                           PFORMAT_STRING pFormat)
 {
   ULONG size;
 
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 9d4d78a..7539312 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1076,11 +1076,11 @@ static DWORD calc_arg_size(MIDL_STUB_MES
 }
 
 /* FIXME: need to free some stuff in here too */
-long WINAPI NdrStubCall2(
+LONG WINAPI NdrStubCall2(
     struct IRpcStubBuffer * pThis,
     struct IRpcChannelBuffer * pChannel,
     PRPC_MESSAGE pRpcMsg,
-    unsigned long * pdwStubPhase)
+    DWORD * pdwStubPhase)
 {
     const MIDL_SERVER_INFO *pServerInfo;
     const MIDL_STUB_DESC *pStubDesc;
-- 
1.4.2.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061109/ccf5a38f/attachment.pgp