[PATCH] stop shlfolder tests crashing under win98
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Jun 10 06:52:58 CDT 2008
---
dlls/shell32/tests/shlfolder.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 5c43d38..950f1d7 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");
--
1.5.4.1
--------------070104030800000005000303--
More information about the wine-patches
mailing list