shell32/tests: fix a test on several platforms.
Nicolas Le Cam
niko.lecam at gmail.com
Wed Oct 29 17:05:52 CDT 2008
---
dlls/shell32/tests/shellpath.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 4d87e8d..e62b695 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -338,7 +338,9 @@ static void testSHGetFolderPathInvalidArgs(void)
/* expect 2's a bogus handle, especially since we didn't open it */
hr = pSHGetFolderPathA(NULL, CSIDL_DESKTOP, (HANDLE)2,
SHGFP_TYPE_DEFAULT, path);
- ok(hr == E_FAIL,
+ ok(hr == E_FAIL ||
+ hr == E_HANDLE || /* Windows Vista and 2008 */
+ broken(hr == S_OK), /* Windows 2000 and Me */
"SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path) returned 0x%08x, expected E_FAIL\n", hr);
hr = pSHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path);
ok(hr == E_INVALIDARG,
--
1.5.4.3
--=-yEYP7Bc9CBxG5UQCfIiH--
More information about the wine-patches
mailing list