From bba87b1ebc3b6b8331d6880734f2966dd017c696 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Wed, 20 Aug 2014 14:46:17 +0100 Subject: [PATCH] UTF-8 <-> UTF-16 conversion fixes. Might be a fix for #194. --- src/backend/helpers.cpp | 8 ++++---- src/gui/handler.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/helpers.cpp b/src/backend/helpers.cpp index 659a9455..8ecbc69b 100644 --- a/src/backend/helpers.cpp +++ b/src/backend/helpers.cpp @@ -180,11 +180,11 @@ namespace loot { key = HKEY_USERS; BOOST_LOG_TRIVIAL(trace) << "Getting registry object for key and subkey: " << keyStr << " + " << subkey; - LONG ret = RegOpenKeyEx(key, fs::path(subkey).wstring().c_str(), 0, KEY_READ|KEY_WOW64_32KEY, &hKey); + LONG ret = RegOpenKeyEx(key, ToWinWide(subkey).c_str(), 0, KEY_READ|KEY_WOW64_32KEY, &hKey); if (ret == ERROR_SUCCESS) { BOOST_LOG_TRIVIAL(trace) << "Getting value for entry: " << value; - ret = RegQueryValueEx(hKey, fs::path(value).wstring().c_str(), NULL, NULL, (LPBYTE)&val, &BufferSize); + ret = RegQueryValueEx(hKey, ToWinWide(value).c_str(), NULL, NULL, (LPBYTE)&val, &BufferSize); RegCloseKey(hKey); if (ret == ERROR_SUCCESS) @@ -335,7 +335,7 @@ namespace loot { Version::Version(const fs::path& file) { #ifdef _WIN32 DWORD dummy = 0; - DWORD size = GetFileVersionInfoSize(file.wstring().c_str(), &dummy); + DWORD size = GetFileVersionInfoSize(ToWinWide(file.string()).c_str(), &dummy); if (size > 0) { LPBYTE point = new BYTE[size]; @@ -343,7 +343,7 @@ namespace loot { VS_FIXEDFILEINFO *info; string ver; - GetFileVersionInfo(file.wstring().c_str(),0,size,point); + GetFileVersionInfo(ToWinWide(file.string()).c_str(),0,size,point); VerQueryValue(point,L"\\",(LPVOID *)&info,&uLen); diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index 62000bc9..19f767cc 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -932,7 +932,7 @@ namespace loot { CefWindowHandle hwnd = browser->GetHost()->GetWindowHandle(); #ifdef _WIN32 - SetWindowText(hwnd, std::wstring(title).c_str()); + SetWindowText(hwnd, ToWinWide(title).c_str()); #endif }