[PATCH v10 05/10] scrrun: Check that source is directory in MoveFolder().

[Robert Wilhelm]

From: Robert Wilhelm

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

diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c
index 08db360bbe6..a7488454e95 100644
--- a/dlls/scrrun/filesystem.c
+++ b/dlls/scrrun/filesystem.c
@@ -3767,6 +3767,7 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de
 static inline HRESULT create_movefolder_error(DWORD err)
 {
     switch(err) {
+    case ERROR_INVALID_NAME:
     case ERROR_FILE_NOT_FOUND:
     case ERROR_PATH_NOT_FOUND: return CTL_E_PATHNOTFOUND;
     case ERROR_ACCESS_DENIED: return CTL_E_PERMISSIONDENIED;
@@ -3780,12 +3781,19 @@ static inline HRESULT create_movefolder_error(DWORD err)

static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR destination)
 {
+    int len;
+    WCHAR src_path[MAX_PATH];
+
     TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination));

if(!source || !source[0] || !destination || !destination[0])
         return E_INVALIDARG;

-    return MoveFileW(source, destination) ? S_OK : create_movefolder_error(GetLastError());
+    len = SysStringLen(source);
+    lstrcpyW(src_path, source);
+    if (source[len-1] != '\' && source[len-1] != '/') wcscat(src_path, L"\");
+
+    return MoveFileW(src_path, 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 8b84e743809..91c265b2ace 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -2605,6 +2605,7 @@ static void test_MoveFolder(void)
     BSTR src, dst, str, empty;
     WCHAR buffW1[MAX_PATH],buffW2[MAX_PATH];
     HRESULT hr;
+    HANDLE file;

get_temp_path(L"foo", buffW1);
     get_temp_path(L"bar", buffW2);
@@ -2648,6 +2649,19 @@ static void test_MoveFolder(void)
     ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr);
     SysFreeString(src);
     SysFreeString(dst);
+
+    file = CreateFileW(buffW1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_NORMAL, NULL);
+    ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n");
+    CloseHandle(file);
+
+    src = SysAllocString(buffW1);
+    dst = SysAllocString(buffW2);
+    hr = IFileSystem3_MoveFolder(fs3, src, dst); /* src is regular file */
+    ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr);
+    SysFreeString(src);
+    SysFreeString(dst);
+    DeleteFileW(buffW1);
 }

static void test_DoOpenPipeStream(void)