programs/regedit: sign compare fixes

Austin English austinenglish at gmail.com
Mon Jul 13 19:58:35 CDT 2009


-- 
-Austin
-------------- next part --------------
From f5ac0283ef494453335930adbf007bb46d42e162 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish at gmail.com>
Date: Mon, 13 Jul 2009 16:37:28 -0500
Subject: [PATCH] programs/regedit: sign compare fixes

---
 programs/regedit/hexedit.c  |    2 +-
 programs/regedit/listview.c |    4 ++--
 programs/regedit/regproc.c  |    3 ++-
 programs/regedit/treeview.c |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c
index 5e770c9..fa4b1f4 100644
--- a/programs/regedit/hexedit.c
+++ b/programs/regedit/hexedit.c
@@ -212,7 +212,7 @@ HexEdit_EnsureVisible(HEXEDIT_INFO *infoPtr, INT nCaretPos)
     GetScrollInfo(infoPtr->hwndSelf, SB_VERT, &si);
     if (nLine < si.nPos)
         si.nPos = nLine;
-    else if (nLine >= si.nPos + si.nPage)
+    else if ((unsigned int)nLine >= si.nPos + si.nPage)
         si.nPos = nLine - si.nPage + 1;
     else
         return;
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index 333b2a4..c67f65b 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -57,7 +57,7 @@ static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCF
 LPWSTR GetItemText(HWND hwndLV, UINT item)
 {
     LPWSTR newStr, curStr;
-    unsigned int maxLen = 128;
+    int maxLen = 128;
 
     curStr = HeapAlloc(GetProcessHeap(), 0, maxLen * sizeof(WCHAR));
     if (!curStr) return NULL;
@@ -386,7 +386,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
             OnGetDispInfo((NMLVDISPINFOW*)lParam);
             break;
         case LVN_COLUMNCLICK:
-            if (g_columnToSort == ((LPNMLISTVIEW)lParam)->iSubItem)
+            if (g_columnToSort == (DWORD)((LPNMLISTVIEW)lParam)->iSubItem)
                 g_invertSort = !g_invertSort;
             else {
                 g_columnToSort = ((LPNMLISTVIEW)lParam)->iSubItem;
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index c46edc6..7e304fd 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -289,7 +289,8 @@ static void REGPROC_unescape_string(WCHAR* str)
 static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath)
 {
     WCHAR* lpSlash = NULL;
-    unsigned int i, len;
+    unsigned int i;
+    int len;
 
     if (lpKeyName == NULL)
         return FALSE;
diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c
index e48eb5b..119310f 100644
--- a/programs/regedit/treeview.c
+++ b/programs/regedit/treeview.c
@@ -100,7 +100,7 @@ LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey)
     if (!pathBuffer) return NULL;
     *pathBuffer = 0;
     maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer);
-    if (maxLen == (SIZE_T) - 1) return NULL;
+    if ((DWORD)maxLen == (SIZE_T) - 1) return NULL;
     maxLen = maxLen / sizeof(WCHAR);
     if (!hItem) hItem = TreeView_GetSelection(hwndTV);
     if (!hItem) return NULL;
-- 
1.5.4.3


More information about the wine-patches mailing list