Implements GetConsoleTextEncoding for Windows

git-svn-id: trunk@33079 -
This commit is contained in:
sekelsenmat 2011-10-25 07:39:48 +00:00
parent 9cd742005b
commit 5f53fe15b9

View File

@ -137,7 +137,9 @@ var EncodingValid: boolean = false;
{$include asiancodepagefunctions.inc}
{$IFDEF Windows}
function GetWindowsEncoding: string;
// AConsole - If false, it is the general system encoding,
// if true, it is the console encoding
function GetWindowsEncoding(AConsole: Boolean = False): string;
var
cp : UINT;
{$IFDEF WinCE}
@ -146,7 +148,9 @@ const
CP_UTF8 = 65001;
{$ENDIF}
begin
cp := GetACP;
if AConsole then cp := GetOEMCP
else cp := GetACP;
case cp of
CP_UTF8: Result := EncodingUTF8;
else
@ -204,8 +208,8 @@ end;
function GetConsoleTextEncoding: string;
begin
{$ifdef Windows}
// ToDo
Result := GetDefaultTextEncoding;
Result:=GetWindowsEncoding(True);
Result:=NormalizeEncoding(Result);
{$else}
Result := GetDefaultTextEncoding;
{$endif}