January 2022 - Wine-Commits

Fabian Maurer : wininet/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 874473c50337a124d72fcb301095b4df76457293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=874473c50337a124d72fcb30… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:04 2022 +0100 wininet/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4c2facb635a..8fc72be8431 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1632,7 +1632,7 @@ static void test_InternetGetConnectedStateExA(void) buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); @@ -1734,7 +1734,7 @@ static void test_InternetGetConnectedStateExW(void) buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n");

1 0

Fabian Maurer : wbemdisp/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: bcc03c96d553167504b01bad2fc885006f7a4730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc03c96d553167504b01bad… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:59 2022 +0100 wbemdisp/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index bf44f62329a..4ce847fac84 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -443,7 +443,7 @@ static void test_namedvalueset(void) V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value2, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); V_I4(&var) = 0; @@ -474,7 +474,7 @@ todo_wine { ok( count == 1, "Unexpected count %d.\n", count ); } hr = ISWbemNamedValueSet_DeleteAll( set ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 1; @@ -485,7 +485,7 @@ todo_wine { } V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value, &var ); -todo_wine + todo_wine ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); count = 0;

1 0

Esme Povirk : mscoree: Use wide string syntax in create_monodata.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 71288ba50a6084cd9f3ec2334f088ea154e36cb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71288ba50a6084cd9f3ec233… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:54 2022 -0600 mscoree: Use wide string syntax in create_monodata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ec06717be85..afb5a104ca7 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1718,13 +1718,9 @@ end: HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { - static const WCHAR wszAssembly[] = {'A','s','s','e','m','b','l','y',0}; - static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; - static const WCHAR wszClass[] = {'C','l','a','s','s',0}; - static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; - static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - static const WCHAR wszDLL[] = {'.','d','l','l',0}; + static const WCHAR wszFileSlash[] = L"file:///"; + static const WCHAR wszCLSIDSlash[] = L"CLSID\\"; + static const WCHAR wszInprocServer32[] = L"\\InprocServer32"; WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; @@ -1751,7 +1747,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); if (res != ERROR_FILE_NOT_FOUND) { - res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + res = RegGetValueW( key, NULL, L"Class", RRF_RT_REG_SZ, NULL, classname, &dwBufLen); if(res != ERROR_SUCCESS) { WARN("Class value cannot be found.\n"); @@ -1762,7 +1758,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) TRACE("classname (%s)\n", debugstr_w(classname)); dwBufLen = MAX_PATH + 8; - res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + res = RegGetValueW( key, NULL, L"CodeBase", RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); if(res == ERROR_SUCCESS) { /* Strip file:/// */ @@ -1797,7 +1793,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) if (res != ERROR_SUCCESS) goto cleanup; dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + res = RegGetValueW(subkey, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; @@ -1805,7 +1801,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) else { dwBufLen = MAX_PATH + 8; - res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + res = RegGetValueW(key, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); if (res != ERROR_SUCCESS) goto cleanup; } @@ -1830,7 +1826,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) *(ns) = '\0'; lstrcatW(filename, assemblyname); *(ns) = '.'; - lstrcatW(filename, wszDLL); + lstrcatW(filename, L".dll"); } } }

1 0

