Fix some more signed/unsigned comparison warnings

Rolf Kalbermatter rolf.kalbermatter at citeng.com
Thu Dec 12 08:28:06 CST 2002


Changelog
  * dlls/shell32/shfldr_fs.c
  * dlls/shell32/shlexec.c
  * dlls/shell32/shlview.c
  * dlls/shell32/shv_item_cmenu.c
    Fix some signed/unsigned comparison warnings		

Rolf Kalbermatter 

Index: dlls/shell32/shfldr_fs.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_fs.c,v
retrieving revision 1.3
diff -u -r1.3 shfldr_fs.c
--- dlls/shell32/shfldr_fs.c	5 Dec 2002 20:33:08 -0000	1.3
+++ dlls/shell32/shfldr_fs.c	12 Dec 2002 14:24:16 -0000
@@ -962,7 +962,7 @@
 static HRESULT WINAPI ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl)
 {
     _ICOM_THIS_From_ISFHelper (IGenericSFImpl, iface)
-    int i;
+    UINT i;
     char szPath[MAX_PATH];
     BOOL bConfirm = TRUE;
 
@@ -1019,7 +1019,7 @@
 static HRESULT WINAPI
 ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl)
 {
-    int i;
+    UINT i;
     IPersistFolder2 *ppf2 = NULL;
     char szSrcPath[MAX_PATH],
       szDstPath[MAX_PATH];
 
Index: dlls/shell32/shlexec.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlexec.c,v
retrieving revision 1.12
diff -u -r1.12 shlexec.c
--- dlls/shell32/shlexec.c	2 Dec 2002 18:10:58 -0000	1.12
+++ dlls/shell32/shlexec.c	12 Dec 2002 14:25:06 -0000
@@ -170,7 +170,6 @@
     char buffer[256];       /* Used to GetProfileString */
     UINT retval = 31;  /* default - 'No association was found' */
     char *tok;              /* token pointer */
-    int i;                  /* random counter */
     char xlpFile[256] = ""; /* result of SearchPath */
 
     TRACE("%s\n", (lpFile != NULL) ? lpFile : "-");
@@ -224,6 +223,8 @@
     if (GetProfileStringA("windows", "programs", "exe pif bat com",
                           buffer, sizeof(buffer)) > 0)
     {
+        UINT i;
+
         for (i = 0;i<strlen(buffer); i++) buffer[i] = tolower(buffer[i]);
 
         tok = strtok(buffer, " \t"); /* ? */
 
Index: dlls/shell32/shlview.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlview.c,v
retrieving revision 1.70
diff -u -r1.70 shlview.c
--- dlls/shell32/shlview.c	21 Nov 2002 23:56:42 -0000	1.70
+++ dlls/shell32/shlview.c	12 Dec 2002 14:26:15 -0000
@@ -561,7 +561,7 @@
 	LPENUMIDLIST	pEnumIDList;
 	LPITEMIDLIST	pidl;
 	DWORD		dwFetched;
-	UINT		i;
+	INT		i;
 	HRESULT		hRes;
 	HDPA		hdpa;
 
@@ -1313,7 +1313,8 @@
 #endif
 	      else if(plvKeyDown->wVKey == VK_DELETE)
               {
-		int i, item_index;
+		UINT i;
+		int item_index;
 		LVITEMA item;
 		LPITEMIDLIST* pItems;
 		ISFHelper *psfhlp;
 
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.13
diff -u -r1.13 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c	5 Dec 2002 20:33:08 -0000	1.13
+++ dlls/shell32/shv_item_cmenu.c	12 Dec 2002 14:27:03 -0000
@@ -265,7 +265,7 @@
 {
 	ICOM_THIS(ItemCmImpl, iface);
 
-	int i, bFolderFound = FALSE;
+	UINT i, bFolderFound = FALSE;
 	LPITEMIDLIST	pidlFQ;
 	SHELLEXECUTEINFOA	sei;
 




More information about the wine-patches mailing list