SHELL32/tests: cleanup the shldolfer test

Saulius Krasuckas saulius2 at ar.fi.lt
Tue Jun 21 11:51:05 CDT 2005


* On Tue, 21 Jun 2005, Saulius Krasuckas wrote:
> 	Cleanup the shlfolder test a bit more.

Race conditions detected.  Race lost.  Resubmitting. ;-)


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.16
diff -p -U4 -r1.16 shlfolder.c
--- dlls/shell32/tests/shlfolder.c      20 Jun 2005 10:31:14 -0000      1.16
+++ dlls/shell32/tests/shlfolder.c      21 Jun 2005 16:45:55 -0000
@@ -446,9 +446,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};
@@ -478,16 +478,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