Fabian Maurer : uxtheme/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 0e655043a2439e93a424c65710cc0d9e4661d3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e655043a2439e93a424c657… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:58 2022 +0100 uxtheme/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index afc05b8549f..980676f9e57 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -885,11 +885,11 @@ static void test_buffered_paint(void) /* clearing */ hr = pBufferedPaintClear(NULL, NULL); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); hr = pBufferedPaintClear(buffer, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected return code %#x\n", hr); /* access buffer attributes */

1 0

Fabian Maurer : propsys/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 7cd6681b3be35cf6c02f056cb5131c90c0674c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd6681b3be35cf6c02f056c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:40 2022 +0100 propsys/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 6370c01dc80..792ef1dd785 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -840,7 +840,7 @@ static void test_PropVariantCompareEx(void) /* VT_R4/VT_R8 */ res = PropVariantCompareEx(&r4_0, &r8_0, 0, 0); -todo_wine + todo_wine ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&r4_0, &r4_0, 0, 0); @@ -2014,7 +2014,7 @@ static void test_PSCreatePropertyStoreFromObject(void) ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); if (SUCCEEDED(hr)) {

1 0

Fabian Maurer : mfplat/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 93eda568b9bddc3a34bb679d39c156ee245d0870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eda568b9bddc3a34bb679d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:04 2022 +0100 mfplat/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 207bd61b8dc..f89a5202d80 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -918,7 +918,7 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); -todo_wine + todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); @@ -6920,7 +6920,7 @@ static void test_d3d12_surface_buffer(void) hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); if (hr == E_INVALIDARG) { -todo_wine + todo_wine win_skip("D3D12 resource buffers are not supported.\n"); goto notsupported; } @@ -7088,7 +7088,7 @@ static void test_sample_allocator_sysmem(void) hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine ok(!count, "Unexpected count %d.\n", count); check_interface(sample, &IID_IMFTrackedSample, TRUE); @@ -7112,7 +7112,7 @@ todo_wine hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine + todo_wine EXPECT_REF(video_type, 2); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); @@ -7455,7 +7455,7 @@ static void test_sample_allocator_d3d11(void) hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) { - todo_wine + todo_wine ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); IMFVideoSampleAllocatorEx_Release(allocatorex); continue; @@ -7540,7 +7540,7 @@ static void test_sample_allocator_d3d12(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == MF_E_UNEXPECTED) /* Some Win10 versions fail. */, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) goto done;

1 0

