From 417e293fac68f293bb2b0dcfb10350a7c7febfbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 17 Apr 2017 23:26:07 +0000 Subject: [PATCH] =?utf8?q?[CONSOLE.CPL]:=20Paint=20the=20text=20samples=20?= =?utf8?q?using=20the=20correct=20character=20set=20(derived=20from=20the?= =?utf8?q?=20current=20code=20page).=20This=20e.g.=20fixes=20display=20for?= =?utf8?q?=20the=20backslash=20symbol=20in=20CJK=20languages=20(that=20sho?= =?utf8?q?uld=20appear=20as=20the=20Chinese=20"yuan"=20/=20Japanese=20"yen?= =?utf8?q?"=20currency=20symbol=20=C2=A5,=20or=20the=20Korean=20"won"=20cu?= =?utf8?q?rrency=20symbol=20=E2=82=A9).=20CORE-12451?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=74366 --- reactos/dll/cpl/console/layout.c | 6 +++--- reactos/dll/cpl/console/options.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/reactos/dll/cpl/console/layout.c b/reactos/dll/cpl/console/layout.c index 43ed500df04..19c56b96685 100644 --- a/reactos/dll/cpl/console/layout.c +++ b/reactos/dll/cpl/console/layout.c @@ -131,7 +131,7 @@ PaintText(LPDRAWITEMSTRUCT drawItem, FALSE, FALSE, FALSE, - OEM_CHARSET, + CodePageToCharSet(pConInfo->CodePage), OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, @@ -233,11 +233,11 @@ LayoutProc(HWND hwndDlg, 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; diff --git a/reactos/dll/cpl/console/options.c b/reactos/dll/cpl/console/options.c index b4508489be9..ec97f968eab 100644 --- a/reactos/dll/cpl/console/options.c +++ b/reactos/dll/cpl/console/options.c @@ -107,11 +107,12 @@ OptionsProc(HWND hwndDlg, 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); -- 2.17.1