Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT]

Browse source 
Check global_locale directly in setmbcp_l to prevent an endless recursion (__get_MSVCRT_locale -> __init_global_locale -> MSVCRT__create_locale -> _setmbcp_l -> __get_MSVCRT_locale...) when global_locale is NULL.
[NLS]
Add c_20127.nls generated using Wine's CP tables.

svn path=/trunk/; revision=60158
This commit is contained in:
Kamil Hornicek 2013-09-16 11:55:50 +00:00
parent b9fd07e579
commit a36b2f010e
4 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/boot/bootdata/hivesys.inf
View file

@ -830,6 +830,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10007",0x00000000,"c_10007
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10029",0x00000000,"c_10029.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10079",0x00000000,"c_10079.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10081",0x00000000,"c_10081.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","20127",0x00000000,"c_20127.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","20866",0x00000000,"c_20866.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","21866",0x00000000,"c_21866.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","28591",0x00000000,"c_28591.nls"

2
reactos/lib/sdk/crt/mbstring/_setmbcp.c
View file

@ -206,7 +206,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo)
}
mbcinfo->mbcodepage = newcp;
if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo)
if(global_locale && mbcinfo == MSVCRT_locale->mbcinfo)
memcpy(_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(_mbctype));
return 0;

1
reactos/media/nls/CMakeLists.txt
View file

@ -44,6 +44,7 @@ list(APPEND NLS_FILES
c_10029.nls
c_10079.nls
c_10081.nls
c_20127.nls
c_20866.nls
c_21866.nls
c_28591.nls

BIN
reactos/media/nls/c_20127.nls Normal file
View file

Binary file not shown.