From 996e5d62b87067b1f0c2f0e46b41f69c45f220be Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 10 Jun 2008 21:52:58 +1000
Subject: [PATCH] shell32: Stop shlfolder tests crashing under win98.

---
 dlls/shell32/tests/shlfolder.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 5c43d3820c0..950f1d7a8bc 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -432,6 +432,12 @@ static void test_GetDisplayName(void)
     if (SUCCEEDED(hr)) {
         IShellFolder_Release(psfFile);
     }
+
+    if(!pSHBindToParent)
+    {
+        skip("SHBindToParent is missing\n");
+        return;
+    }
   
     /* Some tests for IShellFolder::SetNameOf */
     hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
@@ -474,8 +480,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");