[PATCH v10 04/10] scrrun: Check for non-existant source in MoveFolder().

[Robert Wilhelm]

From: Robert Wilhelm

Signed-off-by: Robert Wilhelm 
---
 dlls/scrrun/filesystem.c       | 16 +++++++++++++++-
 dlls/scrrun/tests/filesystem.c |  7 +++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c
index 52e10239e05..08db360bbe6 100644
--- a/dlls/scrrun/filesystem.c
+++ b/dlls/scrrun/filesystem.c
@@ -3764,6 +3764,20 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de
     return MoveFileW(source, destination) ? S_OK : create_error(GetLastError());
 }

+static inline HRESULT create_movefolder_error(DWORD err)
+{
+    switch(err) {
+    case ERROR_FILE_NOT_FOUND:
+    case ERROR_PATH_NOT_FOUND: return CTL_E_PATHNOTFOUND;
+    case ERROR_ACCESS_DENIED: return CTL_E_PERMISSIONDENIED;
+    case ERROR_FILE_EXISTS: return CTL_E_FILEALREADYEXISTS;
+    case ERROR_ALREADY_EXISTS: return CTL_E_FILEALREADYEXISTS;
+    default:
+        FIXME("Unsupported error code: %ld\n", err);
+        return E_FAIL;
+    }
+}
+
 static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR destination)
 {
     TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination));
@@ -3771,7 +3785,7 @@ static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR
     if(!source || !source[0] || !destination || !destination[0])
         return E_INVALIDARG;

-    return MoveFileW(source, destination) ? S_OK : create_error(GetLastError());
+    return MoveFileW(source, destination) ? S_OK : create_movefolder_error(GetLastError());
 }

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 5b183b9436e..8b84e743809 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -2641,6 +2641,13 @@ static void test_MoveFolder(void)
     SysFreeString(dst);
     ok(RemoveDirectoryW(buffW1), "can't remove %s directory\n", wine_dbgstr_w(buffW1));
     ok(RemoveDirectoryW(buffW2), "can't remove %s directory\n", wine_dbgstr_w(buffW2));
+
+    src = SysAllocString(buffW1);
+    dst = SysAllocString(buffW2);
+    hr = IFileSystem3_MoveFolder(fs3, src, dst); /* src nonexistant */
+    ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr);
+    SysFreeString(src);
+    SysFreeString(dst);
 }

static void test_DoOpenPipeStream(void)