diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitInit.h | 3 | ||||
| -rw-r--r-- | include/comphelper/windowserrorstring.hxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index c82fb7b08d1d..f95ee49634b5 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -100,7 +100,8 @@ extern "C" static char *lok_dlerror(void) { LPSTR buf = NULL; - FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, reinterpret_cast<LPSTR>(&buf), 0, NULL); + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, GetLastError(), 0, reinterpret_cast<LPSTR>(&buf), 0, NULL); return buf; } diff --git a/include/comphelper/windowserrorstring.hxx b/include/comphelper/windowserrorstring.hxx index bb4b16241ca5..1b50f1eadb58 100644 --- a/include/comphelper/windowserrorstring.hxx +++ b/include/comphelper/windowserrorstring.hxx @@ -21,7 +21,7 @@ inline OUString WindowsErrorString(DWORD nErrorCode) { LPWSTR pMsgBuf; - if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, nErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), @@ -33,7 +33,7 @@ inline OUString WindowsErrorString(DWORD nErrorCode) OUString result(o3tl::toU(pMsgBuf)); result.endsWith("\r\n", &result); - LocalFree(pMsgBuf); + HeapFree(GetProcessHeap(), 0, pMsgBuf); return result; } |