Commit f375123f authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

shell32/tests: Fix a test failure on W2K (unimplemented method).

parent 61052164
...@@ -162,32 +162,34 @@ if (0) ...@@ -162,32 +162,34 @@ if (0)
hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state);
ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr);
for(i = 0; i < 6; i++) hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details);
ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr);
/* test every column if method is implemented */
if (hr == S_OK)
{ {
hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType);
/* doesn't work on W2K */
if (hr == E_NOTIMPL) break; for(i = 0; i < 6; i++)
{
ok(hr == S_OK, "got 0x%08x\n", hr); hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details);
/* all columns are left-aligned */ ok(hr == S_OK, "got 0x%08x\n", hr);
ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt);
/* can't be on w9x at this point, IShellFolder2 unsupported there, /* all columns are left-aligned */
check present for running Wine with w9x setup */ ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt);
if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); /* can't be on w9x at this point, IShellFolder2 unsupported there,
check present for running Wine with w9x setup */
hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* all columns are string except document count */ hr = IShellFolder2_GetDefaultColumnState(folder, i, &state);
if (i == 1) ok(hr == S_OK, "got 0x%08x\n", hr);
ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); /* all columns are string except document count */
else if (i == 1)
ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state);
else
ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state);
}
} }
hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType);
/* default pidl */ /* default pidl */
hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf); hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
......
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