paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 11:09:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* use FormatMessageW in SysErrorMessage, resolves issue #29197

Browse Source 
git-svn-id: trunk@32835 -
This commit is contained in:
florian 2016-01-03 15:56:31 +00:00
parent 77229a3cdf
commit d4d4689914
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/win/sysutils.pp
View File

@ -944,16 +944,16 @@ function SysErrorMessage(ErrorCode: Integer): String;
const
MaxMsgSize = Format_Message_Max_Width_Mask;
var
MsgBuffer: pChar;
MsgBuffer: PUnicodeChar;
begin
GetMem(MsgBuffer, MaxMsgSize);
FillChar(MsgBuffer^, MaxMsgSize, #0);
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM,
GetMem(MsgBuffer, MaxMsgSize*2);
FillChar(MsgBuffer^, MaxMsgSize*2, #0);
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM,
nil,
ErrorCode,
MakeLangId(LANG_NEUTRAL, SUBLANG_DEFAULT),
MsgBuffer, { This function allocs the memory }
MaxMsgSize, { Maximum message size }
MsgBuffer,
MaxMsgSize,
nil);
SysErrorMessage := MsgBuffer;
FreeMem(MsgBuffer, MaxMsgSize);