Prepare for adding new tests.

- Put OleInitialize and OleUninitialize in the main block. - Move test_BindToObject before test_EnumObjects_and_CompareIDs.

Prepare for adding new tests.
5678f65c · Saulius Krasuckas · Alexandre Julliard · 8a46c8ed · 5678f65c
Commit 5678f65c authored Jun 30, 2005 by Saulius Krasuckas Committed by Alexandre Julliard Jun 30, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

shlfolder.c dlls/shell32/tests/shlfolder.c +6 -3

No files found.
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -593,8 +593,6 @@ static void test_EnumObjects_and_CompareIDs(void)
    MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
    strcatW(cCurrDirW, cTestDirW);

-    OleInitialize(NULL);
-
    hr = SHGetDesktopFolder(&IDesktopFolder);
    ok(hr == S_OK, "SHGetDesktopfolder failed %08lx\n", hr);

@@ -619,11 +617,16 @@ static void test_EnumObjects_and_CompareIDs(void)
 START_TEST(shlfolder)
 {
    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_EnumObjects_and_CompareIDs();
    test_GetDisplayName();
    test_GetAttributesOf();
    test_SHGetPathFromIDList();
    test_CallForAttributes();
+
+    OleUninitialize();
 }