Module: wine Branch: master Commit: f9a931070dd4b0959ec6345e4441cd4dacd0e08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a931070dd4b0959ec6345e44...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Fri Nov 20 09:53:08 2009 +0100
shell32/tests: Fix some tests on Win7.
---
dlls/shell32/tests/shlfileop.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 33d1a94..0a5cdca 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -965,9 +965,10 @@ static void test_copy(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); retval = SHFileOperation(&shfo); - if (retval == DE_FLDDESTISFILE) + if (retval == DE_FLDDESTISFILE || /* Vista and W2K8 */ + retval == DE_INVALIDFILES) /* Win7 */ { - /* Vista and W2K8 (broken or new behavior ?) */ + /* Most likely new behavior */ ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); } else