From: Esme Povirk esme@codeweavers.com
--- dlls/comctl32/tests/button.c | 18 ------------------ dlls/comctl32/tests/combo.c | 4 ---- dlls/comctl32/tests/edit.c | 4 ---- dlls/comctl32/tests/listbox.c | 4 ---- dlls/comctl32/tests/progress.c | 4 ---- dlls/comctl32/tests/static.c | 4 ---- dlls/comctl32/tests/status.c | 3 --- dlls/comctl32/tests/tab.c | 15 --------------- dlls/comctl32/tests/toolbar.c | 4 ---- 9 files changed, 60 deletions(-)
diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 676062f0132..ff5d1ba388f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2445,23 +2445,6 @@ static void test_visual(void) DestroyWindow(parent); }
-static void test_getobject(void) -{ - HWND hwnd; - LONG idx; - - hwnd = create_button(BS_PUSHBUTTON, NULL); - - idx = SendMessageA(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10002, "Expect idx 0x%08x, got 0x%08lx\n", 0x10002, idx); - - /* Check with upper 32 bits truncated */ - idx = SendMessageA(hwnd, WM_GETOBJECT, 0, (DWORD)OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10002, "Expect idx 0x%08x, got 0x%08lx\n", 0x10002, idx); - - DestroyWindow(hwnd); -} - static void test_radiobutton_focus(void) { HWND hwnd, button; @@ -2618,7 +2601,6 @@ START_TEST(button) test_bcm_get_ideal_size(); test_style(); test_visual(); - test_getobject(); test_radiobutton_focus();
uninit_winevent_hook(); diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index ddb3eb4d78a..0ba720a03ce 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1236,13 +1236,9 @@ static void test_combo_WS_VSCROLL(void) COMBOBOXINFO info; DWORD style; int i; - DWORD idx;
hCombo = create_combobox(CBS_DROPDOWNLIST);
- idx = SendMessageA(hCombo, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10005, "Got index 0x%08lx\n", idx); - get_combobox_info(hCombo, &info); hList = info.hwndList;
diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index d0a9d1901a4..7e106662bb5 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -768,7 +768,6 @@ static void test_edit_control_1(void) MSG msMessage; int i; LONG r; - DWORD idx;
msMessage.message = WM_KEYDOWN;
@@ -777,9 +776,6 @@ static void test_edit_control_1(void) r = get_edit_style(hwEdit); ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL), "Wrong style expected 0xc0 got: 0x%lx\n", r);
- idx = SendMessageA(hwEdit, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10004, "Got index 0x%08lx\n", idx); - for (i = 0; i < 65535; i++) { msMessage.wParam = i; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index a52268ed586..8a9db99f386 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -372,7 +372,6 @@ static void test_item_height(void) HFONT font; HWND hLB; HDC hdc; - DWORD idx;
hLB = create_listbox (0, 0); ok ((hdc = GetDCEx( hLB, 0, DCX_CACHE )) != 0, "Can't get hdc\n"); @@ -380,9 +379,6 @@ static void test_item_height(void) ok (GetTextMetricsA( hdc, &tm ), "Can't read font metrics\n"); ReleaseDC( hLB, hdc);
- idx = SendMessageA(hLB, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10000, "Got index 0x%08lx\n", idx); - ok (SendMessageA(hLB, WM_SETFONT, (WPARAM)font, 0) == 0, "Can't set font\n");
itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 77517a194b3..f228ac84d2e 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -269,13 +269,9 @@ static void test_setcolors(void) { HWND progress; COLORREF clr; - DWORD idx;
progress = create_progress(PBS_SMOOTH);
- idx = SendMessageA(progress, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x1000d, "Got index 0x%08lx\n", idx); - clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, 0); ok(clr == CLR_DEFAULT, "got %lx\n", clr);
diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index d0c1da8818f..551aca2720f 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -135,10 +135,6 @@ static void test_set_text(void) { HWND hStatic = create_static(SS_SIMPLE); char buffA[10]; - DWORD idx; - - idx = SendMessageA(hStatic, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x10003, "Got index 0x%08lx\n", idx);
GetWindowTextA(hStatic, buffA, sizeof(buffA)); ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 272145d5772..ac24f91cbb8 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -270,9 +270,6 @@ static void test_status_control(void)
hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0);
- r = SendMessageA(hWndStatus, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - expect(0x1000b, r); - /* Divide into parts and set text */ r = SendMessageA(hWndStatus, SB_SETPARTS, 3, (LPARAM)nParts); expect(TRUE,r); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 933b4e0221a..34738b4d58c 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1620,20 +1620,6 @@ static void test_TCM_GETROWCOUNT(void) DestroyWindow(hTab); }
-static void test_WM_GETOBJECT(void) -{ - HWND hTab; - DWORD objid; - - hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 2); - ok(hTab != NULL, "Failed to create tab control\n"); - - objid = SendMessageA(hTab, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(objid == 0x1000f, "Unexpected objid %lu.\n", objid); - - DestroyWindow(hTab); -} - START_TEST(tab) { LOGFONTA logfont; @@ -1673,7 +1659,6 @@ START_TEST(tab) test_create(); test_TCN_SELCHANGING(); test_TCM_GETROWCOUNT(); - test_WM_GETOBJECT();
uninit_winevent_hook();
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1b95fdfe853..ba2720ac0b4 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -513,7 +513,6 @@ static void basic_test(void) TBBUTTON buttons[9]; HWND hToolbar; int i; - DWORD idx;
for (i=0; i<9; i++) MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); @@ -530,9 +529,6 @@ static void basic_test(void) ok(hToolbar != NULL, "Toolbar creation\n"); SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000");
- idx = SendMessageA(hToolbar, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); - ok(idx == 0x1000c, "Got index 0x%08lx\n", idx); - /* test for exclusion working inside a separator-separated :-) group */ SendMessageA(hToolbar, TB_CHECKBUTTON, 1000, 1); /* press A1 */ ok(SendMessageA(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 pressed\n");