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

* use FormatMessageW in SysErrorMessage, resolves issue

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

40
rtl/win/sysutils.pp
View File

@ -472,7 +472,7 @@ Var
begin
FD := CreateFileW (PWideChar (FileName), GENERIC_READ or GENERIC_WRITE,
FILE_SHARE_WRITE, nil, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS, 0);
FILE_FLAG_BACKUP_SEMANTICS, 0);
If (Fd<>feInvalidHandle) then
try
Result:=FileSetDate(fd,Age);
@ -482,7 +482,7 @@ begin
else
Result:=GetLastOSError;
end;
{$ENDIF}
{$ENDIF}
Function FileGetAttr (Const FileName : UnicodeString) : Longint;
begin
@ -605,7 +605,7 @@ end;
function GetLocalTimeOffset: Integer;
var
var
TZInfo: TTimeZoneInformation;
begin
@ -619,7 +619,7 @@ begin
else
Result := 0;
end;
end;
end;
function GetTickCount: LongWord;
@ -655,7 +655,7 @@ begin
{$ENDIF}
Result := Windows.GetTickCount;
end;
{****************************************************************************
Misc Functions
@ -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);
@ -1252,19 +1252,19 @@ function DoCompareStringW(P1, P2: PWideChar; L1, L2: PtrUInt; Flags: DWORD): Ptr
end;
const
WinAPICompareFlags : array [TCompareOption] of LongWord
= ({LINGUISTIC_IGNORECASE, LINGUISTIC_IGNOREDIACRITIC, }NORM_IGNORECASE{,
WinAPICompareFlags : array [TCompareOption] of LongWord
= ({LINGUISTIC_IGNORECASE, LINGUISTIC_IGNOREDIACRITIC, }NORM_IGNORECASE{,
NORM_IGNOREKANATYPE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS, NORM_IGNOREWIDTH,
NORM_LINGUISTIC_CASING, SORT_DIGITSASNUMBERS, SORT_STRINGSORT});
function Win32CompareWideString(const s1, s2 : WideString; Options : TCompareOptions) : PtrInt;
Var
O : LongWord;
O : LongWord;
CO : TCompareOption;
begin
O:=0;
O:=0;
for CO in TCompareOption do
if CO in Options then
O:=O or WinAPICompareFlags[CO];
@ -1358,11 +1358,11 @@ function Win32AnsiStrUpper(Str: PChar): PChar;
function Win32CompareUnicodeString(const s1, s2 : UnicodeString; Options : TCompareOptions) : PtrInt;
Var
O : LongWord;
O : LongWord;
CO : TCompareOption;
begin
O:=0;
O:=0;
for CO in TCompareOption do
if CO in Options then
O:=O or WinAPICompareFlags[CO];