spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add new and refactor existing char<->wchar routines for Win32

pull/3/head
Hleb Valoshka 2019-07-14 23:13:39 +03:00
parent f05679db8e
commit 6d81fc780a
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/celutil/winutil.cpp
View File

@ -1,5 +1,6 @@
// winutil.h
// winutil.cpp
//
// Copyright (C) 2019, Celestia Development Team
// Copyright (C) 2002, Chris Laurel <claurel@shatters.net>
//
// This program is free software; you can redistribute it and/or
@ -55,7 +56,8 @@ const char* CurrentCP()
{
static bool set = false;
static char cp[20] = "CP";
if (!set) {
if (!set)
{
GetLocaleInfo(GetThreadLocale(), LOCALE_IDEFAULTANSICODEPAGE, cp+2, 18);
set = true;
}
@ -64,13 +66,42 @@ const char* CurrentCP()
string UTF8ToCurrentCP(const string& str)
{
string localeStr;
LPWSTR wout = new wchar_t[str.length() + 1];
LPSTR out = new char[str.length() + 1];
int wlength = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), -1, wout, str.length() + 1);
WideCharToMultiByte(CP_ACP, 0, wout, -1, out, str.length() + 1, nullptr, nullptr);
localeStr = out;
delete [] wout;
delete [] out;
return localeStr;
return WideToCurrentCP(UTF8ToWide(str));
}
string CurrentCPToUTF8(const string& str)
{
return WideToUTF8(CurrentCPToWide(str));
}
string WideToCurrentCP(const wstring& ws)
{
string out(ws.length()+1, 0);
WideCharToMultiByte(CP_ACP, 0, ws.c_str(), -1, &out[0], ws.length()+1, nullptr, nullptr);
return out;
}
wstring CurrentCPToWide(const string& str)
{
wstring w(str.length()+1, 0);
MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, &w[0], str.length()+1);
return w;
}
string WideToUTF8(const wstring& ws)
{
// get a converted string length
auto len = WideCharToMultiByte(CP_UTF8, 0, ws.c_str(), -1, nullptr, 0, nullptr, nullptr);
string out(len, 0);
WideCharToMultiByte(CP_UTF8, 0, ws.c_str(), -1, &out[0], len, nullptr, nullptr);
return out;
}
wstring UTF8ToWide(const string& s)
{
// get a converted string length
auto len = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, nullptr, 0);
wstring out(len, 0);
MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &out[0], len);
return out;
}

7
src/celutil/winutil.h
View File

@ -24,5 +24,10 @@ void RemoveButtonDefaultStyle(HWND hWnd);
void AddButtonDefaultStyle(HWND hWnd);
const char* CurrentCP();
string UTF8ToCurrentCP(const string& str);
string CurrentCPToUTF8(const string& str);
string WideToCurrentCP(const wstring& ws);
wstring CurrentCPToWide(const string& str);
string WideToUTF8(const wstring& ws);
wstring UTF8ToWide(const string& str);
#endif
#endif