From f9a931070dd4b0959ec6345e4441cd4dacd0e08a Mon Sep 17 00:00:00 2001
From: Paul Vriens <Paul.Vriens.Wine@gmail.com>
Date: Fri, 20 Nov 2009 09:53:08 +0100
Subject: [PATCH] shell32/tests: Fix some tests on Win7.

---
 dlls/shell32/tests/shlfileop.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 33d1a943868..0a5cdcab4fd 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