Module: wine Branch: master Commit: 748f7e26cbab9d91993d555d124bd193c4cafcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=748f7e26cbab9d91993d555d12...
Author: Hans Leidekker hans@codeweavers.com Date: Tue Dec 20 12:07:51 2016 +0100
shell32/tests: Accept another error from SHFileOperationA.
Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/tests/shlfileop.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 0e502fc..d74c59a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -817,6 +817,7 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ "Expected ERROR_CANCELLED or DE_DIFFDIR\n");