programs/winecfg: sign compare fixes

[Austin English]

-- 
-Austin
-------------- next part --------------
From 9b3b81d11d83cffd6a78c86e88da78d179c1a8ad Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish at gmail.com>
Date: Mon, 13 Jul 2009 16:54:47 -0500
Subject: [PATCH] programs/winecfg: sign compare fixes

---
 programs/winecfg/appdefaults.c |    8 +++++---
 programs/winecfg/driveui.c     |   12 ++++++------
 programs/winecfg/libraries.c   |    2 +-
 programs/winecfg/theme.c       |   16 ++++++++++------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 4df2a4a..847b7e6 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -70,7 +70,8 @@ static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion";
 
 static int get_registry_version(void)
 {
-    int i, best = -1, platform, major, minor = 0, build = 0;
+    int best = -1;
+    unsigned int i, platform, major, minor = 0, build = 0 ;
     char *p, *ver;
 
     if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL )))
@@ -115,7 +116,8 @@ static int get_registry_version(void)
 
 static void update_comboboxes(HWND dialog)
 {
-    int i, ver;
+    int ver;
+    unsigned int i;
     char *winver;
 
     /* retrieve the registry values */
@@ -155,7 +157,7 @@ static void update_comboboxes(HWND dialog)
 static void
 init_comboboxes (HWND dialog)
 {
-    int i;
+    unsigned int i;
 
     SendDlgItemMessage(dialog, IDC_WINVER, CB_RESETCONTENT, 0, 0);
 
diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c
index de54f21..ff1927a 100644
--- a/programs/winecfg/driveui.c
+++ b/programs/winecfg/driveui.c
@@ -385,10 +385,10 @@ static void update_controls(HWND dialog)
 {
     static const WCHAR emptyW[1];
     WCHAR *path;
-    unsigned int type;
+    unsigned int j, type;
     char serial[16];
     const char *device;
-    int i, selection = -1;
+    int selection = -1, i;
     LVITEMW item;
 
     updating_ui = TRUE;
@@ -420,16 +420,16 @@ static void update_controls(HWND dialog)
     type = current_drive->type;
     SendDlgItemMessage(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0);
 
-    for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++)
+    for (j = 0; j < sizeof(type_pairs) / sizeof(struct drive_typemap); j++)
     {
         WCHAR driveDesc[64];
-        LoadStringW (GetModuleHandle (NULL), type_pairs[i].idDesc, driveDesc,
+        LoadStringW (GetModuleHandle (NULL), type_pairs[j].idDesc, driveDesc,
             sizeof(driveDesc)/sizeof(driveDesc[0]));
         SendDlgItemMessageW (dialog, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)driveDesc);
 
-        if (type_pairs[i].sCode ==  type)
+        if (type_pairs[j].sCode ==  type)
         {
-            selection = i;
+            selection = j;
         }
     }
 
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..0711629 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -465,7 +465,7 @@ static void on_add_click(HWND dialog)
     ZeroMemory(buffer, sizeof(buffer));
 
     SendDlgItemMessage(dialog, IDC_DLLCOMBO, WM_GETTEXT, sizeof(buffer), (LPARAM) buffer);
-    if (lstrlenA(buffer) >= sizeof(dotDll))
+    if (lstrlenA(buffer) >= (int)sizeof(dotDll))
     {
         ptr = buffer + lstrlenA(buffer) - sizeof(dotDll) + 1;
         if (!lstrcmpiA(ptr, dotDll))
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index afbd6de..2a0fbcc 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -547,7 +547,8 @@ static void save_sys_color(int idx, COLORREF clr)
 static void set_color_from_theme(WCHAR *keyName, COLORREF color)
 {
     char *keyNameA = NULL;
-    int keyNameSize=0, i=0;
+    int keyNameSize = 0;
+    unsigned int i = 0;
 
     keyNameSize = WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, 0, NULL, NULL);
     keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize);
@@ -763,7 +764,7 @@ static void init_shell_folder_listview_headers(HWND dialog) {
 static void read_shell_folder_link_targets(void) {
     WCHAR wszPath[MAX_PATH];
     HRESULT hr;
-    int i;
+    unsigned int i;
    
     for (i=0; i<NUM_ELEMS(asfiInfo); i++) {
         asfiInfo[i].szLinkTarget[0] = '\0';
@@ -784,7 +785,7 @@ static void read_shell_folder_link_targets(void) {
 }
 
 static void update_shell_folder_listview(HWND dialog) {
-    int i;
+    unsigned int i;
     LVITEMW item;
     LONG lSelected = SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, (WPARAM)-1, 
                                         MAKELPARAM(LVNI_SELECTED,0));
@@ -903,7 +904,8 @@ static void on_shell_folder_edit_changed(HWND hDlg) {
 static void apply_shell_folder_changes(void) {
     WCHAR wszPath[MAX_PATH];
     char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL;
-    int i, cUnixPathLen;
+    int cUnixPathLen;
+    unsigned int i;
     struct stat statPath;
     HRESULT hr;
 
@@ -961,7 +963,8 @@ static void read_sysparams(HWND hDlg)
     WCHAR buffer[256];
     HWND list = GetDlgItem(hDlg, IDC_SYSPARAM_COMBO);
     NONCLIENTMETRICSW nonclient_metrics;
-    int i, idx;
+    int idx;
+    unsigned int i;
 
     for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++)
     {
@@ -992,7 +995,8 @@ static void read_sysparams(HWND hDlg)
 static void apply_sysparams(void)
 {
     NONCLIENTMETRICSW nonclient_metrics;
-    int i, cnt = 0;
+    int cnt = 0;
+    unsigned int i;
     int colors_idx[sizeof(metrics) / sizeof(metrics[0])];
     COLORREF colors[sizeof(metrics) / sizeof(metrics[0])];
 
-- 
1.5.4.3