From 4fead33f30c6ac9fdbdcc58cbfc95304f5e30578 Mon Sep 17 00:00:00 2001 From: Jakob Eriksson Date: Tue, 22 Mar 2005 21:16:24 +0000 Subject: [PATCH] If the device gets interrupted, we just give up. --- dlls/shell32/tests/shlfileop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f628886d0f..533b3404c6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -191,7 +191,8 @@ void test_rename() 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 @@ void test_rename() 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"); -- 2.32.0.93.g670b81a890