diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 7bd6658740a..9d7f1735bca 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = comctl32.dll IMPORTS = comctl32 ole32 shlwapi user32 gdi32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ comboex.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 106a80e9021..f9919ec7ab2 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -89,19 +89,19 @@ static void test_comboboxex(void) { /* Add items onto the end of the combobox */ res = addItem(myHwnd, -1, first_item); - ok(res == 0, "Adding simple item failed (%ld)\n", res); + ok(res == 0, "Adding simple item failed (%d)\n", res); res = addItem(myHwnd, -1, second_item); - ok(res == 1, "Adding simple item failed (%ld)\n", res); + ok(res == 1, "Adding simple item failed (%d)\n", res); res = addItem(myHwnd, 2, third_item); - ok(res == 2, "Adding simple item failed (%ld)\n", res); + ok(res == 2, "Adding simple item failed (%d)\n", res); res = addItem(myHwnd, 1, middle_item); - ok(res == 1, "Inserting simple item failed (%ld)\n", res); + ok(res == 1, "Inserting simple item failed (%d)\n", res); /* Add an item completely out of range */ res = addItem(myHwnd, 99, out_of_range_item); - ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); + ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); res = addItem(myHwnd, 5, out_of_range_item); - ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); + ok(res == -1, "Adding using out of range index worked unexpectedly (%d)\n", res); /* Removed: Causes traps on Windows XP res = addItem(myHwnd, -2, "Out Of Range Item"); ok(res == -1, "Adding out of range worked unexpectedly (%ld)\n", res); @@ -109,62 +109,62 @@ static void test_comboboxex(void) { /* Get an item completely out of range */ res = getItem(myHwnd, 99, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); res = getItem(myHwnd, 4, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); res = getItem(myHwnd, -2, &cbexItem); - ok(res == 0, "Getting item using out of range index worked unexpectedly (%ld, %s)\n", res, cbexItem.pszText); + ok(res == 0, "Getting item using out of range index worked unexpectedly (%d, %s)\n", res, cbexItem.pszText); /* Get an item in range */ res = getItem(myHwnd, 0, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); ok(strcmp(first_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 1, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); ok(strcmp(middle_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 2, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); ok(strcmp(second_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 3, &cbexItem); - ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); + ok(res != 0, "Getting item using valid index failed unexpectedly (%d)\n", res); ok(strcmp(third_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); /* Set an item completely out of range */ res = setItem(myHwnd, 99, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); res = setItem(myHwnd, 4, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); res = setItem(myHwnd, -2, replacement_item); - ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); + ok(res == 0, "Setting item using out of range index worked unexpectedly (%d)\n", res); /* Set an item in range */ res = setItem(myHwnd, 0, replacement_item); - ok(res != 0, "Setting first item failed (%ld)\n", res); + ok(res != 0, "Setting first item failed (%d)\n", res); res = setItem(myHwnd, 3, replacement_item); - ok(res != 0, "Setting last item failed (%ld)\n", res); + ok(res != 0, "Setting last item failed (%d)\n", res); /* Remove items completely out of range (4 items in control at this point) */ res = delItem(myHwnd, -1); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); res = delItem(myHwnd, 4); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); /* Remove items in range (4 items in control at this point) */ res = delItem(myHwnd, 3); - ok(res == 3, "Deleting using out of range index failed (%ld)\n", res); + ok(res == 3, "Deleting using out of range index failed (%d)\n", res); res = delItem(myHwnd, 0); - ok(res == 2, "Deleting using out of range index failed (%ld)\n", res); + ok(res == 2, "Deleting using out of range index failed (%d)\n", res); res = delItem(myHwnd, 0); - ok(res == 1, "Deleting using out of range index failed (%ld)\n", res); + ok(res == 1, "Deleting using out of range index failed (%d)\n", res); res = delItem(myHwnd, 0); - ok(res == 0, "Deleting using out of range index failed (%ld)\n", res); + ok(res == 0, "Deleting using out of range index failed (%d)\n", res); /* Remove from an empty box */ res = delItem(myHwnd, 0); - ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%ld)\n", res); + ok(res == CB_ERR, "Deleting using out of range index worked unexpectedly (%d)\n", res); /* Cleanup */ diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index a0430c10602..c05aecbe4c4 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -141,9 +141,9 @@ static HRESULT CALLBACK CB_Save(LPITEMDATA pInfo, IStream *pStm, LPARAM lp) ok(lp == 0xdeadbeef, "lp=%ld\n", lp); hRes = IStream_Write(pStm, &pInfo->iPos, sizeof(INT), NULL); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); hRes = IStream_Write(pStm, &pInfo->pvData, sizeof(PVOID), NULL); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); return S_OK; } @@ -155,10 +155,10 @@ static HRESULT CALLBACK CB_Load(LPITEMDATA pInfo, IStream *pStm, LPARAM lp) iOldPos = pInfo->iPos; ok(lp == 0xdeadbeef, "lp=%ld\n", lp); hRes = IStream_Read(pStm, &pInfo->iPos, sizeof(INT), NULL); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); ok(pInfo->iPos == iOldPos, "iPos=%d iOldPos=%d\n", pInfo->iPos, iOldPos); hRes = IStream_Read(pStm, &pInfo->pvData, sizeof(PVOID), NULL); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); return S_OK; } @@ -205,12 +205,12 @@ static void test_dpa(void) GetSystemInfo(&si); hHeap = HeapCreate(0, 1, 2); - ok(hHeap != NULL, "error=%ld\n", GetLastError()); + ok(hHeap != NULL, "error=%d\n", GetLastError()); dpa3 = pDPA_CreateEx(0, hHeap); ok(dpa3 != NULL, "\n"); ret = pDPA_Grow(dpa3, si.dwPageSize + 1); todo_wine ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, - "ret=%d error=%ld\n", ret, GetLastError()); + "ret=%d error=%d\n", ret, GetLastError()); dpa = pDPA_Create(0); ok(dpa != NULL, "\n"); @@ -219,7 +219,7 @@ static void test_dpa(void) ok(pDPA_SetPtr(dpa, 1, (PVOID)6), "\n"); /* Fill the greated gap */ ok(pDPA_SetPtr(dpa, 0, (PVOID)5), "\n"); - ok(CheckDPA(dpa, 0x56, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x56, &dw), "dw=0x%x\n", dw); /* Prepend item */ ret = pDPA_InsertPtr(dpa, 1, (PVOID)1); @@ -234,7 +234,7 @@ static void test_dpa(void) ret = pDPA_InsertPtr(dpa, DPA_APPEND, (PVOID)4); ok(ret == 5, "ret=%d\n", ret); - ok(CheckDPA(dpa, 0x516324, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x516324, &dw), "dw=0x%x\n", dw); for(i = 1; i <= 6; i++) { @@ -247,24 +247,24 @@ static void test_dpa(void) /* Sort DPA */ ok(pDPA_Sort(dpa, CB_CmpGT, 0xdeadbeef), "\n"); - ok(CheckDPA(dpa, 0x654321, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x654321, &dw), "dw=0x%x\n", dw); /* Clone into a new DPA */ dpa2 = pDPA_Clone(dpa, NULL); ok(dpa2 != NULL, "\n"); /* The old data should have been preserved */ - ok(CheckDPA(dpa2, 0x654321, &dw2), "dw=0x%lx\n", dw2); + ok(CheckDPA(dpa2, 0x654321, &dw2), "dw=0x%x\n", dw2); ok(pDPA_Sort(dpa, CB_CmpLT, 0xdeadbeef), "\n"); /* Test if the DPA itself was really copied */ - ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%lx\n", dw ); - ok(CheckDPA(dpa2, 0x654321, &dw2), "dw2=0x%lx\n", dw2); + ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw ); + ok(CheckDPA(dpa2, 0x654321, &dw2), "dw2=0x%x\n", dw2); /* Clone into an old DPA */ p = NULL; SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); - ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%lx\n", dw3); + ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%x\n", dw3); for(i = 1; i <= 6; i++) { @@ -297,7 +297,7 @@ static void test_dpa(void) /* Delete the third item */ p = pDPA_DeletePtr(dpa, 2); ok(p == (PVOID)3, "p=%p\n", p); - ok(CheckDPA(dpa, 0x12456, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x12456, &dw), "dw=0x%x\n", dw); /* Check where to re-insert the deleted item */ i = pDPA_Search(dpa, (PVOID)3, 0, @@ -315,7 +315,7 @@ static void test_dpa(void) /* Re-insert the item */ ret = pDPA_InsertPtr(dpa, 2, (PVOID)3); ok(ret == 2, "ret=%d i=%d\n", ret, 2); - ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw); /* When doing a binary search while claiming reverse order all indexes * should be bogus */ @@ -332,12 +332,12 @@ static void test_dpa(void) p = pDPA_DeletePtr(dpa, 1); p = pDPA_DeletePtr(dpa, 2); p = pDPA_DeletePtr(dpa, 3); - ok(CheckDPA(dpa, 0x135, &dw), "dw=0x%lx\n", dw); + ok(CheckDPA(dpa, 0x135, &dw), "dw=0x%x\n", dw); /* Delete all odd entries from dpa2 */ pDPA_Merge(dpa2, dpa, DPAM_DELETE, CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); - todo_wine ok(CheckDPA(dpa2, 0x246, &dw2), "dw=0x%lx\n", dw2); + todo_wine ok(CheckDPA(dpa2, 0x246, &dw2), "dw=0x%x\n", dw2); /* Merge dpa3 into dpa2 and dpa */ pDPA_Merge(dpa, dpa3, DPAM_INSERT|DPAM_NOSORT, @@ -345,16 +345,16 @@ static void test_dpa(void) pDPA_Merge(dpa2, dpa3, DPAM_INSERT|DPAM_NOSORT, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - ok(CheckDPA(dpa, 0x123456, &dw ), "dw=0x%lx\n", dw); - ok(CheckDPA(dpa2, 0x123456, &dw2), "dw2=0x%lx\n", dw2); - ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%lx\n", dw3); + ok(CheckDPA(dpa, 0x123456, &dw ), "dw=0x%x\n", dw); + ok(CheckDPA(dpa2, 0x123456, &dw2), "dw2=0x%x\n", dw2); + ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%x\n", dw3); } if(pDPA_EnumCallback) { nEnum = 0; pDPA_EnumCallback(dpa2, CB_EnumFirstThree, (PVOID)dpa2); - ok(CheckDPA(dpa2, 0x777456, &dw2), "dw=0x%lx\n", dw2); + ok(CheckDPA(dpa2, 0x777456, &dw2), "dw=0x%x\n", dw2); ok(nEnum == 3, "nEnum=%d\n", nEnum); } @@ -364,7 +364,7 @@ static void test_dpa(void) ok(ret == 0x12345, "ret=%d\n", ret); pDPA_DeleteAllPtrs(dpa2); - ok(CheckDPA(dpa2, 0, &dw2), "dw2=0x%lx\n", dw2); + ok(CheckDPA(dpa2, 0, &dw2), "dw2=0x%x\n", dw2); pDPA_Destroy(dpa2); if(pDPA_DestroyCallback) @@ -390,20 +390,20 @@ static void test_dpa(void) dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); hRes = pDPA_SaveStream(dpa, CB_Save, pStm, 0xdeadbeef); - todo_wine ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); pDPA_Destroy(dpa); hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); - ok(hRes == S_OK, "hRes=0x%lx\n", hRes); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, 0xdeadbeef); - todo_wine ok(hRes == S_OK, "hRes=0x%lx\n", hRes); - todo_wine ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%lx\n", dw); + todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); + todo_wine ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw); pDPA_Destroy(dpa); ret = IStream_Release(pStm); @@ -414,7 +414,7 @@ static void test_dpa(void) CoUninitialize(); } - else ok(0, "hResult: %ld\n", hRes); + else ok(0, "hResult: %d\n", hRes); skip_stream_tests: pDPA_Destroy(dpa); @@ -428,7 +428,7 @@ START_TEST(dpa) if(!hcomctl32) { - ok(0, "error=%ld\n", GetLastError()); + ok(0, "error=%d\n", GetLastError()); return; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 7805f79f347..4ef32d08531 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -207,13 +207,13 @@ static const WCHAR pszUniTestW[] = {'T','S','T',0}; #define TEST_GET_ITEM(i,c)\ { res = getItem(hWndHeader, i, buffer);\ - ok(res != 0, "Getting item[%d] using valid index failed unexpectedly (%ld)\n", i, res);\ + ok(res != 0, "Getting item[%d] using valid index failed unexpectedly (%d)\n", i, res);\ ok(strcmp(str_items[c], buffer) == 0, "Getting item[%d] returned \"%s\" expecting \"%s\"\n", i, buffer, str_items[c]);\ } #define TEST_GET_ITEMCOUNT(i)\ { res = getItemCount(hWndHeader);\ - ok(res == i, "Got Item Count as %ld\n", res);\ + ok(res == i, "Got Item Count as %d\n", res);\ } static void check_auto_format(void) @@ -275,7 +275,7 @@ static void check_auto_fields(void) HDITEMA hdiCreate; HDITEMA hdiRead; static CHAR text[] = "Test"; - LRESULT res; + LONG res; /* Windows stores the format, width, lparam even if they are not in the item's mask */ ZeroMemory(&hdiCreate, sizeof(HDITEMA)); @@ -390,25 +390,25 @@ static void test_header_control (void) { TEST_GET_ITEMCOUNT(3-i); res = addItem(hWndHeader, 0, str_items[i]); - ok(res == 0, "Adding simple item failed (%ld)\n", res); + ok(res == 0, "Adding simple item failed (%d)\n", res); } TEST_GET_ITEMCOUNT(4); res = addItem(hWndHeader, 99, str_items[i+1]); - ok(res != -1, "Adding Out of Range item should fail with -1 got (%ld)\n", res); + ok(res != -1, "Adding Out of Range item should fail with -1 got (%d)\n", res); TEST_GET_ITEMCOUNT(5); res = addItem(hWndHeader, 5, str_items[i+1]); - ok(res != -1, "Adding Out of Range item should fail with -1 got (%ld)\n", res); + ok(res != -1, "Adding Out of Range item should fail with -1 got (%d)\n", res); TEST_GET_ITEMCOUNT(6); for (i = 0; i < 4; i++) { TEST_GET_ITEM(i,i); TEST_GET_ITEMCOUNT(6); } res=getItem(hWndHeader, 99, buffer); - ok(res == 0, "Getting Out of Range item should fail with 0 (%ld), got %s\n", res,buffer); + ok(res == 0, "Getting Out of Range item should fail with 0 (%d), got %s\n", res,buffer); res=getItem(hWndHeader, 5, buffer); - ok(res == 1, "Getting Out of Range item should fail with 1 (%ld), got %s\n", res,buffer); + ok(res == 1, "Getting Out of Range item should fail with 1 (%d), got %s\n", res,buffer); res=getItem(hWndHeader, -2, buffer); - ok(res == 0, "Getting Out of Range item should fail with 0 (%ld), got %s\n", res,buffer); + ok(res == 0, "Getting Out of Range item should fail with 0 (%d), got %s\n", res,buffer); if (winetest_interactive) { @@ -418,17 +418,17 @@ static void test_header_control (void) TEST_GET_ITEMCOUNT(6); res=setItem(hWndHeader, 99, str_items[5], FALSE); - ok(res == 0, "Setting Out of Range item should fail with 0 (%ld)\n", res); + ok(res == 0, "Setting Out of Range item should fail with 0 (%d)\n", res); res=setItem(hWndHeader, 5, str_items[5], TRUE); - ok(res == 1, "Setting Out of Range item should fail with 1 (%ld)\n", res); + ok(res == 1, "Setting Out of Range item should fail with 1 (%d)\n", res); res=setItem(hWndHeader, -2, str_items[5], FALSE); - ok(res == 0, "Setting Out of Range item should fail with 0 (%ld)\n", res); + ok(res == 0, "Setting Out of Range item should fail with 0 (%d)\n", res); TEST_GET_ITEMCOUNT(6); for (i = 0; i < 4; i++) { res = setItem(hWndHeader, i, str_items[4], TRUE); - ok(res != 0, "Setting %d item failed (%ld)\n", i+1, res); + ok(res != 0, "Setting %d item failed (%d)\n", i+1, res); TEST_GET_ITEM(i, 4); TEST_GET_ITEMCOUNT(6); } @@ -457,22 +457,22 @@ static void test_header_control (void) TEST_GET_ITEMCOUNT(6); res = delItem(hWndHeader, 5); - ok(res == 1, "Deleting Out of Range item should fail with 1 (%ld)\n", res); + ok(res == 1, "Deleting Out of Range item should fail with 1 (%d)\n", res); res = delItem(hWndHeader, -2); - ok(res == 0, "Deleting Out of Range item should fail with 0 (%ld)\n", res); + ok(res == 0, "Deleting Out of Range item should fail with 0 (%d)\n", res); TEST_GET_ITEMCOUNT(5); res = delItem(hWndHeader, 3); - ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + ok(res != 0, "Deleting using out of range index failed (%d)\n", res); TEST_GET_ITEMCOUNT(4); res = delItem(hWndHeader, 0); - ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + ok(res != 0, "Deleting using out of range index failed (%d)\n", res); TEST_GET_ITEMCOUNT(3); res = delItem(hWndHeader, 0); - ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + ok(res != 0, "Deleting using out of range index failed (%d)\n", res); TEST_GET_ITEMCOUNT(2); res = delItem(hWndHeader, 0); - ok(res != 0, "Deleting using out of range index failed (%ld)\n", res); + ok(res != 0, "Deleting using out of range index failed (%d)\n", res); TEST_GET_ITEMCOUNT(1); DestroyWindow(hWndHeader); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 6278adc1251..16741d7311f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -264,7 +264,7 @@ static void testHotspot (void) /* check new hotspot, it should be the same like the old one */ himlNew = ImageList_GetDragImage(NULL, &ppt); ok(ppt.x == dx1 && ppt.y == dy1, - "Expected drag hotspot [%d,%d] got [%ld,%ld]\n", + "Expected drag hotspot [%d,%d] got [%d,%d]\n", dx1, dy1, ppt.x, ppt.y); /* check size of new dragged image */ ImageList_GetIconSize(himlNew, &newx, &newy); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5d166e0d3f9..2bfca02b21c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -113,7 +113,7 @@ static void test_checkboxes(void) item.iSubItem = 0; item.pszText = text; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); - ok(r == 0, "ret %ld\n", r); + ok(r == 0, "ret %d\n", r); item.iItem = 0; item.mask = LVIF_STATE; @@ -129,7 +129,7 @@ static void test_checkboxes(void) item.iSubItem = 0; item.pszText = text; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); - ok(r == 1, "ret %ld\n", r); + ok(r == 1, "ret %d\n", r); item.iItem = 1; item.mask = LVIF_STATE; @@ -153,7 +153,7 @@ static void test_checkboxes(void) item.state = 0; item.pszText = text2; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); - ok(r == 2, "ret %ld\n", r); + ok(r == 2, "ret %d\n", r); item.iItem = 2; item.mask = LVIF_STATE; @@ -168,7 +168,7 @@ static void test_checkboxes(void) item.state = 0x2aaa; item.pszText = text3; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); - ok(r == 3, "ret %ld\n", r); + ok(r == 3, "ret %d\n", r); item.iItem = 3; item.mask = LVIF_STATE; @@ -201,7 +201,7 @@ static void test_checkboxes(void) /* Set the style again and check that doesn't change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); - ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r); + ok(r == LVS_EX_CHECKBOXES, "ret %x\n", r); item.iItem = 3; item.mask = LVIF_STATE; @@ -211,7 +211,7 @@ static void test_checkboxes(void) /* Unsetting the checkbox extended style doesn't change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, 0); - ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r); + ok(r == LVS_EX_CHECKBOXES, "ret %x\n", r); item.iItem = 3; item.mask = LVIF_STATE; @@ -221,7 +221,7 @@ static void test_checkboxes(void) /* Now setting the style again will change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); - ok(r == 0, "ret %lx\n", r); + ok(r == 0, "ret %x\n", r); item.iItem = 3; item.mask = LVIF_STATE; diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 5b51736ab39..a58f4cc5301 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -111,7 +111,7 @@ static void check_reg_entries(const char *mrulist, const char**items) buff[0] = '\0'; ret = RegQueryValueExA(hKey, "MRUList", NULL, &type, (LPBYTE)buff, &size); - ok(!ret && buff[0], "Checking MRU: got %ld from RegQueryValueExW\n", ret); + ok(!ret && buff[0], "Checking MRU: got %d from RegQueryValueExW\n", ret); if(ret || !buff[0]) return; ok(strcmp(buff, mrulist) == 0, "Checking MRU: Expected list %s, got %s\n", @@ -128,7 +128,7 @@ static void check_reg_entries(const char *mrulist, const char**items) buff[0] = '\0'; ret = RegQueryValueExA(hKey, name, NULL, &type, (LPBYTE)buff, &size); ok(!ret && buff[0], - "Checking MRU item %d ('%c'): got %ld from RegQueryValueExW\n", + "Checking MRU item %d ('%c'): got %d from RegQueryValueExW\n", i, mrulist[i], ret); if(ret || !buff[0]) return; ok(!strcmp(buff, items[mrulist[i]-'a']), @@ -173,7 +173,7 @@ static void test_MRUListA(void) mruA.cbSize = sizeof(mruA) - 2; hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); ok (!hMRU && !GetLastError(), - "CreateMRUListA(too small) expected NULL,0 got %p,%ld\n", + "CreateMRUListA(too small) expected NULL,0 got %p,%d\n", hMRU, GetLastError()); mruA.cbSize = sizeof(mruA); @@ -181,21 +181,21 @@ static void test_MRUListA(void) mruA.cbSize = sizeof(mruA) + 2; hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); ok (!hMRU && !GetLastError(), - "CreateMRUListA(too big) expected NULL,0 got %p,%ld\n", + "CreateMRUListA(too big) expected NULL,0 got %p,%d\n", hMRU, GetLastError()); mruA.cbSize = sizeof(mruA); /* Create (NULL hKey) */ hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); ok (!hMRU && !GetLastError(), - "CreateMRUListA(NULL key) expected NULL,0 got %p,%ld\n", + "CreateMRUListA(NULL key) expected NULL,0 got %p,%d\n", hMRU, GetLastError()); /* Create (NULL name) */ mruA.lpszSubKey = NULL; hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); ok (!hMRU && !GetLastError(), - "CreateMRUListA(NULL name) expected NULL,0 got %p,%ld\n", + "CreateMRUListA(NULL name) expected NULL,0 got %p,%d\n", hMRU, GetLastError()); mruA.lpszSubKey = REG_TEST_SUBKEYA; @@ -206,7 +206,7 @@ static void test_MRUListA(void) return; hMRU = create_mruA(hKey, MRUF_STRING_LIST, cmp_mru_strA); ok(hMRU && !GetLastError(), - "CreateMRUListA(string) expected non-NULL,0 got %p,%ld\n", + "CreateMRUListA(string) expected non-NULL,0 got %p,%d\n", hMRU, GetLastError()); if (hMRU) @@ -220,7 +220,7 @@ static void test_MRUListA(void) SetLastError(0); iRet = pAddMRUStringA(NULL, checks[0]); ok(iRet == -1 && !GetLastError(), - "AddMRUStringA(NULL list) expected -1,0 got %d,%ld\n", + "AddMRUStringA(NULL list) expected -1,0 got %d,%d\n", iRet, GetLastError()); /* Add (NULL string) */ @@ -237,21 +237,21 @@ static void test_MRUListA(void) SetLastError(0); iRet = pAddMRUStringA(hMRU, checks[0]); ok(iRet == 0 && !GetLastError(), - "AddMRUStringA(1) expected 0,0 got %d,%ld\n", + "AddMRUStringA(1) expected 0,0 got %d,%d\n", iRet, GetLastError()); check_reg_entries("a", checks); SetLastError(0); iRet = pAddMRUStringA(hMRU, checks[1]); ok(iRet == 1 && !GetLastError(), - "AddMRUStringA(2) expected 1,0 got %d,%ld\n", + "AddMRUStringA(2) expected 1,0 got %d,%d\n", iRet, GetLastError()); check_reg_entries("ba", checks); SetLastError(0); iRet = pAddMRUStringA(hMRU, checks[2]); ok(iRet == 2 && !GetLastError(), - "AddMRUStringA(2) expected 2,0 got %d,%ld\n", + "AddMRUStringA(2) expected 2,0 got %d,%d\n", iRet, GetLastError()); check_reg_entries("cba", checks); @@ -261,7 +261,7 @@ static void test_MRUListA(void) SetLastError(0); iRet = pAddMRUStringA(hMRU, checks[1]); ok(iRet == 1 && !GetLastError(), - "AddMRUStringA(re-add 1) expected 1,0 got %d,%ld\n", + "AddMRUStringA(re-add 1) expected 1,0 got %d,%d\n", iRet, GetLastError()); check_reg_entries("bca", checks); @@ -269,7 +269,7 @@ static void test_MRUListA(void) SetLastError(0); iRet = pAddMRUStringA(hMRU, checks[3]); ok(iRet == 0 && !GetLastError(), - "AddMRUStringA(add new) expected 0,0 got %d,%ld\n", + "AddMRUStringA(add new) expected 0,0 got %d,%d\n", iRet, GetLastError()); checks[0] = checks[3]; check_reg_entries("abc", checks); diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 9d801c98c0c..bd0f8afe52e 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -175,7 +175,7 @@ static void test_redraw(void) SendMessage(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); update_window(hProgressWnd); @@ -187,7 +187,7 @@ static void test_redraw(void) SendMessage(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %ld, %ld, %ld, %ld } instead of { %ld, %ld, %ld, %ld }\n", + "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); update_window(hProgressWnd); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index d5901c09eda..5960964fd3f 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -39,15 +39,15 @@ #define CheckSize(hwnd,width,height,msg)\ SendMessage (hwnd, TCM_GETITEMRECT, 0, (LPARAM) &rTab);\ if ((width >= 0) && (height < 0))\ - ok (width == rTab.right - rTab.left, "%s: Expected width [%d] got [%ld]\n",\ + ok (width == rTab.right - rTab.left, "%s: Expected width [%d] got [%d]\n",\ msg, (int)width, rTab.right - rTab.left);\ else if ((height >= 0) && (width < 0))\ - ok (height == rTab.bottom - rTab.top, "%s: Expected height [%d] got [%ld]\n",\ + ok (height == rTab.bottom - rTab.top, "%s: Expected height [%d] got [%d]\n",\ msg, (int)height, rTab.bottom - rTab.top);\ else\ ok ((width == rTab.right - rTab.left) &&\ (height == rTab.bottom - rTab.top ),\ - "%s: Expected [%d,%d] got [%ld,%ld]\n", msg, (int)width, (int)height,\ + "%s: Expected [%d,%d] got [%d,%d]\n", msg, (int)width, (int)height,\ rTab.right - rTab.left, rTab.bottom - rTab.top); static HFONT hFont = 0; @@ -110,7 +110,7 @@ static void test_tab(INT nMinTabWidth) hdc = GetDC(hwTab); hOldFont = SelectObject(hdc, (HFONT)SendMessage(hwTab, WM_GETFONT, 0, 0)); GetTextExtentPoint32A(hdc, "Tab 1", strlen("Tab 1"), &size); - trace("Tab1 text size: size.cx=%ld size.cy=%ld\n", size.cx, size.cy); + trace("Tab1 text size: size.cx=%d size.cy=%d\n", size.cx, size.cy); SelectObject(hdc, hOldFont); ReleaseDC(hwTab, hdc); diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7f324713d38..713fa240368 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -38,10 +38,10 @@ static void test_create_tooltip(void) assert(hwnd); style = GetWindowLong(hwnd, GWL_STYLE); - trace("style = %08lx\n", style); + trace("style = %08x\n", style); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); - ok(style == exp_style,"wrong style %08lx/%08lx\n", style, exp_style); + ok(style == exp_style,"wrong style %08x/%08x\n", style, exp_style); DestroyWindow(hwnd); @@ -51,9 +51,9 @@ static void test_create_tooltip(void) assert(hwnd); style = GetWindowLong(hwnd, GWL_STYLE); - trace("style = %08lx\n", style); + trace("style = %08x\n", style); ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), - "wrong style %08lx\n", style); + "wrong style %08x\n", style); DestroyWindow(hwnd);