SHELL32/tests: rearrange shfolder tests once more
Saulius Krasuckas
saulius2 at ar.fi.lt
Thu Jun 30 03:38:15 CDT 2005
ChangeLog:
Saulius Krasuckas <saulius.krasuckas at ieee.org>
Prepare for adding new tests.
- Put OleInitialize and OleUninitialize in the main block.
- Move test_BindToObject before test_EnumObjects_and_CompareIDs.
Index: dlls/shell32/tests/shlfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/tests/shlfolder.c,v
retrieving revision 1.20
diff -p -U2 -r1.20 shlfolder.c
--- dlls/shell32/tests/shlfolder.c 27 Jun 2005 09:41:48 -0000 1.20
+++ dlls/shell32/tests/shlfolder.c 30 Jun 2005 08:32:49 -0000
@@ -590,6 +590,4 @@ static void test_EnumObjects_and_Compare
strcatW(cCurrDirW, cTestDirW);
- OleInitialize(NULL);
-
hr = SHGetMalloc(&ppM);
ok(hr == S_OK, "SHGetMalloc failed %08lx\n", hr);
@@ -619,10 +617,15 @@ 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();
}
More information about the wine-patches
mailing list