comctl32: Sign-compare warnings fix

Andrew Talbot andrew.talbot at talbotville.com
Thu Sep 18 14:33:35 CDT 2008


Changelog:
    comctl32: Sign-compare warnings fix.

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index a78a00c..7f74b36 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -136,7 +136,7 @@ static PDOC_ITEM SYSLINK_AppendDocItem (SYSLINK_INFO *infoPtr, LPCWSTR Text, UIN
 {
     PDOC_ITEM Item;
 
-    textlen = min(textlen, lstrlenW(Text));
+    textlen = min(textlen, strlenW(Text));
     Item = Alloc(FIELD_OFFSET(DOC_ITEM, Text[textlen + 1]));
     if(Item == NULL)
     {
diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c
index 090fe27..bab87cc 100644
--- a/dlls/comctl32/theming.c
+++ b/dlls/comctl32/theming.c
@@ -113,7 +113,7 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = {
  */
 void THEMING_Initialize (void)
 {
-    int i;
+    unsigned int i;
     static const WCHAR subclassPropName[] = 
         { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 };
     static const WCHAR refDataPropName[] = 
@@ -161,7 +161,7 @@ void THEMING_Initialize (void)
  */
 void THEMING_Uninitialize (void)
 {
-    int i;
+    unsigned int i;
 
     if (!atSubclassProp) return;  /* not initialized */
 
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index d540f00..a9c625d 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1616,7 +1616,7 @@ TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, INT x, INT y)
     {
         if (GetWindowTheme (infoPtr->hwndSelf))
         {
-            DWORD oldFlags = infoPtr->flags;
+            INT oldFlags = infoPtr->flags;
             POINT pt;
             pt.x = x;
             pt.y = y;
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index dabe5d9..5d4b21c 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -1699,7 +1699,7 @@ TREEVIEW_NaturalHeight(const TREEVIEW_INFO *infoPtr)
     TEXTMETRICW tm;
     HDC hdc = GetDC(0);
     HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
-    UINT height;
+    INT height;
 
     /* Height is the maximum of:
      * 16 (a hack because our fonts are tiny), and



More information about the wine-patches mailing list