NT4 test fix, shlfileop.c

[Jakob Eriksson]

http://test.winehq.org/data/200503181000/nt4/shell32:shlfileop.txt

If the device gets interrupted, we just give up.


regards,
Jakob

-------------- next part --------------
Index: dlls/shell32/tests/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/tests/shlfileop.c,v
retrieving revision 1.15
diff -u -r1.15 shlfileop.c
--- dlls/shell32/tests/shlfileop.c	10 Feb 2005 19:19:35 -0000	1.15
+++ dlls/shell32/tests/shlfileop.c	22 Mar 2005 15:59:48 -0000
@@ -191,7 +191,8 @@
     set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0");
     set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0");
     retval = SHFileOperationA(&shfo); /* W98 returns 0, W2K and newer returns ERROR_GEN_FAILURE, both do nothing */
-    ok(!retval || retval == ERROR_GEN_FAILURE, "Can't rename many files, retval = %lx\n", retval);
+    ok(!retval || retval == ERROR_GEN_FAILURE || retval == ERROR_REDIR_PAUSED,
+       "Can't rename many files, retval = %lx\n", retval);
     ok(file_exists(".\\test1.txt"), "The file is not renamed - many files are specified\n");
 
     memcpy(&shfo2, &shfo, sizeof(SHFILEOPSTRUCTA));
@@ -200,7 +201,8 @@
     set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0");
     set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0");
     retval = SHFileOperationA(&shfo2); /* W98 returns 0, W2K and newer returns ERROR_GEN_FAILURE, both do nothing */
-    ok(!retval || retval == ERROR_GEN_FAILURE, "Can't rename many files, retval = %lx\n", retval);
+    ok(!retval || retval == ERROR_GEN_FAILURE || retval == ERROR_REDIR_PAUSED,
+       "Can't rename many files, retval = %lx\n", retval);
     ok(file_exists(".\\test1.txt"), "The file is not renamed - many files are specified\n");
 
     set_curr_dir_path(from, "test1.txt\0");