更换选择文件夹窗口的样式

Author: nahida-mouo

src/Snap.Hutao.Remastered.Native.Packaging/Snap.Hutao.Remastered.Native.Packaging.csproj

@@ -5,7 +5,7 @@
 		<NoPackageAnalysis>true</NoPackageAnalysis>
 
 		<PackageId>Snap.Hutao.Remastered.Native</PackageId>
-		<Version>1.0.4</Version>
+		<Version>1.0.5</Version>
 		<Authors>SnapHutaoRemasteringProject</Authors>
 		<Description>Native x64 libraries for Snap.Hutao.Remastered</Description>
 		<PackageTags>native;snap;hutao</PackageTags>

src/Snap.Hutao.Remastered.Native/HutaoAString.h

@@ -89,6 +89,8 @@ class HUTAOASTRING_API HutaoAString : public hutao::CustomImplements<HutaoAStrin
 	static bool IsNullOrEmpty(const HutaoAString& str);
 	static HutaoAString Join(const hutao::Array<HutaoAString>& values, PCSTR separator);
 
+	static HutaoAString Empty;
+
 private:
 	hutao::Array<char> m_buffer;  // 使用自定义Array，不使用std::string
 

src/Snap.Hutao.Remastered.Native/HutaoNativeFileSystem.cpp

@@ -446,55 +446,58 @@ HRESULT __stdcall HutaoNativeFileSystem::PickFolder(HWND hwnd, PCWSTR title, BOO
 {
     AssertNonNullAndReturn(picked);
     AssertNonNullAndReturn(path);
-    
+
     *picked = FALSE;
-    *path = nullptr;
-    
-    // Initialize COM for BROWSEINFO
-    HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
-    if (FAILED(hr) && hr != RPC_E_CHANGED_MODE)
+    *path = &HutaoString::Empty;
+
+    IFileOpenDialog* pFileDialog = nullptr;
+    HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_ALL,
+        IID_IFileOpenDialog, reinterpret_cast<void**>(&pFileDialog));
+
+    DWORD dwOptions;
+    hr = pFileDialog->GetOptions(&dwOptions);
+    if (SUCCEEDED(hr))
     {
-        ThrowForHR(hr, "CoInitializeEx failed in PickFolder");
-        return hr;
+        hr = pFileDialog->SetOptions(dwOptions | FOS_PICKFOLDERS);
     }
-    
-    // Prepare BROWSEINFOW structure
-    BROWSEINFOW bi = { 0 };
-    bi.hwndOwner = hwnd;
-    bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
-    
-    if (title != nullptr)
+
+    if (SUCCEEDED(hr) && title != nullptr)
     {
-        bi.lpszTitle = title;
+        pFileDialog->SetTitle(title);
     }
-    
-    // Show folder dialog
-    PIDLIST_ABSOLUTE pidl = SHBrowseForFolderW(&bi);
-    if (pidl != nullptr)
+
+    if (SUCCEEDED(hr))
     {
-        wchar_t folderPath[MAX_PATH];
-        if (SHGetPathFromIDListW(pidl, folderPath))
+        hr = pFileDialog->Show(hwnd);
+        if (SUCCEEDED(hr))
         {
-            *picked = TRUE;
-            IHutaoString* pString = nullptr;
-            hr = CreateHutaoStringFromWideString(folderPath, &pString);
+            IShellItem* pItem = nullptr;
+            hr = pFileDialog->GetResult(&pItem);
             if (SUCCEEDED(hr))
             {
-                *path = pString;
+                wchar_t* folderPath = nullptr;
+                hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &folderPath);
+                if (SUCCEEDED(hr))
+                {
+                    *picked = TRUE;
+                    IHutaoString* pString = nullptr;
+                    hr = CreateHutaoStringFromWideString(folderPath, &pString);
+                    if (SUCCEEDED(hr))
+                    {
+                        *path = pString;
+                    }
+                    CoTaskMemFree(folderPath);
+                }
+                pItem->Release();
             }
         }
-        
-        // Free PIDL
-        CoTaskMemFree(pidl);
-    }
-    
-    CoUninitialize();
-    
-    if (FAILED(hr))
-    {
-        ThrowForHR(hr, "PickFolder failed");
+        else if (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED))
+        {
+            hr = S_OK;
+        }
     }
-    
+    pFileDialog->Release();
+
     return hr;
 }
 

src/Snap.Hutao.Remastered.Native/HutaoString.h

@@ -91,6 +91,8 @@ class HUTAOSTRING_API HutaoString : public hutao::CustomImplements<HutaoString,
 	static bool IsNullOrEmpty(const HutaoString& str);
 	static HutaoString Join(const hutao::Array<HutaoString>& values, PCWSTR separator);
 
+	static HutaoString Empty;
+
 private:
 	hutao::Array<wchar_t> m_buffer;  // 使用自定义Array，不使用HutaoString