Module: wine Branch: master Commit: f94e3d183cbf81129e604be2b904f6e3f990a42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94e3d183cbf81129e604be2b...
Author: Fabian Maurer dark.shadow4@web.de Date: Sat Jan 29 00:36:49 2022 +0100
shell32/tests: Avoid "misleading indentation" warnings.
Signed-off-by: Fabian Maurer dark.shadow4@web.de Signed-off-by: Alexandre Julliard julliard@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) {
-
Alexandre Julliard