From: "Olivier F. R. Dierick" Subject: Shell32/tests : Fix wrong retval for Vista Message-Id: <1439594389.14932.11.camel@piezo3.piezo-forte.be> Date: Sat, 15 Aug 2015 01:19:49 +0200 Supersedes patch submission with id #113657. The patch corrects a test that was expecting a wrong return value from Vista. My first attempt at correcting missed the fact that the wrong value for Vista was right for W7 and others. This one passed on all Testbot VMs successfully. I checked the return values from the available Windows testbot and added them in the comments. --- dlls/shell32/tests/shlfileop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- Olivier F. R. Dierick o.dierick@piezo-forte.be From 87c3736d0e71f9ea06dd2aedfafa537b2a34e3bc Mon Sep 17 00:00:00 2001 From: "Olivier F. R. Dierick" Date: Sat, 15 Aug 2015 00:58:28 +0200 Subject: Fix wrong retval for Vista --- dlls/shell32/tests/shlfileop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d33ad5b..3f67205 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -815,11 +815,12 @@ static void test_rename(void) shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_CANCELLED || - retval == DE_DIFFDIR || /* Vista */ + ok(retval == ERROR_CANCELLED || /* W2K, XP, W2K3 */ + retval == DE_DIFFDIR || /* W2K8, W7U, W8 */ + broken(retval == DE_FILEDESTISFLD) || /* Vista */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ -- 1.7.10.4