anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix string conversion

Browse source
This commit is contained in:
LAGonauta 2021-02-23 07:04:43 -03:00
parent 1d1b00222f
commit 7fd918f32d
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/windows-notification/api/src/converter.cpp
View file

@ -3,18 +3,6 @@
#include "converter.hpp" #include "converter.hpp"
// Convert a wide Unicode string to an UTF8 string // Convert a wide Unicode string to an UTF8 string
std::string wstr_to_str(const std::wstring_view wstr)
{
if(wstr.empty())
{
return std::string();
}
int final_size = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(), nullptr, 0, nullptr, nullptr);
std::string strTo(final_size, 0);
WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(), strTo.data(), final_size, nullptr, nullptr);
return strTo;
}
char* wsview_to_char(const std::wstring_view wstr) char* wsview_to_char(const std::wstring_view wstr)
{ {
if(wstr.empty()) if(wstr.empty())

2
plugins/windows-notification/api/src/win32.cpp
View file

@ -10,6 +10,7 @@ std::optional<std::wstring> GetCurrentModulePath()
auto charWritten = GetModuleFileName(nullptr, exePath.data(), exePath.size()); auto charWritten = GetModuleFileName(nullptr, exePath.data(), exePath.size());
if (charWritten > 0) if (charWritten > 0)
{ {
exePath.resize(charWritten);
return exePath; return exePath;
} }
return std::nullopt; return std::nullopt;
@ -21,6 +22,7 @@ std::optional<std::wstring> GetShortcutPath()
auto charWritten = GetEnvironmentVariable(L"APPDATA", shortcutPath.data(), shortcutPath.size()); auto charWritten = GetEnvironmentVariable(L"APPDATA", shortcutPath.data(), shortcutPath.size());
if (charWritten > 0) if (charWritten > 0)
{ {
shortcutPath.resize(charWritten);
return shortcutPath; return shortcutPath;
} }
return std::nullopt; return std::nullopt;