diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index a78a00c60b7..7f74b36dccc 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 090fe27ab51..bab87ccabf7 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 */