January 2022 - Wine-Devel - list.winehq.org

[PATCH 08/12] d3dcompiler/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/d3dcompiler_43/tests/asm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index e467cec9623..27f2c5b063d 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1725,7 +1725,7 @@ static void test_disassemble_shader(void) HRESULT hr; hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); -todo_wine + todo_wine #if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); #else @@ -1733,7 +1733,7 @@ todo_wine #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob); -- 2.35.0

Jan. 25, 2022

[PATCH 07/12] d3d10/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/d3d10/tests/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 418747b5df5..5f0c424efdb 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3852,7 +3852,7 @@ if (0) hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); -todo_wine + todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); @@ -7064,7 +7064,7 @@ static void test_effect_pool(void) ok(!!device2, "Failed to create d3d device.\n"); hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); @@ -7081,7 +7081,7 @@ todo_wine effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -7094,7 +7094,7 @@ todo_wine IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -7178,12 +7178,12 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); -- 2.35.0

Jan. 25, 2022

[PATCH 06/12] d2d1/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/d2d1/tests/d2d1.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0228ae8d52b..77079020551 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4766,7 +4766,7 @@ static void test_shared_bitmap(BOOL d3d11) bitmap_desc.pixelFormat = bitmap_format_tests[i].original; hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); - todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) + todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -5233,7 +5233,7 @@ static void test_draw_text_layout(BOOL d3d11) ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine + todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ @@ -5500,7 +5500,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -5512,7 +5512,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine + todo_wine ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); @@ -5527,7 +5527,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine + todo_wine ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); DeleteDC(hdc); @@ -7884,7 +7884,7 @@ static void test_gdi_interop(BOOL d3d11) dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr); -todo_wine + todo_wine ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -7942,7 +7942,7 @@ todo_wine ID2D1RenderTarget_BeginDraw(rt); hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); if (SUCCEEDED(hr)) IWICBitmapLock_Release(wic_lock); @@ -7954,7 +7954,7 @@ todo_wine ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Unexpected hr %#x.\n", hr); IWICBitmapLock_Release(wic_lock); @@ -8460,7 +8460,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -8716,7 +8716,7 @@ static void test_device_context(BOOL d3d11) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); @@ -8982,7 +8982,7 @@ static void test_command_list(BOOL d3d11) ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); -todo_wine + todo_wine ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); if (FAILED(hr)) -- 2.35.0

Jan. 25, 2022

[PATCH 05/12] crypt32/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/crypt32/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 09aea370227..b594256fb39 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -357,7 +357,7 @@ static void test_getDefaultCryptProv(void) prov = pI_CryptGetDefaultCryptProv(test_prov[i].algid); if (!prov) { -todo_wine_if(test_prov[i].algid == CALG_DSS_SIGN || test_prov[i].algid == CALG_NO_SIGN) + todo_wine_if(test_prov[i].algid == CALG_DSS_SIGN || test_prov[i].algid == CALG_NO_SIGN) ok(test_prov[i].optional, "%u: I_CryptGetDefaultCryptProv(%#x) failed\n", i, test_prov[i].algid); continue; } -- 2.35.0

Jan. 25, 2022

[PATCH 04/12] comsvcs/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comsvcs/tests/comsvcs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index f0cf0d8543f..2049f555f4a 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -453,11 +453,11 @@ static void test_new_moniker(void) ok(moniker_type == MKSYS_NONE, "Unexpected moniker type %d.\n", moniker_type); hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); @@ -468,7 +468,7 @@ todo_wine IUnknown_Release(obj); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); -todo_wine + todo_wine ok(hr == MK_E_NOSTORAGE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Inverse(moniker, &inverse); @@ -535,7 +535,7 @@ todo_wine ok(hr == S_OK, "Failed to get rot, hr %#x.\n", hr); hr = IRunningObjectTable_GetObject(rot, moniker, &obj2); -todo_wine + todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); IRunningObjectTable_Release(rot); -- 2.35.0

Jan. 25, 2022

[PATCH 03/12] comdlg32/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comdlg32/tests/filedlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 165b5cd8bdc..142eb371a46 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -467,7 +467,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L break; /* todo_wine: non moving non sizing controls */ case lst1: -todo_wine + todo_wine ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), "control id %03x was moved/resized, before %s after %s\n", ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ), -- 2.35.0

Jan. 25, 2022

[PATCH 02/12] comctl32/tests: Fix misleading indentation warnings

