SHELL32/tests: cleanup the shldolfer test

Saulius Krasuckas saulius2 at ar.fi.lt
Tue Jun 21 06:35:42 CDT 2005


ChangeLog:
        Saulius Krasuckas <saulius.krasuckas at ieee.org>
	Cleanup the shlfolder test a bit more.


Index: dlls/shell32/tests/shlfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/tests/shlfolder.c,v
retrieving revision 1.15
diff -w -p -U4 -r1.15 shlfolder.c
--- dlls/shell32/tests/shlfolder.c      17 Jun 2005 20:59:49 -0000      1.15
+++ dlls/shell32/tests/shlfolder.c      21 Jun 2005 11:29:28 -0000
@@ -426,9 +426,9 @@ static void test_SHGetPathFromIDList(voi
 
     ILFree(pidlMyComputer);
 }
 
-START_TEST(shlfolder)
+static void test_EnumObjects_and_CompareIDs(void)
 {
     ITEMIDLIST *newPIDL;
     IShellFolder *IDesktopFolder, *testIShellFolder;
     char  cCurrDirA [MAX_PATH] = {0};
@@ -456,16 +456,21 @@ START_TEST(shlfolder)
     hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, (REFIID)&IID_IShellFolder, (LPVOID *)&testIShellFolder);
     ok(hr == S_OK, "BindToObject failed %08lx\n", hr);
         
     test_EnumObjects(testIShellFolder);
-    test_BindToObject();
-    test_GetDisplayName();
-    test_GetAttributesOf();
-    test_SHGetPathFromIDList();
 
     hr = IShellFolder_Release(testIShellFolder);
     ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
 
     IMalloc_Free(ppM, newPIDL);
 
     Cleanup();
+}
+
+START_TEST(shlfolder)
+{
+    test_EnumObjects_and_CompareIDs();
+    test_BindToObject();
+    test_GetDisplayName();
+    test_GetAttributesOf();
+    test_SHGetPathFromIDList();
 }



More information about the wine-patches mailing list