[ros-diffs] [khornicek] 60158: [CRT] Check global_locale directly in setmbcp_l to prevent an endless recursion (__get_MSVCRT_locale -> __init_global_locale -> MSVCRT__create_locale -> _setmbcp_l -> __get_MSVCR...

Author: khornicek
Date: Mon Sep 16 11:55:50 2013
New Revision: 60158

URL: http://svn.reactos.org/svn/reactos?rev=60158&view=rev
Log:
[CRT]
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.

Added:
    trunk/reactos/media/nls/c_20127.nls   (with props)
Modified:
    trunk/reactos/boot/bootdata/hivesys.inf
    trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c
    trunk/reactos/media/nls/CMakeLists.txt

Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf	[iso-8859-1] Mon Sep 16 11:55:50 2013
@@ -830,6 +830,7 @@

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"

Modified: trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/_setm…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c	[iso-8859-1] Mon Sep 16 11:55:50 2013
@@ -206,7 +206,7 @@
   }
 
   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;

Modified: trunk/reactos/media/nls/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/CMakeLists.txt?r…
==============================================================================
--- trunk/reactos/media/nls/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/media/nls/CMakeLists.txt	[iso-8859-1] Mon Sep 16 11:55:50 2013
@@ -44,6 +44,7 @@
     c_10029.nls
     c_10079.nls
     c_10081.nls
+    c_20127.nls
     c_20866.nls
     c_21866.nls
     c_28591.nls

Added: trunk/reactos/media/nls/c_20127.nls
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_20127.nls?rev=…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/media/nls/c_20127.nls
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream