paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 04:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix WideChar -> UTF8 conversion in GetLocaleStr with fpc 2.6.4. Issue #31272. Patch by Luca Olivetti

Browse Source 
git-svn-id: trunk@54005 -
This commit is contained in:
blikblum 2017-01-26 01:34:29 +00:00
parent 076beac6c5
commit bb1a32ecba
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/lazutils/winlazutf8.inc
View File

@ -348,7 +348,7 @@ end;
function GetLocaleStr(aLocaleID, aLCType: Longint; const Def: string): String;
var
L: Integer;
L, ResultLen: Integer;
Buf: array[0..255] of WideChar;
begin
L := GetLocaleInfoW(aLocaleID, aLCType, Buf, SizeOf(Buf));
@ -358,7 +358,14 @@ begin
{$IF FPC_FULLVERSION >= 30000}
widestringmanager.Wide2AnsiMoveProc(PWideChar(@Buf[0]),Result,CP_UTF8,L-1);
{$ELSE}
widestringmanager.Wide2AnsiMoveProc(PWideChar(@Buf[0]),Result,CP_UTF8);
ResultLen:=WideCharToMultiByte(CP_UTF8,0,PWideChar(@Buf[0]),L-1,nil,0,nil,nil);
if ResultLen > 0 then
begin
SetLength(Result,ResultLen);
WideCharToMultiByte(CP_UTF8,0,PWideChar(@Buf[0]),L-1,@result[1],ResultLen,nil,nil)
end
else
Result:=Def;
{$ENDIF}
end
else