Francois Gouget : shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10.

Alexandre Julliard julliard at winehq.org
Mon Jul 5 16:24:19 CDT 2021


Module: wine
Branch: master
Commit: 0e64e056005a6a729fd10cf591b8127d9c5b0eab
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0e64e056005a6a729fd10cf591b8127d9c5b0eab

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Sun Jul  4 15:42:03 2021 +0200

shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10.

Some Windows 8.1 and Windows 10 1507 versions return PATH_NOT_FOUND
instead of FILE_NOT_FOUND.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/tests/shellpath.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 07bde45a66f..df9d4ecc949 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -3014,7 +3014,9 @@ static void test_PathResolve(void)
         ok(!lstrcmpiW(path, tests[i].expected_path),
                 "expected %s, got %s\n", wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path));
         if (!tests[i].expected)
-            ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
+            ok(GetLastError() == ERROR_FILE_NOT_FOUND ||
+               broken(GetLastError() == ERROR_PATH_NOT_FOUND /* some win 8.1 & 10 */),
+               "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
         winetest_pop_context();
     }
 




More information about the wine-cvs mailing list