From: Francis De Brabandere <francisdb@gmail.com> Wrap MoveFileW on the stored path. --- dlls/scrrun/filesystem.c | 9 ++++-- dlls/scrrun/tests/filesystem.c | 52 ++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 3c246c6c2f7..8ff78a198c2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2712,8 +2712,13 @@ static HRESULT WINAPI folder_Copy(IFolder *iface, BSTR dest, VARIANT_BOOL overwr static HRESULT WINAPI folder_Move(IFolder *iface, BSTR dest) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(dest)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(dest)); + + if (!MoveFileW(This->path, dest)) + return create_error(GetLastError()); + + return S_OK; } static HRESULT WINAPI folder_get_IsRootFolder(IFolder *iface, VARIANT_BOOL *isroot) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5bf3a860988..68c34d07584 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -3144,6 +3144,7 @@ static void test_File_Delete(void) HANDLE hf; DWORD attrs; + /* Create a normal file and delete it. */ get_temp_path(NULL, pathW); hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); if (hf == INVALID_HANDLE_VALUE) @@ -3166,6 +3167,7 @@ static void test_File_Delete(void) IFile_Release(file); SysFreeString(path); + /* Create a readonly file and try deleting without force. */ hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if (hf == INVALID_HANDLE_VALUE) { @@ -3184,6 +3186,7 @@ static void test_File_Delete(void) attrs = GetFileAttributesW(pathW); ok(attrs != INVALID_FILE_ATTRIBUTES, "file should still exist\n"); + /* Now delete with force. */ hr = IFile_Delete(file, VARIANT_TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3213,6 +3216,7 @@ static void test_File_Move(void) CloseHandle(hf); get_temp_path(NULL, dst_path); + /* get_temp_path creates and deletes, so dst_path is free. */ path = SysAllocString(src_path); hr = IFileSystem3_GetFile(fs3, path, &file); @@ -3253,6 +3257,7 @@ static void test_Folder_Delete(void) return; } + /* Create a file inside the folder. */ lstrcpyW(file_path, dir_path); lstrcatW(file_path, L"\\testfile.txt"); hf = CreateFileW(file_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); @@ -3272,6 +3277,7 @@ static void test_Folder_Delete(void) IFolder_Release(folder); SysFreeString(path); + /* Test deleting folder containing a readonly file with force. */ ok(CreateDirectoryW(dir_path, NULL), "CreateDirectory failed, error %ld\n", GetLastError()); lstrcpyW(file_path, dir_path); lstrcatW(file_path, L"\\readonly.txt"); @@ -3299,6 +3305,47 @@ static void test_Folder_Delete(void) SysFreeString(path); } +static void test_Folder_Move(void) +{ + WCHAR temp_path[MAX_PATH], src_path[MAX_PATH], dst_path[MAX_PATH]; + IFolder *folder; + BSTR path, dst; + HRESULT hr; + DWORD attrs; + + GetTempPathW(MAX_PATH, temp_path); + lstrcpyW(src_path, temp_path); + lstrcatW(src_path, L"scrrun_move_src"); + lstrcpyW(dst_path, temp_path); + lstrcatW(dst_path, L"scrrun_move_dst"); + + if (!CreateDirectoryW(src_path, NULL)) + { + skip("Can't create temporary directory\n"); + return; + } + + path = SysAllocString(src_path); + hr = IFileSystem3_GetFolder(fs3, path, &folder); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + dst = SysAllocString(dst_path); + hr = IFolder_Move(folder, dst); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(src_path); + ok(attrs == INVALID_FILE_ATTRIBUTES, "source folder should be gone\n"); + + attrs = GetFileAttributesW(dst_path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "destination folder should exist\n"); + ok(attrs & FILE_ATTRIBUTE_DIRECTORY, "expected directory attribute\n"); + + IFolder_Release(folder); + SysFreeString(path); + SysFreeString(dst); + RemoveDirectoryW(dst_path); +} + START_TEST(filesystem) { HRESULT hr; @@ -3348,10 +3395,11 @@ START_TEST(filesystem) test_GetSpecialFolder(); test_MoveFile(); test_MoveFolder(); + test_DoOpenPipeStream(); test_File_Delete(); - test_Folder_Delete(); test_File_Move(); - test_DoOpenPipeStream(); + test_Folder_Delete(); + test_Folder_Move(); IFileSystem3_Release(fs3); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10680