erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-23 00:37:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #9061 from keymanapp/fix/windows-improve-testhost-msg

Browse source
This commit is contained in:
Steven R. Loomis 2023-06-21 19:20:51 -05:00 • committed by GitHub
commit 0e4ace462d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
windows/src/engine/testhost/testhost.cpp
View file

@ -26,6 +26,7 @@ INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM);
void SizeEditWindow();
void StartKeyman();
void StopKeyman();
void Fail(PCWSTR message);
int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
_In_opt_ HINSTANCE hPrevInstance,
@ -298,7 +299,9 @@ Fail(PCWSTR message) {
std::vector<wchar_t> err(bufferLength);
std::wstring buf;
DWORD dwError = GetLastError();
if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, dwError, 0, err.data(), bufferLength, nullptr) != 0) {
if (dwError == ERROR_SUCCESS) {
buf = std::wstring(message) + L": no error code was returned"; // Don't append "The operation completed successfully."
} else if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, dwError, 0, err.data(), bufferLength, nullptr) != 0) {
std::wstring errb(err.data());
buf = std::wstring(message) + L":" + err.data() + L"[" + std::to_wstring(dwError) + L"]";
} else {