From: Zhenbo Li Subject: shell32: fix a test failure in shlfileop.c Message-Id: <54EFBFC7.3080509@gmail.com> Date: Fri, 27 Feb 2015 08:52:23 +0800 I cross-compiled dlls/shell32/tests, and found that wvistau64 failed[1]. This tiny patch should fix it [1]: http://testbot.winehq.org/JobDetails.pl?Key=11761 shell32_crosstest: shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR --- dlls/shell32/tests/shlfileop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 07e4ee2..10d32a1 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -814,9 +814,10 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + broken(retval == DE_FILEDESTISFLD) || /* Some Vista PCs */ 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 */