Skip to content

W
wine-cw
Commit 8fae3288 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

comctl32/tests: Avoid "misleading indentation" warnings.

Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 51abf02c
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
dlls/comctl32/tests/combo.c
View file @ 8fae3288
......@@ -715,7 +715,7 @@ static void test_combo_setitemheight(DWORD style)
font_height = get_font_height(hFont);
SendMessageA(hCombo, CB_SETITEMHEIGHT, -1, font_height / 2);
height = SendMessageA(hCombo, CB_GETITEMHEIGHT, -1, 0);
todo_wine
todo_wine
ok(height == font_height / 2, "Unexpected item height %d, expected %d.\n", height, font_height / 2);
SetWindowPos(hCombo, NULL, 10, 10, 150, 5 * font_height, SWP_SHOWWINDOW);
......@@ -1485,7 +1485,7 @@ static void test_comboex_CBEN_GETDISPINFO(void)
di_context.mask = 0;
res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item);
ok(res == 1, "Unexpected return value %u.\n", res);
todo_wine
todo_wine
ok(di_context.mask == CBEIF_IMAGE, "Unexpected mask %#x.\n", di_context.mask);
ok_sequence(sequences, PARENT_SEQ_INDEX, getdisp_parent_seq, "Get disp DI_SETITEM seq", TRUE);
......@@ -1504,7 +1504,7 @@ todo_wine
di_context.mask = 0;
res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item);
ok(res == 1, "Unexpected return value %u.\n", res);
todo_wine
todo_wine
ok(di_context.mask == CBEIF_INDENT, "Unexpected mask %#x.\n", di_context.mask);
di_context.set_CBEIF_DI_SETITEM = FALSE;
......
dlls/comctl32/tests/edit.c
View file @ 8fae3288
......@@ -1420,7 +1420,7 @@ static void test_edit_control_6(void)
buf[0] = 0;
ret = SendMessageA(hWnd, WM_DESTROY, 0, 0);
todo_wine
todo_wine
ok(ret == 1, "Unexpected return value %d\n", ret);
ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf);
ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret);
......
dlls/comctl32/tests/listbox.c
View file @ 8fae3288
......@@ -2626,7 +2626,7 @@ static void test_LBS_NODATA(void)
ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42);
ok(ret == TRUE, "Unexpected return value %d.\n", ret);
ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0);
todo_wine_if(is_wow64)
todo_wine_if(is_wow64)
ok(ret == text_len, "Unexpected return value %d.\n", ret);
memset(&data, 0xee, sizeof(data));
......
dlls/comctl32/tests/listview.c
View file @ 8fae3288
......@@ -1688,7 +1688,7 @@ static void test_create(BOOL is_version_6)
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
/* insert column */
......@@ -1703,7 +1703,7 @@ todo_wine_if(is_version_6)
/* LVS_REPORT without WS_VISIBLE, try to show it */
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
ShowWindow(hList, SW_SHOW);
......@@ -1722,7 +1722,7 @@ todo_wine_if(is_version_6)
/* setting LVS_EX_HEADERDRAGDROP creates header */
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP);
......@@ -1732,7 +1732,7 @@ todo_wine_if(is_version_6)
/* setting LVS_EX_GRIDLINES creates header */
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_GRIDLINES);
......@@ -1742,7 +1742,7 @@ todo_wine_if(is_version_6)
/* setting LVS_EX_FULLROWSELECT creates header */
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
TEST_HEADER_EXPECTED(hList);
......@@ -1758,7 +1758,7 @@ todo_wine_if(is_version_6)
/* requesting header info with LVM_GETSUBITEMRECT doesn't create it */
hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL,
GetModuleHandleA(NULL), 0);
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
SetRect(&rect, LVIR_BOUNDS, 1, -10, -10);
......@@ -1767,7 +1767,7 @@ todo_wine_if(is_version_6)
/* right value contains garbage, probably because header columns are not set up */
ok(rect.bottom >= 0, "Unexpected rectangle.\n");
todo_wine_if(is_version_6)
todo_wine_if(is_version_6)
TEST_NO_HEADER2(hList, is_version_6);
DestroyWindow(hList);
......@@ -3993,7 +3993,7 @@ static void test_getitemrect(void)
expect(0, rect.left);
expect(0, rect.top);
/* estimate it as width / height ratio */
todo_wine
todo_wine
ok((rect.right / rect.bottom) >= 5, "got right %d, bottom %d\n", rect.right, rect.bottom);
DestroyWindow(hwnd);
......@@ -5088,20 +5088,20 @@ static void test_approximate_viewrect(void)
/* Empty control without columns */
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, MAKELPARAM(100, 100));
todo_wine
todo_wine
ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret));
ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret));
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0);
ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret));
header_height = HIWORD(ret);
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0);
ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret));
item_height = HIWORD(ret) - header_height;
......@@ -5135,7 +5135,7 @@ todo_wine {
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0);
ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret));
item_height = HIWORD(ret) - header_height;
......@@ -5163,7 +5163,7 @@ todo_wine
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0);
ok(LOWORD(ret) >= column_width, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret));
header_height = HIWORD(ret);
......@@ -5177,7 +5177,7 @@ todo_wine
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0);
ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret));
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0);
......@@ -5194,12 +5194,12 @@ todo_wine
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(item_width * 2, 0));
ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret));
ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(-1, -1));
ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret));
todo_wine
todo_wine
ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret));
}
......@@ -6143,11 +6143,11 @@ static void test_callback_mask(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED);
todo_wine
todo_wine
ok(ret == 0, "Unexpected focused item, ret %d\n", ret);
ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0);
todo_wine
todo_wine
ok(ret == 0, "Unexpected selection mark, %d\n", ret);
ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0);
......@@ -6197,7 +6197,7 @@ todo_wine
ok(ret == -1, "Unexpected focused item, ret %d\n", ret);
ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0);
todo_wine
todo_wine
ok(ret == -1, "Unexpected selection mark, %d\n", ret);
ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0);
......
dlls/comctl32/tests/misc.c
View file @ 8fae3288
......@@ -392,14 +392,14 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno
char buff[64];
HWND hwnd;
todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6)
todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6)
ok( must_exist, "System class %s should %sexist\n", name, must_exist ? "" : "NOT " );
if (!must_exist) return;
todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6))
todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6))
ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n",
name, ~wc.style & style, wc.style, style );
todo_wine_if((!strcmp(name, "tooltips_class32") && v6) || !strcmp(name, "SysLink"))
todo_wine_if((!strcmp(name, "tooltips_class32") && v6) || !strcmp(name, "SysLink"))
ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n",
name, wc.style & ~style, wc.style, style );
ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance );
......
dlls/comctl32/tests/static.c
View file @ 8fae3288
......@@ -101,7 +101,7 @@ static void test_updates(int style, int flags)
{
HDC hdc = GetDC(hStatic);
COLORREF colour = GetPixel(hdc, 10, 10);
todo_wine
todo_wine
ok(colour == 0, "Unexpected pixel color.\n");
ReleaseDC(hStatic, hdc);
}
......
dlls/comctl32/tests/tab.c
View file @ 8fae3288
......@@ -648,18 +648,18 @@ static void test_curfocus(void)
ret = SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0);
ok(ret == 0, "Unexpected ret value %d.\n", ret);
ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0);
todo_wine
todo_wine
ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret);
/* Testing CurFocus with value larger than number of tabs */
ret = SendMessageA(hTab, TCM_SETCURSEL, 1, 0);
todo_wine
todo_wine
ok(ret == 0, "Unexpected focus index %d.\n", ret);
ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0);
ok(ret == 0, "Unexpected ret value %d.\n", ret);
ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0);
todo_wine
todo_wine
ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret);
ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "TCS_BUTTONS: set focused tab sequence", FALSE);
......@@ -1437,10 +1437,10 @@ static void test_TCN_SELCHANGING(void)
ok_sequence(sequences, PARENT_SEQ_INDEX, selchanging_parent_seq, "Focus change disallowed sequence", FALSE);
ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0);
todo_wine
todo_wine
ok(ret == nTabs - 1, "Unexpected focused tab %d.\n", ret);
ret = SendMessageA(hTab, TCM_GETCURSEL, 0, 0);
todo_wine
todo_wine
ok(ret == nTabs - 1, "Unexpected selected tab %d.\n", ret);
/* Removing focus sends only TCN_SELCHANGE */
......
dlls/comctl32/tests/toolbar.c
View file @ 8fae3288
......@@ -2132,7 +2132,7 @@ static void test_get_set_style(void)
style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0);
style2 = GetWindowLongA(hToolbar, GWL_STYLE);
todo_wine
todo_wine
ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2);
/* try to alter common window bits */
......@@ -2396,7 +2396,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void)
style = SendMessageA(hwnd, TB_GETEXTENDEDSTYLE, 0, 0);
ok(style == TBSTYLE_EX_VERTICAL, "got style 0x%08x, expected 0x%08x\n", style, TBSTYLE_EX_VERTICAL);
style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0);
todo_wine
todo_wine
ok(style == CCS_VERT, "got style 0x%08x, expected CCS_VERT\n", style);
DestroyWindow(hwnd);
......@@ -2558,33 +2558,33 @@ static void test_drawtext_flags(void)
rebuild_toolbar(&hwnd);
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0);
todo_wine
todo_wine
ok(flags == 0, "Unexpected draw text flags %#x\n", flags);
/* zero mask, flags are retained */
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM);
todo_wine
todo_wine
ok(flags == 0, "Unexpected draw text flags %#x\n", flags);
ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n");
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0);
todo_wine
todo_wine
ok(flags == 0, "Unexpected draw text flags %#x\n", flags);
ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n");
/* set/remove */
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM);
todo_wine
todo_wine
ok(flags == 0, "Unexpected draw text flags %#x\n", flags);
ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n");
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0);
todo_wine
todo_wine
ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags);
ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags);
flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0);
todo_wine
todo_wine
ok(flags == 0, "Unexpected draw text flags %#x\n", flags);
ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n");
......
dlls/comctl32/tests/tooltips.c
View file @ 8fae3288
......@@ -68,7 +68,7 @@ static void test_create_tooltip(BOOL is_v6)
exp_style = WS_POPUP | WS_CLIPSIBLINGS;
if (!is_v6)
exp_style |= WS_BORDER;
todo_wine_if(is_v6)
todo_wine_if(is_v6)
ok(style == exp_style || broken(style == (exp_style | WS_BORDER)) /* XP */,
"Unexpected window style %#x.\n", style);
......@@ -389,7 +389,7 @@ static void test_gettext(void)
toolinfoA.lpszText = bufA;
r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA);
todo_wine
todo_wine
ok(!r, "got %ld\n", r);
ok(toolinfoA.lpszText == NULL, "expected NULL, got %p\n", toolinfoA.lpszText);
......@@ -414,7 +414,7 @@ todo_wine
toolinfoA.hinst = (HINSTANCE)0xdeadbee;
r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA);
todo_wine
todo_wine
ok(!r, "got %ld\n", r);
ok(toolinfoA.hinst == NULL, "expected NULL, got %p\n", toolinfoA.hinst);
......@@ -447,7 +447,7 @@ todo_wine
memset(bufA, 0x1f, sizeof(bufA));
toolinfoA.lpszText = bufA;
r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA);
todo_wine
todo_wine
ok(!r, "got %ld\n", r);
ok(!strcmp(toolinfoA.lpszText, testtipA), "expected %s, got %p\n", testtipA, toolinfoA.lpszText);
......@@ -475,7 +475,7 @@ todo_wine
toolinfoA.lpszText = bufA;
r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA);
todo_wine
todo_wine
ok(!r, "got %ld\n", r);
ok(toolinfoA.lpszText == LPSTR_TEXTCALLBACKA, "expected LPSTR_TEXTCALLBACKA, got %p\n", toolinfoA.lpszText);
......@@ -498,7 +498,7 @@ todo_wine
r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW);
/* Wine currently checks for V3 structure size, which matches what V6 control does.
Older implementation was never updated to support lpReserved field. */
todo_wine
todo_wine
ok(!r, "Adding the tool to the tooltip succeeded!\n");
toolinfoW.hwnd = NULL;
......@@ -1144,7 +1144,7 @@ static void test_TTM_ADDTOOL(BOOL is_v6)
GetClientRect(hwnd, &tiW.rect);
ret = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&tiW);
todo_wine_if(!is_v6 && size > max_size)
todo_wine_if(!is_v6 && size > max_size)
ok(size <= max_size ? ret : !ret, "%d: Unexpected ret value %d, size %d, max size %d.\n", is_v6, ret, size, max_size);
if (ret)
{
......
dlls/comctl32/tests/treeview.c
View file @ 8fae3288
......@@ -2268,7 +2268,7 @@ static void test_cchildren(void)
/* check cChildren */
ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item);
expect(TRUE, ret);
todo_wine
todo_wine
expect(1, item.cChildren);
DestroyWindow(hTree);
......@@ -2832,7 +2832,7 @@ static void test_TVM_SORTCHILDREN(void)
/* with NULL item nothing is sorted */
fill_treeview_sort_test(hwnd);
ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, 0);
todo_wine
todo_wine
ok(ret, "Unexpected ret value %d\n", ret);
get_item_names_string(hwnd, NULL, buff);
ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order);
......@@ -2840,7 +2840,7 @@ todo_wine
/* TVI_ROOT as item */
fill_treeview_sort_test(hwnd);
ret = SendMessageA(hwnd, TVM_SORTCHILDREN, 0, (LPARAM)TVI_ROOT);
todo_wine
todo_wine
ok(ret, "Unexpected ret value %d\n", ret);
get_item_names_string(hwnd, NULL, buff);
ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, initial_order);
......@@ -2857,7 +2857,7 @@ todo_wine
/* non-zero WPARAM, NULL item */
fill_treeview_sort_test(hwnd);
ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, 0);
todo_wine
todo_wine
ok(ret, "Unexpected ret value %d\n", ret);
get_item_names_string(hwnd, NULL, buff);
ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order);
......@@ -2865,7 +2865,7 @@ todo_wine
/* TVI_ROOT as item */
fill_treeview_sort_test(hwnd);
ret = SendMessageA(hwnd, TVM_SORTCHILDREN, TRUE, (LPARAM)TVI_ROOT);
todo_wine
todo_wine
ok(ret, "Unexpected ret value %d\n", ret);
get_item_names_string(hwnd, NULL, buff);
ok(!strcmp(buff, initial_order), "Wrong sorted order %s, expected %s\n", buff, sorted_order);
......
dlls/comctl32/tests/updown.c
View file @ 8fae3288
......@@ -670,7 +670,7 @@ static void test_updown_buddy(void)
buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0);
ok(buddyReturn == g_edit, "Unexpected buddy window.\n");
GetClientRect(updown, &rect2);
todo_wine
todo_wine
ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n");
DestroyWindow(updown);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment