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

* patch by taka_jp to set SysLocale.PriLangID on windows properly, resolves #14872

Browse Source 
git-svn-id: trunk@14570 -
This commit is contained in:
florian 2010-01-07 20:06:24 +00:00
parent 8166148a37
commit 3f17af3437
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtl/win/sysutils.pp
View File

@ -703,6 +703,8 @@ var
{ A call to GetSystemMetrics changes the value of the 8087 Control Word on
Pentium4 with WinXP SP2 }
old8087CW: word;
DefaultCustomLocaleID : LCID; // typedef DWORD LCID;
DefaultCustomLanguageID : Word; // typedef WORD LANGID;
begin
InitInternationalGeneric;
old8087CW:=Get8087CW;
@ -713,6 +715,28 @@ begin
SysLocale.SubLangID := SUBLANG_ENGLISH_US;
// probably needs update with getthreadlocale. post 2.0.2
DefaultCustomLocaleID := GetThreadLocale;
if DefaultCustomLocaleID <> 0 then
begin
{ Locale Identifiers
+-------------+---------+-------------------------+
| Reserved | Sort ID | Language ID |
+-------------+---------+-------------------------+
31 20 19 16 15 0 bit }
DefaultCustomLanguageID := DefaultCustomLocaleID and $FFFF; // 2^16
if DefaultCustomLanguageID <> 0 then
begin
SysLocale.DefaultLCID := DefaultCustomLocaleID;
{ Language Identifiers
+-------------------------+-------------------------+
| SubLanguage ID | Primary Language ID |
+-------------------------+-------------------------+
15 10 9 0 bit }
SysLocale.PriLangID := DefaultCustomLanguageID and $3ff; // 2^10
SysLocale.SubLangID := DefaultCustomLanguageID shr 10;
end;
end;
Set8087CW(old8087CW);
GetFormatSettings;
end;