Move platform_directory_delete() to Path

src/openrct2/core/Path.cpp

@@ -104,4 +104,9 @@ namespace Path
     {
         return Platform::ResolveCasing(path, File::Exists(path));
     }
+
+    bool DeleteDirectory(std::string_view path)
+    {
+        return fs::remove_all(u8path(path)) > 0;
+    }
 } // namespace Path

src/openrct2/core/Path.hpp

@@ -26,6 +26,7 @@ namespace Path
     std::string GetDirectory(std::string_view path);
     void CreateDirectory(std::string_view path);
     bool DirectoryExists(std::string_view path);
+    bool DeleteDirectory(std::string_view path);
     std::string GetFileName(std::string_view origPath);
     std::string GetFileNameWithoutExtension(std::string_view path);
     std::string GetExtension(std::string_view path);

src/openrct2/platform/Posix.cpp

@@ -89,11 +89,6 @@ bool platform_ensure_directory_exists(const utf8* path)
     return true;
 }
 
-bool platform_directory_delete(const utf8* path)
-{
-    return fs::remove_all(u8path(path)) > 0;
-}
-
 std::string platform_get_absolute_path(const utf8* relative_path, const utf8* base_path)
 {
     std::string result;

src/openrct2/platform/Windows.cpp

@@ -70,26 +70,6 @@ bool platform_ensure_directory_exists(const utf8* path)
     return success != FALSE;
 }
 
-bool platform_directory_delete(const utf8* path)
-{
-    // Needs to be double-null terminated as pFrom is a null terminated array of strings
-    auto wPath = String::ToWideChar(path) + L"\0";
-
-    SHFILEOPSTRUCTW fileop;
-    fileop.hwnd = nullptr;                           // no status display
-    fileop.wFunc = FO_DELETE;                        // delete operation
-    fileop.pFrom = wPath.c_str();                    // source file name as double null terminated string
-    fileop.pTo = nullptr;                            // no destination needed
-    fileop.fFlags = FOF_NOCONFIRMATION | FOF_SILENT; // do not prompt the user
-
-    fileop.fAnyOperationsAborted = FALSE;
-    fileop.lpszProgressTitle = nullptr;
-    fileop.hNameMappings = nullptr;
-
-    int32_t ret = SHFileOperationW(&fileop);
-    return (ret == 0);
-}
-
 bool platform_lock_single_instance()
 {
     HANDLE mutex, status;

src/openrct2/platform/platform.h

@@ -89,7 +89,6 @@ void platform_refresh_video(bool recreate_window);
 // Platform specific definitions
 time_t platform_file_get_modified_time(const utf8* path);
 bool platform_ensure_directory_exists(const utf8* path);
-bool platform_directory_delete(const utf8* path);
 std::string platform_get_absolute_path(const utf8* relative_path, const utf8* base_path);
 bool platform_lock_single_instance();
 

src/openrct2/title/TitleSequenceManager.cpp

@@ -90,7 +90,7 @@ namespace TitleSequenceManager
         }
         else
         {
-            platform_directory_delete(path);
+            Path::DeleteDirectory(path);
         }
         _items.erase(_items.begin() + i);
     }