Fabian Maurer : shell32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: f94e3d183cbf81129e604be2b904f6e3f990a42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94e3d183cbf81129e604be2… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:49 2022 +0100 shell32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 2 +- dlls/shell32/tests/shelldispatch.c | 12 ++++++------ dlls/shell32/tests/shelllink.c | 10 +++++----- dlls/shell32/tests/shlfolder.c | 22 +++++++++++----------- dlls/shell32/tests/shlview.c | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 229d616c6f0..e1c050bbc16 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); -todo_wine + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(appid == NULL, "got %p\n", appid); } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 8e69a0bfa4e..f243ba053d0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -781,16 +781,16 @@ static void test_items(void) } r = FolderItems__NewEnum(items, &unk); -todo_wine + todo_wine ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); -todo_wine + todo_wine ok(!!unk, "unk is null\n"); if (unk) IUnknown_Release(unk); if (items3) { r = FolderItems3_Filter(items3, 0, NULL); -todo_wine + todo_wine ok(r == S_OK, "expected S_OK, got %08x\n", r); if (0) /* crashes on xp */ @@ -800,7 +800,7 @@ todo_wine } r = FolderItems3_get_Verbs(items3, &verbs); -todo_wine + todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(!verbs, "verbs is not null\n"); } @@ -1137,7 +1137,7 @@ static void test_ShellWindows(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_Refresh(wb); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_get_Application(wb, &app); @@ -1219,7 +1219,7 @@ if (hr == S_OK) { V_I4(&v) = cookie; VariantInit(&v2); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); -todo_wine + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index edd536c3a01..5caebcd776c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void) /* specified instance handle */ hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); ok(hicon2 != NULL, "Got icon %p\n", hicon2); @@ -1207,14 +1207,14 @@ todo_wine CloseHandle(file); hicon = ExtractIconA(NULL, path, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileA(path); @@ -1255,14 +1255,14 @@ if (0) CloseHandle(file); hicon = ExtractIconW(NULL, pathW, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileW(pathW); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 29fcd0b7754..f593f8b821d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -208,7 +208,7 @@ static void test_ParseDisplayName(void) for (i = 0; i < ARRAY_SIZE(parse_tests); i++) { hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, parse_tests[i].path, NULL, &pidl, NULL); -todo_wine_if(parse_tests[i].todo) + todo_wine_if(parse_tests[i].todo) ok(hr == parse_tests[i].hr, "%s: expected %#x, got %#x\n", wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr); if (SUCCEEDED(hr)) @@ -4334,16 +4334,16 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo) HRESULT hr; hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); } static void test_contextmenu(IContextMenu *menu, BOOL background) @@ -4418,7 +4418,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) /* Attempt to execute a nonexistent command */ cmi.lpVerb = MAKEINTRESOURCEA(9999); hr = IContextMenu_InvokeCommand(menu, &cmi); - todo_wine_if(background) + todo_wine_if(background) ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); cmi.lpVerb = "foobar_wine_test"; @@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void) ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); hr = SHLimitInputEdit(NULL, desktop); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "Failed to create Edit control.\n"); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); DestroyWindow(hwnd); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d441..48ba72a4c0e 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,7 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) {

1 0

Fabian Maurer : user32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: c02787443960921e5b680aeb126015746d13c822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02787443960921e5b680aeb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:57 2022 +0100 user32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 2 +- dlls/user32/tests/dde.c | 4 +- dlls/user32/tests/dialog.c | 16 +-- dlls/user32/tests/listbox.c | 2 +- dlls/user32/tests/msg.c | 20 ++-- dlls/user32/tests/win.c | 232 ++++++++++++++++++++--------------------- dlls/user32/tests/winstation.c | 12 +-- 7 files changed, 144 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c02787443960921e5b68…

1 0

Fabian Maurer : secur32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 362802c49abfcd350d361942057df29ae123861a URL: https://source.winehq.org/git/wine.git/?a=commit;h=362802c49abfcd350d361942… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:47 2022 +0100 secur32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index abddfa138ab..028e1e933dc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1074,9 +1074,9 @@ static void test_communication(void) status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); -todo_wine + todo_wine ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine + todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[1].cBuffers = 1;

1 0

Fabian Maurer : riched20/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 2d6fad7bda2f2e21a871f405a6b0c3e70ebf6a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6fad7bda2f2e21a871f405… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:43 2022 +0100 riched20/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 20 ++++++++++---------- dlls/riched20/tests/txtsrv.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 9449c6b58cc..c06be02bd89 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -431,7 +431,7 @@ todo_wine { touch_file(filename); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyRead, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); SetLastError(0xdeadbeef); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -444,7 +444,7 @@ todo_wine touch_file(filename); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyWrite, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); SetLastError(0xdeadbeef); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -458,7 +458,7 @@ todo_wine create_interfaces(&w, &reOle, &txtDoc, &txtSel); SetLastError(0xdeadbeef); hres = ITextDocument_Open(txtDoc, &testfile, tomShareDenyWrite|tomShareDenyRead, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); hFile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -474,7 +474,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_ACP); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); todo_wine ok(result == 12, "ITextDocument_Open: Test ASCII returned %d, expected 12\n", result); @@ -489,7 +489,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_UTF8); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); todo_wine ok(result == 15, "ITextDocument_Open: Test UTF-8 returned %d, expected 15\n", result); @@ -504,7 +504,7 @@ todo_wine CloseHandle(hFile); create_interfaces(&w, &reOle, &txtDoc, &txtSel); hres = ITextDocument_Open(txtDoc, &testfile, tomReadOnly, 1200); -todo_wine + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); result = SendMessageW(w, WM_GETTEXT, 1024, (LPARAM)bufUnicode); todo_wine ok(result == 12, "ITextDocument_Open: Test UTF-16 returned %d, expected 12\n", result); @@ -680,13 +680,13 @@ static void test_GetText(void) bstr = (void*)0xdeadbeef; hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); -todo_wine + todo_wine ok(bstr == NULL, "got %p\n", bstr); bstr = (void*)0xdeadbeef; hres = ITextRange_GetText(range, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); -todo_wine + todo_wine ok(bstr == NULL, "got %p\n", bstr); } else { @@ -2679,7 +2679,7 @@ todo_wine { } hr = ITextRange_GetEnd(range, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(value == 3, "got %d\n", value); hr = ITextRange_GetStart(range2, &value); @@ -2688,7 +2688,7 @@ todo_wine hr = ITextRange_GetEnd(range2, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine + todo_wine ok(value == 1, "got %d\n", value); ITextRange_Release(range); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1f789da8a37..22082201fbc 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1126,7 +1126,7 @@ static void test_TxGetScroll(void) ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); ok( min_pos == 0, "got %d\n", min_pos ); -todo_wine + todo_wine ok( max_pos == 0, "got %d\n", max_pos ); ok( pos == 0, "got %d\n", pos ); ok( page == client.bottom, "got %d\n", page ); @@ -1150,7 +1150,7 @@ todo_wine ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); ok( min_pos == 0, "got %d\n", min_pos ); -todo_wine + todo_wine ok( max_pos == 0, "got %d\n", max_pos ); ok( pos == 0, "got %d\n", pos ); ok( page == client.bottom, "got %d\n", page );

1 0