From: Francis De Brabandere <francisdb@gmail.com> file_Delete wraps DeleteFileW, honouring the Force flag by clearing readonly attributes. folder_Delete recursively removes contents via the existing delete_file/delete_folder helpers, then RemoveDirectoryW. --- dlls/scrrun/filesystem.c | 48 +++++++++++-- dlls/scrrun/tests/filesystem.c | 126 +++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index af76f0cf4d8..e841795de97 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -197,6 +197,8 @@ static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); static HRESULT create_filecoll_enum(struct filecollection*, IUnknown**); +static inline HRESULT delete_file(const WCHAR*, DWORD, VARIANT_BOOL); +static HRESULT delete_folder(const WCHAR*, DWORD, VARIANT_BOOL); static HRESULT create_drivecoll_enum(struct drivecollection*, IUnknown**); static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len); static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date); @@ -2667,8 +2669,37 @@ static HRESULT WINAPI folder_get_Type(IFolder *iface, BSTR *type) static HRESULT WINAPI folder_Delete(IFolder *iface, VARIANT_BOOL force) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%x): stub\n", This, force); - return E_NOTIMPL; + WCHAR path[MAX_PATH]; + DWORD len; + HRESULT hr; + + TRACE("(%p)->(%x)\n", This, force); + + len = SysStringLen(This->path); + if (len + 3 >= MAX_PATH) + return E_FAIL; + + memcpy(path, This->path, len * sizeof(WCHAR)); + path[len] = '\\'; + path[len + 1] = '*'; + path[len + 2] = 0; + + hr = delete_file(path, len + 2, force); + if (FAILED(hr)) + return hr; + + hr = delete_folder(path, len + 2, force); + if (FAILED(hr)) + return hr; + + if (!RemoveDirectoryW(This->path)) + { + if (!force || !SetFileAttributesW(This->path, FILE_ATTRIBUTE_NORMAL) + || !RemoveDirectoryW(This->path)) + return create_error(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI folder_Copy(IFolder *iface, BSTR dest, VARIANT_BOOL overwrite) @@ -3143,8 +3174,17 @@ static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType) static HRESULT WINAPI file_Delete(IFile *iface, VARIANT_BOOL Force) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%x)\n", This, Force); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, Force); + + if (!DeleteFileW(This->path)) + { + if (!Force || !SetFileAttributesW(This->path, FILE_ATTRIBUTE_NORMAL) + || !DeleteFileW(This->path)) + return create_error(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI file_Copy(IFile *iface, BSTR Destination, VARIANT_BOOL OverWriteFiles) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 9b5abdf5c97..4c30f327aeb 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -3135,6 +3135,130 @@ static void test_DoOpenPipeStream(void) ITextStream_Release(stream_write); } +static void test_File_Delete(void) +{ + WCHAR pathW[MAX_PATH]; + IFile *file; + BSTR path; + HRESULT hr; + HANDLE hf; + DWORD attrs; + + get_temp_path(NULL, pathW); + hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hf == INVALID_HANDLE_VALUE) + { + skip("Can't create temporary file\n"); + return; + } + CloseHandle(hf); + + path = SysAllocString(pathW); + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IFile_Delete(file, VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(pathW); + ok(attrs == INVALID_FILE_ATTRIBUTES, "expected file to be deleted\n"); + + IFile_Release(file); + SysFreeString(path); + + hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + if (hf == INVALID_HANDLE_VALUE) + { + skip("Can't create temporary readonly file\n"); + return; + } + CloseHandle(hf); + + path = SysAllocString(pathW); + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IFile_Delete(file, VARIANT_FALSE); + ok(hr == CTL_E_PERMISSIONDENIED, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(pathW); + ok(attrs != INVALID_FILE_ATTRIBUTES, "file should still exist\n"); + + hr = IFile_Delete(file, VARIANT_TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(pathW); + ok(attrs == INVALID_FILE_ATTRIBUTES, "expected file to be deleted\n"); + + IFile_Release(file); + SysFreeString(path); +} + +static void test_Folder_Delete(void) +{ + WCHAR temp_path[MAX_PATH], dir_path[MAX_PATH], file_path[MAX_PATH]; + IFolder *folder; + BSTR path; + HRESULT hr; + HANDLE hf; + DWORD attrs; + + GetTempPathW(MAX_PATH, temp_path); + lstrcpyW(dir_path, temp_path); + lstrcatW(dir_path, L"scrrun_del_test"); + + if (!CreateDirectoryW(dir_path, NULL)) + { + skip("Can't create temporary directory\n"); + return; + } + + 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); + ok(hf != INVALID_HANDLE_VALUE, "CreateFile failed, error %ld\n", GetLastError()); + CloseHandle(hf); + + path = SysAllocString(dir_path); + hr = IFileSystem3_GetFolder(fs3, path, &folder); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IFolder_Delete(folder, VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(dir_path); + ok(attrs == INVALID_FILE_ATTRIBUTES, "expected folder to be deleted\n"); + + IFolder_Release(folder); + SysFreeString(path); + + ok(CreateDirectoryW(dir_path, NULL), "CreateDirectory failed, error %ld\n", GetLastError()); + lstrcpyW(file_path, dir_path); + lstrcatW(file_path, L"\\readonly.txt"); + hf = CreateFileW(file_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + ok(hf != INVALID_HANDLE_VALUE, "CreateFile failed, error %ld\n", GetLastError()); + CloseHandle(hf); + + path = SysAllocString(dir_path); + hr = IFileSystem3_GetFolder(fs3, path, &folder); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IFolder_Delete(folder, VARIANT_FALSE); + ok(hr == CTL_E_PERMISSIONDENIED, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(dir_path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "folder should still exist\n"); + + hr = IFolder_Delete(folder, VARIANT_TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + attrs = GetFileAttributesW(dir_path); + ok(attrs == INVALID_FILE_ATTRIBUTES, "expected folder to be deleted\n"); + + IFolder_Release(folder); + SysFreeString(path); +} + START_TEST(filesystem) { HRESULT hr; @@ -3184,6 +3308,8 @@ START_TEST(filesystem) test_GetSpecialFolder(); test_MoveFile(); test_MoveFolder(); + test_File_Delete(); + test_Folder_Delete(); test_DoOpenPipeStream(); IFileSystem3_Release(fs3); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10680