[PATCH 01/12] dlls/comctl32/tests: don't outdent todo_wine*
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/static.c | 4 ++-- dlls/comctl32/tests/toolbar.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 9bd22408985..0038cadd7d2 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -165,7 +165,7 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alph ok(bm.bmBits != NULL, "bmBits is NULL\n"); memcpy(bits, bm.bmBits, 4); if (is_premult) -todo_wine + todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha) @@ -195,7 +195,7 @@ todo_wine DeleteDC(hdc); if (is_premult) -todo_wine + todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cfe4f16f430..dcd95ffa4d8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2728,7 +2728,7 @@ static void test_BTNS_SEP(void) memset(&button, 0, sizeof(button)); ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); ok(ret == 1, "Unexpected return value.\n"); -todo_wine + todo_wine ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); rebuild_toolbar(&hwnd); @@ -2789,7 +2789,7 @@ todo_wine memset(&button, 0, sizeof(button)); ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); ok(ret == 1, "Unexpected return value.\n"); -todo_wine + todo_wine ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); DestroyWindow(hwnd);
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 28 ++++++++++++++-------------- dlls/msxml3/tests/httpreq.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f7929cd3a23..ac68071ed04 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7532,7 +7532,7 @@ static void test_XSLPattern(void) if (len) { if (ptr->todo) { char *str = list_to_string(list); - todo_wine + todo_wine ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); IXMLDOMNodeList_Release(list); } @@ -8730,7 +8730,7 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_get_xml(doc, &xml); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); SysFreeString(xml); @@ -10942,7 +10942,7 @@ static void test_mxnamespacemanager(void) EXPECT_REF(mgr2, 2); prefixes = NULL; hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { @@ -11513,7 +11513,7 @@ static void test_dispex(void) hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11528,7 +11528,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; @@ -11581,7 +11581,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); IXMLDOMNodeList_Release(node_list); @@ -11607,7 +11607,7 @@ todo_wine hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); -todo_wine + todo_wine ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret)); IDispatchEx_Release(dispex); @@ -11712,7 +11712,7 @@ todo_wine { V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -11752,7 +11752,7 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); @@ -12791,7 +12791,7 @@ static void test_newline_normalization(void) if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) { /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ -todo_wine + todo_wine ok(!lstrcmpW(s, L"<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>"), "got %s\n", wine_dbgstr_w(s)); } @@ -13303,7 +13303,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IResponse); -todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) + todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; @@ -13733,15 +13733,15 @@ static void test_load_with_site(void) hr = IObjectWithSite_SetSite(site, (IUnknown *)&sp); ok(hr == S_OK, "got %#x\n", hr); ok(qi_count != 0, "got %d QI calls\n", qi_count); -todo_wine + todo_wine ok(qi_list_contains(&IID_IXMLDOMDocument), "QI(IID_IXMLDOMDocument) was not called\n"); ok(qi_list_contains(&IID_IHTMLDocument2), "QI(IID_IHTMLDocument2) was not called\n"); ok(qi_list_contains(&IID_IServiceProvider), "QI(IID_IServiceProvider) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains(&IID_IOleClientSite), "QI(IID_IOleClientSite) was not called\n"); ok(qi_list_contains_service(&SID_SContainerDispatch, &IID_IHTMLDocument2), "QI(SID_SContainerDispatch, IID_IHTMLDocument2) was not called\n"); -todo_wine + todo_wine ok(qi_list_contains_service(&SID_SInternetHostSecurityManager, &IID_IXMLDOMDocument), "QI(SID_SInternetHostSecurityManager, IID_IXMLDOMDocument) was not called\n"); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 2491e499638..9368ab3c93c 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1401,11 +1401,11 @@ static void set_xhr_site(IXMLHttpRequest *xhr) EXPECT_HR(hr, S_OK); CHECK_CALLED(site_qi_IServiceProvider); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_SBindHost); CHECK_CALLED(sp_queryservice_SID_SContainerDispatch_htmldoc2); CHECK_CALLED(sp_queryservice_SID_secmgr_htmldoc2); -todo_wine + todo_wine CHECK_CALLED(sp_queryservice_SID_secmgr_xmldomdoc); /* this one isn't very reliable CHECK_CALLED(sp_queryservice_SID_secmgr_secmgr); */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 20c5e07443b..ef3818f6f2c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4504,7 +4504,7 @@ static void test_mxwriter_domdoc(void) V_DISPATCH(&dest) = (IDispatch *)domdoc; hr = IMXWriter_put_output(writer, dest); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); if (FAILED(hr)) { @@ -4530,11 +4530,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_get_documentElement(domdoc, &root); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); /* startElement allows document root node to be accessed. */ @@ -4547,7 +4547,7 @@ todo_wine hr = IXMLDOMElement_get_nodeName(root, &str); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -4560,11 +4560,11 @@ todo_wine hr = IXMLDOMNodeList_get_length(node_list, &list_length); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(list_length == 1, "list length %i, expected 1\n", list_length); hr = IXMLDOMNodeList_get_item(node_list, 0, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str); @@ -4618,7 +4618,7 @@ todo_wine { ok(2 == list_length, "list length %i, expected 2\n", list_length); } hr = IXMLDOMNodeList_get_item(node_list, 1, &node); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IXMLDOMNode_get_nodeName(node, &str);
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/file.c | 12 ++++++------ dlls/kernel32/tests/process.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f8e49491a7d..f16a092a4df 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4098,14 +4098,14 @@ static void test_CreateFile(void) ok(hfile == INVALID_HANDLE_VALUE, "CreateFile should fail\n"); if (i == 0 || i == 5) { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 5) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 5) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); } else { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 1) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } @@ -4116,8 +4116,8 @@ todo_wine_if (i == 1) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); else { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 1) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a558597a404..a4af5bb57ff 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3833,7 +3833,7 @@ static void test_process_info(HANDLE hproc) ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); else -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break;
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 2 +- dlls/ole32/tests/storage32.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b5eb5f2ffb4..afbea762e89 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2809,7 +2809,7 @@ static void test_item_moniker(void) moniker3 = (void *)0xdeadbeef; hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); -todo_wine + todo_wine { ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); ok(!moniker3, "Unexpected object.\n"); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 69d8a0c0e93..c463e74c8cb 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1234,7 +1234,7 @@ static void test_OleLoad(IStorage *pStorage) if (fmt == CF_METAFILEPICT) ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else if (fmt == CF_ENHMETAFILE) -todo_wine + todo_wine ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b05baddac98..9f4311cd07c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3313,7 +3313,7 @@ static void test_direct_swmr(void) /* it's possible to create in writer mode */ hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_DIRECT_SWMR, 0, &stg); -todo_wine + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) { IStorage_Release(stg);
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/advapi32/tests/security.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 009a941c700..e0a86acd5df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5522,9 +5522,9 @@ static void test_mutex_security(HANDLE token) SetLastError(0xdeadbeef); dup = OpenMutexA(0, FALSE, "WineTestMutex"); -todo_wine + todo_wine ok(!dup, "OpenMutex should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } @@ -5579,9 +5579,9 @@ static void test_event_security(HANDLE token) SetLastError(0xdeadbeef); dup = OpenEventA(0, FALSE, "WineTestEvent"); -todo_wine + todo_wine ok(!dup, "OpenEvent should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); }
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/bcrypt/tests/bcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 46793018742..e7619897cfd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -81,7 +81,7 @@ static void test_BCryptGetFipsAlgorithmMode(void) else { expected = FALSE; -todo_wine + todo_wine ok(0, "Neither XP or Vista key is present\n"); } RegCloseKey(hkey);
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 10722fee444..bb70c6f2320 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8697,7 +8697,7 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { - todo_wine_if(run.isSideways) + todo_wine_if(run.isSideways) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y); @@ -9778,7 +9778,7 @@ static void test_fontsetbuilder(void) if (id == DWRITE_FONT_PROPERTY_ID_WEIGHT || id == DWRITE_FONT_PROPERTY_ID_STRETCH || id == DWRITE_FONT_PROPERTY_ID_STYLE) { - todo_wine + todo_wine ok(exists, "Property %u expected to exist.\n", id); }
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4e31256e3cd..35158e7fcfd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -988,7 +988,7 @@ static void test_prepareheader(void) ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); } else -todo_wine + todo_wine ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); memset(&hdr, 0, sizeof(hdr));
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Mon, Feb 21, 2022 at 08:08:03AM +0100, Eric Pouech wrote:
This prevents -Wmisleading-indentation warnings (Mingw GCC11)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4e31256e3cd..35158e7fcfd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -988,7 +988,7 @@ static void test_prepareheader(void) ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); } else -todo_wine + todo_wine ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr);
memset(&hdr, 0, sizeof(hdr));
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledb32/tests/database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8bdb1f948f4..c3551d085f1 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -596,7 +596,7 @@ static void test_rowposition(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IConnectionPointContainer_EnumConnectionPoints(cpc, &enum_points); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL);
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 2 +- dlls/shell32/tests/shlfolder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f243ba053d0..860024ae6fa 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1146,7 +1146,7 @@ static void test_ShellWindows(void) IDispatch_Release(app); hr = IWebBrowser2_get_Document(wb, &doc); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { test_dispatch_typeinfo(doc, viewdual_riids); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f593f8b821d..13108f92246 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4423,7 +4423,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) cmi.lpVerb = "foobar_wine_test"; hr = IContextMenu_InvokeCommand(menu, &cmi); - todo_wine_if(background) + todo_wine_if(background) ok((hr == E_INVALIDARG) || (hr == E_FAIL /* Win7 */) || (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Unexpected hr %#x.\n", hr);
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=108748 Your paranoid android. === w1064v1809 (32 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_tsign (32 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4910: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64 (32 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w1064v1809 (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064 (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_tsign (64 bit report) === shell32: shlfolder.c:4910: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) === w10pro64 (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_he (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4910: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_ja (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4910: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_zh_CN (64 bit report) === shell32: shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4910: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4917: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4927: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 57bf759879c..40eb13943fc 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -358,7 +358,7 @@ static void scrollbar_test_default( DWORD style) if( !(style & WS_VSCROLL)) { if (bThemeActive || style != WS_HSCROLL) -todo_wine + todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), "unexpected style change %08x/%08x\n", winstyle, style); else @@ -394,7 +394,7 @@ todo_wine if( !(style & WS_HSCROLL)) { if (bThemeActive || style != WS_VSCROLL) -todo_wine + todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), "unexpected style change %08x/%08x\n", winstyle, style); else
This prevents -Wmisleading-indentation warnings (Mingw GCC11) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecs/tests/pngformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 50cb7a68a87..875e97cc320 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -815,7 +815,7 @@ static void test_color_formats(void) if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_1; @@ -843,7 +843,7 @@ next_1: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_2; @@ -871,7 +871,7 @@ next_2: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_3; @@ -898,7 +898,7 @@ next_3: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) continue;
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
participants (6)
-
Andrew Eikum -
Eric Pouech -
Esme Povirk (she/they) -
Huw Davies -
Marvin -
Nikolay Sivov