[PATCH v9 10/10] scrrun: Return path not found error if no folders were moved in MoveFolder().

[Robert Wilhelm]

From: Robert Wilhelm

---
 dlls/scrrun/filesystem.c       |  5 +++--
 dlls/scrrun/tests/filesystem.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c
index eb982457f50..3f0a76b5993 100644
--- a/dlls/scrrun/filesystem.c
+++ b/dlls/scrrun/filesystem.c
@@ -3786,7 +3786,7 @@ static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR
     WCHAR *filename;
     WIN32_FIND_DATAW ffd;
     HANDLE f;
-    BOOL wildcard = FALSE, separator = FALSE;
+    BOOL wildcard = FALSE, separator = FALSE, success = FALSE;

TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination));

@@ -3839,10 +3839,11 @@ static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR
             if (GetLastError() == ERROR_INVALID_NAME) continue;
             return create_movefolder_error(GetLastError());
         }
+        success = TRUE;
     } while(FindNextFileW(f, &ffd));
     FindClose(f);

-    return S_OK;
+    return success ? S_OK : CTL_E_PATHNOTFOUND;
 }

static inline HRESULT copy_file(const WCHAR *source, DWORD source_len,
diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c
index 5217be00007..16353dde355 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -2748,6 +2748,34 @@ static void test_MoveFolder(void)
     ok(RemoveDirectoryW(buffW2), "can't remove %s directory\n", wine_dbgstr_w(buffW2));
     ok(RemoveDirectoryW(pathW), "can't remove %s directory\n", wine_dbgstr_w(pathW));
     ok(DeleteFileW(buffW3), "can't remove %s\n", wine_dbgstr_w(buffW3));
+
+    GetTempPathW(MAX_PATH, buffW1);
+    lstrcatW(buffW1,L"foo1");
+    GetTempPathW(MAX_PATH, buffW2);
+    lstrcatW(buffW2,L"foo2");
+    GetTempPathW(MAX_PATH, srcW);
+    lstrcatW(srcW,L"foo*");
+    GetTempPathW(MAX_PATH, pathW);
+    lstrcatW(pathW,L"bar");
+    ok(CreateDirectoryW(pathW, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(pathW));
+    /* create two files, should not be moved by MoveFolder() */
+    file = CreateFileW(buffW1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_NORMAL, NULL);
+    ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n");
+    CloseHandle(file);
+    file = CreateFileW(buffW2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_NORMAL, NULL);
+    ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n");
+    CloseHandle(file);
+    src = SysAllocString(srcW);
+    dst = SysAllocString(pathW);
+    hr = IFileSystem3_MoveFolder(fs3, src, dst);
+    ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr);
+    SysFreeString(src);
+    SysFreeString(dst);
+    ok(RemoveDirectoryW(pathW), "can't remove %s directory\n", wine_dbgstr_w(pathW));
+    ok(DeleteFileW(buffW1), "can't remove %s\n", wine_dbgstr_w(buffW1));
+    ok(DeleteFileW(buffW2), "can't remove %s\n", wine_dbgstr_w(buffW2));
 }

static void test_DoOpenPipeStream(void)