Skip to content

W
wine-cw
Commit 5678f65c authored by Saulius Krasuckas's avatar Saulius Krasuckas Committed by Alexandre Julliard
Browse files
Options

Prepare for adding new tests.

- Put OleInitialize and OleUninitialize in the main block. - Move test_BindToObject before test_EnumObjects_and_CompareIDs.
parent 8a46c8ed
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
dlls/shell32/tests/shlfolder.c
View file @ 5678f65c
...@@ -593,8 +593,6 @@ static void test_EnumObjects_and_CompareIDs(void) ...@@ -593,8 +593,6 @@ static void test_EnumObjects_and_CompareIDs(void)
MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
strcatW(cCurrDirW, cTestDirW); strcatW(cCurrDirW, cTestDirW);
OleInitialize(NULL);
hr = SHGetDesktopFolder(&IDesktopFolder); hr = SHGetDesktopFolder(&IDesktopFolder);
ok(hr == S_OK, "SHGetDesktopfolder failed %08lx\n", hr); ok(hr == S_OK, "SHGetDesktopfolder failed %08lx\n", hr);
...@@ -619,11 +617,16 @@ static void test_EnumObjects_and_CompareIDs(void) ...@@ -619,11 +617,16 @@ static void test_EnumObjects_and_CompareIDs(void)
START_TEST(shlfolder) START_TEST(shlfolder)
{ {
init_function_pointers(); init_function_pointers();
/* if OleInitialize doesn't get called, ParseDisplayName returns
CO_E_NOTINITIALIZED for malformed directory names on win2k. */
OleInitialize(NULL);
test_EnumObjects_and_CompareIDs();
test_BindToObject(); test_BindToObject();
test_EnumObjects_and_CompareIDs();
test_GetDisplayName(); test_GetDisplayName();
test_GetAttributesOf(); test_GetAttributesOf();
test_SHGetPathFromIDList(); test_SHGetPathFromIDList();
test_CallForAttributes(); test_CallForAttributes();
OleUninitialize();
} }
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