Commit f94e3d18 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard

shell32/tests: Avoid "misleading indentation" warnings.

parent 87acd402
...@@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) ...@@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void)
appid = (void*)0xdeadbeef; appid = (void*)0xdeadbeef;
hr = pGetCurrentProcessExplicitAppUserModelID(&appid); hr = pGetCurrentProcessExplicitAppUserModelID(&appid);
todo_wine todo_wine
ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(hr == E_FAIL, "got 0x%08x\n", hr);
ok(appid == NULL, "got %p\n", appid); ok(appid == NULL, "got %p\n", appid);
} }
......
...@@ -781,16 +781,16 @@ static void test_items(void) ...@@ -781,16 +781,16 @@ static void test_items(void)
} }
r = FolderItems__NewEnum(items, &unk); r = FolderItems__NewEnum(items, &unk);
todo_wine todo_wine
ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r);
todo_wine todo_wine
ok(!!unk, "unk is null\n"); ok(!!unk, "unk is null\n");
if (unk) IUnknown_Release(unk); if (unk) IUnknown_Release(unk);
if (items3) if (items3)
{ {
r = FolderItems3_Filter(items3, 0, NULL); r = FolderItems3_Filter(items3, 0, NULL);
todo_wine todo_wine
ok(r == S_OK, "expected S_OK, got %08x\n", r); ok(r == S_OK, "expected S_OK, got %08x\n", r);
if (0) /* crashes on xp */ if (0) /* crashes on xp */
...@@ -800,7 +800,7 @@ todo_wine ...@@ -800,7 +800,7 @@ todo_wine
} }
r = FolderItems3_get_Verbs(items3, &verbs); r = FolderItems3_get_Verbs(items3, &verbs);
todo_wine todo_wine
ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
ok(!verbs, "verbs is not null\n"); ok(!verbs, "verbs is not null\n");
} }
...@@ -1137,7 +1137,7 @@ static void test_ShellWindows(void) ...@@ -1137,7 +1137,7 @@ static void test_ShellWindows(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IWebBrowser2_Refresh(wb); hr = IWebBrowser2_Refresh(wb);
todo_wine todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IWebBrowser2_get_Application(wb, &app); hr = IWebBrowser2_get_Application(wb, &app);
...@@ -1219,7 +1219,7 @@ if (hr == S_OK) { ...@@ -1219,7 +1219,7 @@ if (hr == S_OK) {
V_I4(&v) = cookie; V_I4(&v) = cookie;
VariantInit(&v2); VariantInit(&v2);
hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); 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(hr == S_FALSE, "got 0x%08x\n", hr);
ok(disp == NULL, "got %p\n", disp); ok(disp == NULL, "got %p\n", disp);
ok(ret == 0, "got %d\n", ret); ok(ret == 0, "got %d\n", ret);
......
...@@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void) ...@@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void)
/* specified instance handle */ /* specified instance handle */
hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0);
todo_wine todo_wine
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1);
ok(hicon2 != NULL, "Got icon %p\n", hicon2); ok(hicon2 != NULL, "Got icon %p\n", hicon2);
...@@ -1207,14 +1207,14 @@ todo_wine ...@@ -1207,14 +1207,14 @@ todo_wine
CloseHandle(file); CloseHandle(file);
hicon = ExtractIconA(NULL, path, 0); hicon = ExtractIconA(NULL, path, 0);
todo_wine todo_wine
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
hicon = ExtractIconA(NULL, path, -1); hicon = ExtractIconA(NULL, path, -1);
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
hicon = ExtractIconA(NULL, path, 1); hicon = ExtractIconA(NULL, path, 1);
todo_wine todo_wine
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
r = DeleteFileA(path); r = DeleteFileA(path);
...@@ -1255,14 +1255,14 @@ if (0) ...@@ -1255,14 +1255,14 @@ if (0)
CloseHandle(file); CloseHandle(file);
hicon = ExtractIconW(NULL, pathW, 0); hicon = ExtractIconW(NULL, pathW, 0);
todo_wine todo_wine
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
hicon = ExtractIconW(NULL, pathW, -1); hicon = ExtractIconW(NULL, pathW, -1);
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
hicon = ExtractIconW(NULL, pathW, 1); hicon = ExtractIconW(NULL, pathW, 1);
todo_wine todo_wine
ok(hicon == NULL, "Got icon %p\n", hicon); ok(hicon == NULL, "Got icon %p\n", hicon);
r = DeleteFileW(pathW); r = DeleteFileW(pathW);
......
...@@ -208,7 +208,7 @@ static void test_ParseDisplayName(void) ...@@ -208,7 +208,7 @@ static void test_ParseDisplayName(void)
for (i = 0; i < ARRAY_SIZE(parse_tests); i++) for (i = 0; i < ARRAY_SIZE(parse_tests); i++)
{ {
hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, parse_tests[i].path, NULL, &pidl, NULL); 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", ok(hr == parse_tests[i].hr, "%s: expected %#x, got %#x\n",
wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr); wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
...@@ -4334,15 +4334,15 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo) ...@@ -4334,15 +4334,15 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo)
HRESULT hr; HRESULT hr;
hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); 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); ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr);
if (hr == S_OK) if (hr == S_OK)
IUnknown_Release(unk); IUnknown_Release(unk);
hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&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); ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr);
if (hr == S_OK) if (hr == S_OK)
IUnknown_Release(unk); IUnknown_Release(unk);
} }
...@@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void) ...@@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void)
ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr);
hr = SHLimitInputEdit(NULL, desktop); hr = SHLimitInputEdit(NULL, desktop);
todo_wine todo_wine
ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL);
ok(hwnd != NULL, "Failed to create Edit control.\n"); ok(hwnd != NULL, "Failed to create Edit control.\n");
hr = SHLimitInputEdit(hwnd, desktop); hr = SHLimitInputEdit(hwnd, desktop);
todo_wine todo_wine
ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr);
hr = SHLimitInputEdit(hwnd, desktop); hr = SHLimitInputEdit(hwnd, desktop);
todo_wine todo_wine
ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr);
DestroyWindow(hwnd); DestroyWindow(hwnd);
......
...@@ -1479,7 +1479,7 @@ static void test_newmenu(void) ...@@ -1479,7 +1479,7 @@ static void test_newmenu(void)
HRESULT hr; HRESULT hr;
hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); 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); ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr);
if (hr != S_OK) if (hr != S_OK)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment