lib/common/win32: Extract unicode_to_mb() to separate file

This commit is contained in:
Povilas Kanapickas 2021-10-30 00:52:56 +03:00
parent 15a955ff21
commit 8286c85dc0
3 changed files with 54 additions and 10 deletions

View File

@ -16,25 +16,17 @@
*/ */
#include "../DataDirectories.h" #include "../DataDirectories.h"
#include "encoding_utilities.h"
#include <Shlobj.h> #include <Shlobj.h>
std::string unicode_to_mb(const WCHAR* utfStr)
{
int utfLength = lstrlenW(utfStr);
int mbLength = WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, NULL, 0, NULL, NULL);
std::string mbStr(mbLength, 0);
WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, &mbStr[0], mbLength, NULL, NULL);
return mbStr;
}
std::string known_folder_path(const KNOWNFOLDERID& id) std::string known_folder_path(const KNOWNFOLDERID& id)
{ {
std::string path; std::string path;
WCHAR* buffer; WCHAR* buffer;
HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer); HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer);
if (result == S_OK) { if (result == S_OK) {
path = unicode_to_mb(buffer); path = win_wchar_to_utf8(buffer);
CoTaskMemFree(buffer); CoTaskMemFree(buffer);
} }
return path; return path;

View File

@ -0,0 +1,27 @@
/*
barrier -- mouse and keyboard sharing utility
Copyright (C) Barrier contributors
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
found in the file LICENSE that should have accompanied this file.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "encoding_utilities.h"
std::string win_wchar_to_utf8(const WCHAR* utfStr)
{
int utfLength = lstrlenW(utfStr);
int mbLength = WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, NULL, 0, NULL, NULL);
std::string mbStr(mbLength, 0);
WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, &mbStr[0], mbLength, NULL, NULL);
return mbStr;
}

View File

@ -0,0 +1,25 @@
/*
barrier -- mouse and keyboard sharing utility
Copyright (C) Barrier contributors
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
found in the file LICENSE that should have accompanied this file.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef BARRIER_LIB_COMMON_WIN32_ENCODING_UTILITIES_H
#define BARRIER_LIB_COMMON_WIN32_ENCODING_UTILITIES_H
#include <string>
std::string win_wchar_to_utf8(const WCHAR* utfStr);
#endif