[hbelusca] 74366: [CONSOLE.CPL]: Paint the text samples using the correct character set (derived from the current code page). This e.g. fixes display for the backslash symbol in CJK languages (that...

Author: hbelusca
Date: Mon Apr 17 23:26:07 2017
New Revision: 74366
URL: http://svn.reactos.org/svn/reactos?rev=74366&view=rev
Log:
[CONSOLE.CPL]: Paint the text samples using the correct character set (derived from the
current code page).
This e.g. fixes display for the backslash symbol in CJK languages (that should appear as
the Chinese "yuan" / Japanese "yen" currency symbol ¥, or the Korean
"won" currency symbol ₩).
CORE-12451
Modified:
    trunk/reactos/dll/cpl/console/layout.c
    trunk/reactos/dll/cpl/console/options.c
Modified: trunk/reactos/dll/cpl/console/layout.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/console/layout.c      [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/layout.c      [iso-8859-1] Mon Apr 17 23:26:07 2017
@@ -131,7 +131,7 @@
                        FALSE,
                        FALSE,
                        FALSE,
-                       OEM_CHARSET,
+                       CodePageToCharSet(pConInfo->CodePage),
                        OUT_DEFAULT_PRECIS,
                        CLIP_DEFAULT_PRECIS,
                        DEFAULT_QUALITY,
@@ -233,11 +233,11 @@
         case WM_NOTIFY:
         {
-            LPNMUPDOWN  lpnmud =  (LPNMUPDOWN)lParam;
-            LPPSHNOTIFY lppsn  = (LPPSHNOTIFY)lParam;
+            LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
             if (lppsn->hdr.code == UDN_DELTAPOS)
             {
+                LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
                 DWORD wheight, wwidth;
                 DWORD sheight, swidth;
                 DWORD left, top;
Modified: trunk/reactos/dll/cpl/console/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?…
==============================================================================
--- trunk/reactos/dll/cpl/console/options.c     [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/options.c     [iso-8859-1] Mon Apr 17 23:26:07 2017
@@ -107,11 +107,12 @@
         case WM_NOTIFY:
         {
-            LPNMUPDOWN  lpnmud =  (LPNMUPDOWN)lParam;
-            LPPSHNOTIFY lppsn  = (LPPSHNOTIFY)lParam;
+            LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
             if (lppsn->hdr.code == UDN_DELTAPOS)
             {
+                LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
+
                 if (lppsn->hdr.idFrom == IDC_UPDOWN_BUFFER_SIZE)
                 {
                     lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 1),
999);