Fix truncated string conversion

merge/2021-11-19
kaetemi 3 years ago
parent ef4fb03143
commit d235885d70
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -823,21 +823,18 @@ void setEditTextMultiLine (CListBox &listBox, const std::vector<std::string> &ve
bool setWindowTextUTF8 (HWND hwnd, const std::string &textUtf8) bool setWindowTextUTF8 (HWND hwnd, const std::string &textUtf8)
{ {
ucstring str; return SetWindowTextW(hwnd, nlUtf8ToWide(textUtf8)) != FALSE;
str.fromUtf8 (textUtf8);
return SetWindowTextW (hwnd, (WCHAR*)str.c_str()) != FALSE;
} }
// *************************************************************************** // ***************************************************************************
bool getWindowTextUTF8 (HWND hwnd, std::string &textUtf8) bool getWindowTextUTF8 (HWND hwnd, std::string &textUtf8)
{ {
ucstring text; wstring text;
text.resize (GetWindowTextLengthW (hwnd)); text.resize(GetWindowTextLengthW(hwnd));
if (GetWindowTextW (hwnd, (WCHAR*)text.c_str(), text.size())) if (GetWindowTextW(hwnd, &text[0], text.size() + 1))
{ {
textUtf8 = text.toUtf8 ().c_str(); textUtf8 = NLMISC::wideToUtf8(text);
return true; return true;
} }
else else

Loading…
Cancel
Save