为项目使用HutaoString

Author: nahida-mono

src/Snap.Hutao.Remastered.Native.Test/Snap.Hutao.Remastered.Native.Test.vcxproj

@@ -118,6 +118,7 @@
     </ClCompile>
     <ClCompile Include="SimpleTestFramework.cpp" />
     <ClCompile Include="TestBase.cpp" />
+    <ClCompile Include="TestHutaoString.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -142,4 +143,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-</Project>
+</Project>

src/Snap.Hutao.Remastered.Native.Test/TestBase.cpp

@@ -62,65 +62,65 @@ void InitializeTestCallbacks()
 // Here you can add non-inline helper function implementations
 
 // Example: Helper function to create test directory
-bool CreateTestDirectory(const std::wstring& path)
+bool CreateTestDirectory(const HutaoString& path)
 {
-    if (CreateDirectoryW(path.c_str(), nullptr) || GetLastError() == ERROR_ALREADY_EXISTS)
+    if (CreateDirectoryW(path.Data(), nullptr) || GetLastError() == ERROR_ALREADY_EXISTS)
     {
-        wprintf(L"Created test directory: %s\n", path.c_str());
+        wprintf(L"Created test directory: %s\n", path.Data());
         return true;
     }
     else
     {
-        wprintf(L"Failed to create test directory: %s, error code: %d\n", path.c_str(), GetLastError());
+        wprintf(L"Failed to create test directory: %s, error code: %d\n", path.Data(), GetLastError());
         return false;
     }
 }
 
 // Example: Helper function to delete test file
-bool DeleteTestFile(const std::wstring& path)
+bool DeleteTestFile(const HutaoString& path)
 {
-    if (DeleteFileW(path.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND)
+    if (DeleteFileW(path.Data()) || GetLastError() == ERROR_FILE_NOT_FOUND)
     {
-        wprintf(L"Deleted test file: %s\n", path.c_str());
+        wprintf(L"Deleted test file: %s\n", path.Data());
         return true;
     }
     else
     {
-        wprintf(L"Failed to delete test file: %s, error code: %d\n", path.c_str(), GetLastError());
+        wprintf(L"Failed to delete test file: %s, error code: %d\n", path.Data(), GetLastError());
         return false;
     }
 }
 
 // Example: Helper function to verify file existence
-bool VerifyFileExists(const std::wstring& path)
+bool VerifyFileExists(const HutaoString& path)
 {
-    DWORD attributes = GetFileAttributesW(path.c_str());
+    DWORD attributes = GetFileAttributesW(path.Data());
     if (attributes != INVALID_FILE_ATTRIBUTES && !(attributes & FILE_ATTRIBUTE_DIRECTORY))
     {
-        wprintf(L"File exists: %s\n", path.c_str());
+        wprintf(L"File exists: %s\n", path.Data());
         return true;
     }
     else
     {
-        wprintf(L"File does not exist: %s\n", path.c_str());
+        wprintf(L"File does not exist: %s\n", path.Data());
         return false;
     }
 }
 
 // Example: Helper function to get file size
-uint64_t GetFileSizeHelper(const std::wstring& path)
+uint64_t GetFileSizeHelper(const HutaoString& path)
 {
-    HANDLE hFile = CreateFileW(path.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+    HANDLE hFile = CreateFileW(path.Data(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
     if (hFile == INVALID_HANDLE_VALUE)
     {
-        wprintf(L"Cannot open file to get size: %s, error code: %d\n", path.c_str(), GetLastError());
+        wprintf(L"Cannot open file to get size: %s, error code: %d\n", path.Data(), GetLastError());
         return 0;
     }
 
     LARGE_INTEGER fileSize;
     if (!GetFileSizeEx(hFile, &fileSize))
     {
-        wprintf(L"Failed to get file size: %s, error code: %d\n", path.c_str(), GetLastError());
+        wprintf(L"Failed to get file size: %s, error code: %d\n", path.Data(), GetLastError());
         CloseHandle(hFile);
         return 0;
     }

src/Snap.Hutao.Remastered.Native.Test/TestBase.h

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "HutaoNativeImports.h"
 #include "../Snap.Hutao.Remastered.Native/CustomImplements.h"
+#include "../Snap.Hutao.Remastered.Native/HutaoString.h"
 
 using namespace winrt;
 using namespace Windows::Foundation;
@@ -44,19 +45,25 @@ inline void TestAssert(bool condition, const wchar_t* message = nullptr)
     }
 }
 
-inline std::wstring FormatString(const wchar_t* format, ...)
+inline HutaoString FormatString(const wchar_t* format, ...)
 {
     va_list args;
     va_start(args, format);
 
     int len = _vscwprintf(format, args) + 1;
-    std::wstring buffer(len, L'\0');
-    _vsnwprintf_s(&buffer[0], len, _TRUNCATE, format, args);
+    HutaoString buffer;
+    buffer.EnsureCapacity(len);
 
+    // 临时缓冲区用于格式化
+    wchar_t* tempBuffer = new wchar_t[len];
+    _vsnwprintf_s(tempBuffer, len, _TRUNCATE, format, args);
+    
+    // 将格式化后的字符串设置到HutaoString
+    buffer = tempBuffer;
+    
+    delete[] tempBuffer;
     va_end(args);
 
-    // Remove trailing null character
-    buffer.resize(wcslen(buffer.c_str()));
     return buffer;
 }
 
@@ -140,29 +147,30 @@ class TestTimer
 class TestDataGenerator
 {
 public:
-    static std::wstring GenerateRandomString(size_t length)
+    static HutaoString GenerateRandomString(size_t length)
     {
         static const wchar_t charset[] = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
         static const size_t charsetSize = sizeof(charset) / sizeof(charset[0]) - 1;
 
-        std::wstring result;
-        result.reserve(length);
+        HutaoString result;
+        result.EnsureCapacity(length);
 
         for (size_t i = 0; i < length; ++i)
         {
-            result.push_back(charset[rand() % charsetSize]);
+            result.Append(&charset[rand() % charsetSize], 1);
         }
 
         return result;
     }
 
-    static std::wstring GenerateTestFilePath()
+    static HutaoString GenerateTestFilePath()
     {
         wchar_t tempPath[MAX_PATH];
         GetTempPathW(MAX_PATH, tempPath);
 
-        std::wstring fileName = L"hutao_test_" + GenerateRandomString(8) + L".tmp";
-        return std::wstring(tempPath) + fileName;
+        // 修复：避免使用 const wchar_t* + HutaoString 运算符
+        HutaoString fileName = HutaoString(L"hutao_test_") + GenerateRandomString(8) + L".tmp";
+        return HutaoString(tempPath) + fileName;
     }
 };