Andrew Talbot : rpcrt4: Sign-compare warnings fix.

Alexandre Julliard julliard at winehq.org
Fri Nov 7 07:23:54 CST 2008


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

Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date:   Thu Nov  6 21:17:53 2008 +0000

rpcrt4: Sign-compare warnings fix.

---

 dlls/rpcrt4/cpsf.c            |    4 ++--
 dlls/rpcrt4/ndr_fullpointer.c |    6 +++---
 dlls/rpcrt4/rpc_transport.c   |    9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c
index 9449695..22537fd 100644
--- a/dlls/rpcrt4/cpsf.c
+++ b/dlls/rpcrt4/cpsf.c
@@ -147,7 +147,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv,
   *ppv = NULL;
   if (!pPSFactoryBuffer->lpVtbl) {
     const ProxyFileInfo **pProxyFileList2;
-    int max_delegating_vtbl_size = 0;
+    DWORD max_delegating_vtbl_size = 0;
     pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl;
     pPSFactoryBuffer->RefCount = 0;
     pPSFactoryBuffer->pProxyFileList = pProxyFileList;
@@ -158,7 +158,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv,
          * async interfaces */
         void * const *pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Vtbl;
         void **pRpcStubVtbl = (void **)&(*pProxyFileList2)->pStubVtblList[i]->Vtbl;
-        int j;
+        unsigned int j;
 
         if ((*pProxyFileList2)->pDelegatedIIDs && (*pProxyFileList2)->pDelegatedIIDs[i]) {
           pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Delegating_Vtbl;
diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c
index 307e545..b686683 100644
--- a/dlls/rpcrt4/ndr_fullpointer.c
+++ b/dlls/rpcrt4/ndr_fullpointer.c
@@ -111,7 +111,7 @@ int WINAPI NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES pXlatTables,
                                       ULONG *pRefId )
 {
     ULONG Hash = 0;
-    int i;
+    unsigned int i;
     PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry;
 
     TRACE("(%p, %p, %d, %p)\n", pXlatTables, pPointer, QueryType, pRefId);
@@ -186,7 +186,7 @@ void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables,
                                       ULONG RefId, void *pPointer)
 {
     ULONG Hash = 0;
-    int i;
+    unsigned int i;
     PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry;
 
     TRACE("(%p, 0x%x, %p)\n", pXlatTables, RefId, pPointer);
@@ -211,7 +211,7 @@ void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables,
 int WINAPI NdrFullPointerFree(PFULL_PTR_XLAT_TABLES pXlatTables, void *Pointer)
 {
     ULONG Hash = 0;
-    int i;
+    unsigned int i;
     PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry;
     ULONG RefId = 0;
 
diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c
index 13181b7..3d66740 100644
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -1326,7 +1326,8 @@ static void rpcrt4_protseq_sock_free_wait_array(RpcServerProtseq *protseq, void
 static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq, unsigned int count, void *wait_array)
 {
     struct pollfd *poll_info = wait_array;
-    int ret, i;
+    int ret;
+    unsigned int i;
     RpcConnection *cconn;
     RpcConnection_tcp *conn;
     
@@ -1451,7 +1452,7 @@ static const struct protseq_ops protseq_list[] =
 
 const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq)
 {
-  int i;
+  unsigned int i;
   for(i=0; i<ARRAYSIZE(protseq_list); i++)
     if (!strcmp(protseq_list[i].name, protseq))
       return &protseq_list[i];
@@ -1460,7 +1461,7 @@ const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq)
 
 static const struct connection_ops *rpcrt4_get_conn_protseq_ops(const char *protseq)
 {
-    int i;
+    unsigned int i;
     for(i=0; i<ARRAYSIZE(conn_protseq_list); i++)
         if (!strcmp(conn_protseq_list[i].name, protseq))
             return &conn_protseq_list[i];
@@ -1614,7 +1615,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data,
     const twr_empty_floor_t *floor4;
     const struct connection_ops *protseq_ops = NULL;
     RPC_STATUS status;
-    int i;
+    unsigned int i;
 
     if (tower_size < sizeof(*protocol_floor))
         return EPT_S_NOT_REGISTERED;




More information about the wine-cvs mailing list