[PATCH] stop shlfolder tests crashing under win98

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Tue Jun 10 05:23:26 CDT 2008


---
 dlls/shell32/tests/shlfolder.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 5c43d38..1f33724 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -432,6 +432,8 @@ static void test_GetDisplayName(void)
     if (SUCCEEDED(hr)) {
         IShellFolder_Release(psfFile);
     }
+
+    if(!pSHBindToParent) return;
   
     /* Some tests for IShellFolder::SetNameOf */
     hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
@@ -474,8 +476,6 @@ static void test_GetDisplayName(void)
         ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n");
     }
 
-    if(!pSHBindToParent) return;
-
     /* SHBindToParent fails, if called with a NULL PIDL. */
     hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
     ok (FAILED(hr), "SHBindToParent(NULL) should fail!\n");
-- 
1.5.4.1


--------------090606080107040009080907--




More information about the wine-patches mailing list