comctl32/tests: Preparation for switching __WINESRC__ on.

dlls/comctl32/tests/imagelist.c

@@ -867,7 +867,7 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment
     FillRect(hdc, &rc, hbrush);
     DeleteObject(hbrush);
 
-    DrawText(hdc, comment, -1, &rc, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+    DrawTextA(hdc, comment, -1, &rc, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
 
     SelectObject(hdc, hbmp_old);
     DeleteDC(hdc);
@@ -2064,7 +2064,7 @@ START_TEST(imagelist)
     ULONG_PTR ctx_cookie;
     HANDLE hCtx;
 
-    HMODULE hComCtl32 = GetModuleHandle("comctl32.dll");
+    HMODULE hComCtl32 = GetModuleHandleA("comctl32.dll");
     pImageList_Create = NULL;   /* These are not needed for non-v6.0 tests*/
     pImageList_Add = NULL;
     pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect");

dlls/comctl32/tests/ipaddress.c

@@ -29,9 +29,9 @@ static HWND create_ipaddress_control (void)
 {
     HWND handle;
 
-    handle = CreateWindowEx(0, WC_IPADDRESS, NULL,
-			    WS_BORDER|WS_VISIBLE, 0, 0, 0, 0,
-			    NULL, NULL, NULL, NULL);
+    handle = CreateWindowExA(0, WC_IPADDRESSA, NULL,
+			     WS_BORDER|WS_VISIBLE, 0, 0, 0, 0,
+			     NULL, NULL, NULL, NULL);
     return handle;
 }
 
@@ -49,12 +49,12 @@ static void test_get_set_text(void)
     }
 
     /* check text just after creation */
-    r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR));
+    r = GetWindowTextA(hwnd, ip, sizeof(ip)/sizeof(CHAR));
     expect(7, r);
     ok(strcmp(ip, "0.0.0.0") == 0, "Expected null IP address, got %s\n", ip);
 
-    SendMessage(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(127, 0, 0, 1));
-    r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR));
+    SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(127, 0, 0, 1));
+    r = GetWindowTextA(hwnd, ip, sizeof(ip)/sizeof(CHAR));
     expect(9, r);
     ok(strcmp(ip, "127.0.0.1") == 0, "Expected 127.0.0.1, got %s\n", ip);
 

dlls/comctl32/tests/misc.c

@@ -102,8 +102,8 @@ static void test_GetPtrAW(void)
         ok (count == sourcelen ||
             broken(count == 0), /* win9x */
             "Expected count to be %d, it was %d\n", sourcelen, count);
-        ok (!lstrcmp(dest, desttest) ||
-            broken(!lstrcmp(dest, "")), /* Win7 */
+        ok (!lstrcmpA(dest, desttest) ||
+            broken(!lstrcmpA(dest, "")), /* Win7 */
             "Expected destination to not have changed\n");
 
         count = pStr_GetPtrA(source, NULL, destsize);
@@ -115,7 +115,7 @@ static void test_GetPtrAW(void)
         ok (count == sourcelen ||
             broken(count == sourcelen - 1), /* win9x */
             "Expected count to be %d, it was %d\n", sourcelen, count);
-        ok (!lstrcmp(source, dest), "Expected source and destination to be the same\n");
+        ok (!lstrcmpA(source, dest), "Expected source and destination to be the same\n");
 
         strcpy(dest, desttest);
         count = pStr_GetPtrA(NULL, dest, destsize);