Fixed warning of incorrect wide to narrow string conversion

nefarius · Aug 13, 2023 · fad8d37 · fad8d37
1 parent f41b738
commit fad8d37
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/Injector/Injector.cpp b/Injector/Injector.cpp
@@ -11,6 +11,7 @@
 #include "Injector.h"
 #include "EnsureCleanup.h"
 #include "StringUtil.h"
+#include "UniUtil.h"
 
 // Static data
 Injector* Injector::m_pSingleton = 0;
@@ -231,8 +232,12 @@ std::tstring Injector::GetPath( const std::tstring& ModuleName )
 	// Check path/file is valid
 	if (GetFileAttributes(ModulePath.c_str()) == INVALID_FILE_ATTRIBUTES)
 	{
-		std::string NewModulePath(ModulePath.begin(),ModulePath.end());
-		throw std::runtime_error("Could not find module. Path: '" + NewModulePath + "'.");
+#ifdef _UNICODE
+		std::string NarrowModulePath(ConvertWideToANSI(ModulePath));
+#else
+		std::string NarrowModulePath(ModulePath.begin(), ModulePath.end());
+#endif
+		throw std::runtime_error("Could not find module. Path: '" + NarrowModulePath + "'.");
 	}
 
 	// Return module path

diff --git a/Injector/Injector.vcxproj b/Injector/Injector.vcxproj
@@ -335,6 +335,7 @@
     <ClInclude Include="Seh.h" />
     <ClInclude Include="StringUtil.h" />
     <ClInclude Include="StringWrap.h" />
+    <ClInclude Include="UniUtil.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Injector.rc" />

diff --git a/Injector/Injector.vcxproj.filters b/Injector/Injector.vcxproj.filters
@@ -44,6 +44,9 @@
     <ClInclude Include="StringUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="UniUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Injector.rc">

diff --git a/Injector/UniUtil.h b/Injector/UniUtil.h
@@ -0,0 +1,19 @@
+#pragma once
+#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1
+#include <locale>  // wstring_convert
+
+std::string ConvertWideToANSI(const std::wstring& wstr)
+{
+    int count = WideCharToMultiByte(CP_ACP, 0, wstr.c_str(), (int)wstr.length(), NULL, 0, NULL, NULL);
+    std::string str(count, 0);
+    WideCharToMultiByte(CP_ACP, 0, wstr.c_str(), -1, &str[0], count, NULL, NULL);
+    return str;
+}
+
+std::wstring ConvertAnsiToWide(const std::string& str)
+{
+    int count = MultiByteToWideChar(CP_ACP, 0, str.c_str(), (int)str.length(), NULL, 0);
+    std::wstring wstr(count, 0);
+    MultiByteToWideChar(CP_ACP, 0, str.c_str(), (int)str.length(), &wstr[0], count);
+    return wstr;
+}