by Fabian Maurer

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 6 +++--- dlls/comctl32/tests/edit.c | 2 +- dlls/comctl32/tests/listbox.c | 2 +- dlls/comctl32/tests/listview.c | 38 +++++++++++++++++----------------- dlls/comctl32/tests/misc.c | 6 +++--- dlls/comctl32/tests/static.c | 2 +- dlls/comctl32/tests/tab.c | 10 ++++----- dlls/comctl32/tests/toolbar.c | 16 +++++++------- dlls/comctl32/tests/tooltips.c | 14 ++++++------- dlls/comctl32/tests/treeview.c | 10 ++++----- dlls/comctl32/tests/updown.c | 2 +- 11 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 69cc7680827..dd197db5a90 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -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; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index e3b2f408047..7fcc44eb4a1 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -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); diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index bc3e837402f..d5c782159ce 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -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)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5b40cea1fce..5485cd4b4e2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -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); diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index eba7858d7b9..4628e37bb7a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -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 ); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 40a337b97b0..9bd22408985 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -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); } diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index d3e0e0c6cf9..9685c8d37f5 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -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 */ diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d238e9f1071..1c52c70f2aa 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -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"); diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 4483e6f3fa3..7570ea68b0a 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -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) { diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0d245cf9d15..1804e1886a7 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -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); diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index a58ea899dc9..97afcb042f6 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -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); -- 2.35.0

Jan. 25, 2022

[PATCH 01/12] advapi32/tests: Fix misleading indentation warnings

by Fabian Maurer

Next patchset to fix compiler warnings. There's a lot more to come... I split it up since I figured that's required. I hope I got all of them. For some reason gcc doesn't always give the same warnings. I also only change the indentation where it actually is needed, to cause at least change as possible. wine_todo with curly braces can remain the same. I left quite a few wine_todo with the wrong indentation, as long as they don't cause issues for now. This is for example in a single if/else branch, or at the end of a method. I send it as a series, but they are functionally independent. If one patch is not good enough, you can apply the rest still fine. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/advapi32/tests/security.c | 16 ++++++++-------- dlls/advapi32/tests/service.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c73e28a98e6..009a941c700 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1028,7 +1028,7 @@ cleanup: rc = GetFileAttributesA(file); rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); -todo_wine + todo_wine ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); @@ -1488,10 +1488,10 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine + todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1600,7 +1600,7 @@ todo_wine PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); @@ -5365,9 +5365,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) SetLastError(0xdeadbeef); ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); -todo_wine + todo_wine ok(present == 1, "acl is not present\n"); -todo_wine + todo_wine ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5376,7 +5376,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5385,7 +5385,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cbe7fffbc7a..21704048778 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2728,7 +2728,7 @@ static void test_EventLog(void) !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */ || !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted -p") /* Win10 */, "got %s\n", config->lpBinaryPathName); -todo_wine + todo_wine ok(!strcmpi(config->lpLoadOrderGroup, "Event Log"), "got %s\n", config->lpLoadOrderGroup); ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); @@ -2749,7 +2749,7 @@ todo_wine status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, "got %#x\n", status.dwServiceType); ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); -todo_wine + todo_wine ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), -- 2.35.0

Jan. 25, 2022

Re: [PATCH vkd3d 3/6] vkd3d-shader/hlsl: Write SM4 unsigned multiplication instructions.

by Giovanni Mascellani

Hi, Il 25/01/22 20:06, Zebediah Figura (she/her) ha scritto: > I want to find some way to put "2 dsts" in the function name, because as > it is I can't tell just from reading. Might that be "write_sm4_binary_op_with_two_destinations"? > I'd also suggest specifying both dsts as optional hlsl_ir_node pointers, > where NULL translates to SM4_RT_NULL. That would allow you to use this > helper even if both dsts are used. Ok, good idea. Even though in later patches I am always using just one result (and given how our IR is structured, I can't see how it can be different), but generalizing anyway doesn't seem to hurt anybody. Giovanni.

Jan. 25, 2022

Re: [PATCH vkd3d 2/6] tests: Test a number of simple HLSL operations.

by Giovanni Mascellani

Hi, Il 25/01/22 19:59, Zebediah Figura (she/her) ha scritto: > I don't really like this approach. For one thing, it makes it harder to > validate e.g. patches 4-6 from this series (I essentially have to write > my own shaders). > > The complexity of the generated shader also makes it harder to read the > IR to validate it's doing the right thing. > > Perhaps more importantly, some of these operations are supported by all > HLSL versions, but some are only supported by SM4 (notably integer > operations). Anything that can be tested in sm2 or sm3 should be, and as > such I'd appreciate splitting those out where possible. Would it be better if I splitted this into many little shaders in the same .shader_test file, like I already did for hlsl-shape.shader_test? Also, is there a difference with 1/6 with this respect, since you signed off on that one? Giovanni.

Jan. 25, 2022