Nicolas Le Cam : shell32/tests: Fix a test on several platforms.
Module: wine Branch: master Commit: 8619ccf251c30ccd7bae812f97008a9ee3de9ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8619ccf251c30ccd7bae812f97... Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Oct 29 23:05:52 2008 +0100 shell32/tests: Fix a test on several platforms. --- 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,
participants (1)
-
Alexandre Julliard