Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SYSDM] pt-PT.rc Fix compiler warning RC4206 CORE-17827
by Joachim Henze 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf984cc9fe38a57a735aa… commit cf984cc9fe38a57a735aabf5ed6089f1fe4dbc28 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 12:06:26 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 12:06:26 2022 +0100 [SYSDM] pt-PT.rc Fix compiler warning RC4206 CORE-17827 Thanks to Twitter user @denzilferreira for that shortened string. --- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 88b7222da66..6ec4cd443f4 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -156,7 +156,7 @@ CAPTION "Perfis de utilizador" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Os perfis de utilizador contêm definições para o ambiente de trabalho e outras informações relacionadas ao inicio de sessão. Pode criar um perfil diferente em cada computador que utilizar, ou pode seleccionar o mesmo perfil guardado no servidor, em cada um dos computadores que utiliza.", IDC_STATIC, 40, 5, 211, 43 + LTEXT "Os perfis de utilizador contêm definições para o ambiente de trabalho e outras informações relacionadas ao início de sessão. Crie um perfil novo, ou restaure um perfil do servidor por cada computador.", IDC_STATIC, 40, 5, 211, 43 LTEXT "Perfis armazenados neste computador:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

1 0

[reactos] 01/01: [SYSDM] sq-AL.rc Fix compiler warning RC4206 CORE-17827
by Joachim Henze 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bacc0479ce6779821760a… commit bacc0479ce6779821760aab7a6bc7665fc8daad9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 10:13:40 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 10:13:40 2022 +0100 [SYSDM] sq-AL.rc Fix compiler warning RC4206 CORE-17827 Thanks to Twitter users @illyrian598 and @jan_shkreli for that shortened string. --- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 3e70ea1e83e..9126bda3707 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -152,7 +152,7 @@ CAPTION "Profili Përdoruesit" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Profilet e përdoruesve përmbajnë parametrat e desktop-it dhe informacione të tjera në lidhje me hyrjen tuaj. Një profil i ndryshëm mund të krijohet në çdo kompjuter që ju përdorni, ose ju mund të zgjidhni një profil kryesorë që është i njëjtë në çdo kompjuter që ju përdorni.", IDC_STATIC, 40, 11, 211, 35 //TOO LONG, MAX 256 CHARS ALLOWED + LTEXT "Profilet e përdoruesve përmbajnë parametrat e desktop-it dhe informacione të tjera në lidhje me hyrjen. Një profil i ndryshëm mund të krijohet në çdo kompjuter që ju përdorni. Zgjidhni një profil kryesor që është i njëjtë në çdo kompjuter në pëdorim.", IDC_STATIC, 40, 11, 211, 35 LTEXT "Profilet e ruajtura në këtë kompjuter:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

1 0

[reactos] 01/01: [SYSDM] sk-SK.rc Fix compiler warning RC4206 CORE-17827
by Joachim Henze 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98999eebe4cfd6031813a… commit 98999eebe4cfd6031813af94a1d4da656ca468d3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 08:09:14 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 08:09:14 2022 +0100 [SYSDM] sk-SK.rc Fix compiler warning RC4206 CORE-17827 Vic Marcal reached out for help on Twitter for that shortened string. --- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 33003aea862..a0d14702b4d 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -160,7 +160,7 @@ CAPTION "Používateľské profily" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Používateľské profily obsahujú nastavenia pracovnej plochy a iné informácie týkajúce sa používateľského konta. Na každom používanom počítači je možné vytvoriť iný profil alebo je možné vybrať zdieľaný profil, ktorý je rovnaký na všetkých používaných počítačoch.", IDC_STATIC, 40, 11, 204, 44 //TOO LONG, MAX 256 CHARS ALLOWED + LTEXT "Používateľské profily obsahujú nastavenia pracovnej plochy a iné informácie ohľadom používateľského konta. Na každom používanom počítači je možné vytvoriť iný profil alebo možno vybrať zdieľaný profil, ktorý je rovnaký na všetkých používaných počítačoch.", IDC_STATIC, 40, 11, 204, 44 LTEXT "&Profily uložené na tomto počítači:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

1 0

[reactos] 01/01: [SYSDM] el-GR.rc Fix compiler warning RC4206
by Joachim Henze 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1264c13f767e0ba6175c… commit b1264c13f767e0ba6175c842adb362553d266554 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 08:03:28 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 08:03:28 2022 +0100 [SYSDM] el-GR.rc Fix compiler warning RC4206 Vic Marcal reached out for help on Twitter for that shortened string. --- dll/cpl/sysdm/lang/el-GR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 6e8605809f5..612d28c8faa 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -152,7 +152,7 @@ CAPTION "Προφίλ χρηστών" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Στα προφίλ χρήστη αποθηκεύονται ρυθμίσεις για την επιφάνεια εργασίας και άλλες πληροφορίες σχετικές με το λογαριασμό χρήστη σας. Μπορείτε να δημιουργήσετε ένα διαφορετικό προφίλ για κάθε υπολογιστή που χρησιμοποιείτε ή μπορείτε να επιλέξετε ένα προφίλ περιαγωγής το οποίο είναι το ίδιο σε κάθε υπολογιστή που χρησιμοποιείτε.", IDC_STATIC, 40, 3, 204, 40 //TOO LONG, MAX 256 CHARS ALLOWED + LTEXT "Στο προφίλ χρήστη αποθηκεύονται ρυθμίσεις επιφάνειας εργασίας και άλλες πληροφορίες του λογαριασμού σας. Μπορείτε να επιλέξετε προφίλ περιαγωγής, αν θέλετε να συνδέεστε σε αυτό απο πολλαπλούς υπολογιστές.", IDC_STATIC, 40, 3, 204, 40 LTEXT "Απο&θηκευμένα προφίλ σε αυτόν τον υπολογιστή:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

1 0

[reactos] 01/01: [NTUSER] Implement NtUserBuildHimcList (#4286)
by Katayama Hirofumi MZ 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce6da820a4bdba5ef108d… commit ce6da820a4bdba5ef108d4b9c3de7e7161839d26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 16 09:56:18 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 16 09:56:18 2022 +0900 [NTUSER] Implement NtUserBuildHimcList (#4286) - Add UserBuildHimcList helper function. - Implement NtUserBuildHimcList function. CORE-11700 --- win32ss/user/ntuser/ime.c | 85 +++++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/ntstubs.c | 8 ---- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 48faba31700..3a8af9d46a9 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -12,6 +12,38 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) +{ + PIMC pIMC; + DWORD dwRealCount = 0; + + if (pti) + { + for (pIMC = pti->spDefaultImc; pIMC; pIMC = pIMC->pImcNext) + { + if (dwRealCount < dwCount) + phList[dwRealCount] = UserHMGetHandle(pIMC); + + ++dwRealCount; + } + } + else + { + for (pti = GetW32ThreadInfo()->ppi->ptiList; pti; pti = pti->ptiSibling) + { + for (pIMC = pti->spDefaultImc; pIMC; pIMC = pIMC->pImcNext) + { + if (dwRealCount < dwCount) + phList[dwRealCount] = UserHMGetHandle(pIMC); + + ++dwRealCount; + } + } + } + + return dwRealCount; +} + UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { @@ -38,6 +70,59 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM w return 0; } +NTSTATUS +APIENTRY +NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount) +{ + NTSTATUS ret = STATUS_UNSUCCESSFUL; + DWORD dwRealCount; + PTHREADINFO pti; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + { + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + if (dwThreadId == 0) + { + pti = GetW32ThreadInfo(); + } + else if (dwThreadId == INVALID_THREAD_ID) + { + pti = NULL; + } + else + { + pti = IntTID2PTI(UlongToHandle(dwThreadId)); + if (!pti || !pti->rpdesk) + goto Quit; + } + + _SEH2_TRY + { + ProbeForWrite(phList, dwCount * sizeof(HIMC), 1); + ProbeForWrite(pdwCount, sizeof(DWORD), 1); + *pdwCount = dwRealCount = UserBuildHimcList(pti, dwCount, phList); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + goto Quit; + } + _SEH2_END; + + if (dwCount < dwRealCount) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_SUCCESS; + +Quit: + UserLeave(); + return ret; +} + BOOL WINAPI NtUserGetImeHotKey(IN DWORD dwHotKey, OUT LPUINT lpuModifiers, diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 226ad3980c5..cdb801dc765 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -51,14 +51,6 @@ NtUserBitBltSysBmp( return Ret; } -NTSTATUS -APIENTRY -NtUserBuildHimcList(DWORD dwThreadId, DWORD dwCount, HIMC *phList, LPDWORD pdwCount) -{ - STUB; - return STATUS_NOT_IMPLEMENTED; -} - DWORD APIENTRY NtUserDragObject(

1 0

[reactos] 01/01: [USER32] Adjust the threshold in CascadeWindows (#4283)
by Katayama Hirofumi MZ 16 Jan '22

16 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2250ce80f3165462e30cf… commit 2250ce80f3165462e30cfcd147daaf597b5d1c4f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 16 09:54:44 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 16 09:54:44 2022 +0900 [USER32] Adjust the threshold in CascadeWindows (#4283) Improve the threshold of CascadeWindows function not to make the windows too small. --- win32ss/user/user32/windows/mdi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c index 2849c0d6612..59a3d06c506 100644 --- a/win32ss/user/user32/windows/mdi.c +++ b/win32ss/user/user32/windows/mdi.c @@ -2157,10 +2157,12 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, if (info.chwnd != 1 && (GetWindowLongPtrW(hwnd, GWL_STYLE) & WS_THICKFRAME)) { /* check the size */ -#define THRESHOLD(xy) (((xy) * 5) / 7) /* in the rate 5/7 */ - cxNew = min(cxNew, THRESHOLD(cxWork)); - cyNew = min(cyNew, THRESHOLD(cyWork)); -#undef THRESHOLD +#define MIN_THRESHOLD(xy) (((xy) * 4) / 7) /* in the rate 4/7 */ +#define MAX_THRESHOLD(xy) (((xy) * 5) / 7) /* in the rate 5/7 */ + cxNew = max(min(cxNew, MAX_THRESHOLD(cxWork)), MIN_THRESHOLD(cxWork)); + cyNew = max(min(cyNew, MAX_THRESHOLD(cyWork)), MIN_THRESHOLD(cyWork)); +#undef MIN_THRESHOLD +#undef MAX_THRESHOLD if (cx != cxNew || cy != cyNew) { /* too large. shrink if we can */

1 0

[reactos] 01/01: [PSDK] Add prototypes CreateProcessWithLogonW and CreateProcessWithTokenW
by Eric Kohl 15 Jan '22

15 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=463d312169f6763fa5166… commit 463d312169f6763fa51663e87d71e5abbd297331 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 15 18:23:59 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 15 18:23:59 2022 +0100 [PSDK] Add prototypes CreateProcessWithLogonW and CreateProcessWithTokenW --- sdk/include/psdk/winbase.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 12e61c70900..9cf4147563a 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1731,6 +1731,8 @@ CreateProcessAsUserA( _Out_ LPPROCESS_INFORMATION); BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +BOOL WINAPI CreateProcessWithTokenW(HANDLE,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); BOOL

1 0

[reactos] 03/03: [CONSRV] Trivially implement TuiSetCodePage(). CORE-17601
by Hermès Bélusca-Maïto 15 Jan '22

15 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ffe4318274c91f7d9af1… commit 1ffe4318274c91f7d9af117ff049598487d97227 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 4 00:51:49 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 15 17:41:36 2022 +0100 [CONSRV] Trivially implement TuiSetCodePage(). CORE-17601 --- win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index a3f60e3895d..e0ecef01d38 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -1131,9 +1131,17 @@ static BOOL NTAPI TuiSetCodePage(IN OUT PFRONTEND This, UINT CodePage) { - // TODO: Find a suitable console font for the given code page, - // and set it if found; otherwise fail the call, or fall back - // to some default font... + // PTUI_CONSOLE_DATA TuiData = This->Context; + + // TODO: Verify that the console is the visible one. + // Only then can we change the output code page font. + + if (!TuiSetConsoleOutputCP(ConsoleDeviceHandle, CodePage)) + { + DPRINT1("Failed to load the font for codepage %d\n", CodePage); + /* Let's suppose the font is good enough to continue */ + return FALSE; + } return TRUE; }

1 0

[reactos] 02/03: [BLUE][CONSRV][USETUP] Completely remove support for CAB font extraction from driver, and move it to CONSRV, much like what was done for USETUP.
by Hermès Bélusca-Maïto 15 Jan '22

15 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f201d462d32048148296… commit 9f201d462d3204814829609d0f0d159142170ffb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 4 01:46:52 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 15 17:41:36 2022 +0100 [BLUE][CONSRV][USETUP] Completely remove support for CAB font extraction from driver, and move it to CONSRV, much like what was done for USETUP. Addendum to aaa416d3 and 2391e31c. --- base/setup/usetup/console.c | 13 +- drivers/setup/blue/blue.c | 43 +--- drivers/setup/blue/blue.h | 33 +-- drivers/setup/blue/font.c | 236 +------------------ sdk/include/reactos/drivers/blue/ntddblue.h | 1 - win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 258 ++++++++++++++++++++- 6 files changed, 271 insertions(+), 313 deletions(-) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index ab3587eb52e..5cbcf839be1 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -692,8 +692,8 @@ WINAPI SetConsoleOutputCP( IN UINT wCodepage) { - WCHAR FontName[100]; - WCHAR FontFile[] = L"\\SystemRoot\\vgafonts.cab"; + static PCWSTR FontFile = L"\\SystemRoot\\vgafonts.cab"; + WCHAR FontName[20]; CONSOLE_CABINET_CONTEXT ConsoleCabinetContext; PCABINET_CONTEXT CabinetContext = &ConsoleCabinetContext.CabinetContext; CAB_SEARCH Search; @@ -719,7 +719,8 @@ SetConsoleOutputCP( return FALSE; } - swprintf(FontName, L"%u-8x8.bin", wCodepage); + RtlStringCbPrintfW(FontName, sizeof(FontName), + L"%u-8x8.bin", wCodepage); CabStatus = CabinetFindFirst(CabinetContext, FontName, &Search); if (CabStatus != CAB_STATUS_SUCCESS) { @@ -732,7 +733,7 @@ SetConsoleOutputCP( CabinetClose(CabinetContext); if (CabStatus != CAB_STATUS_SUCCESS) { - DPRINT("CabinetLoadFile('%S', '%S') returned 0x%08x\n", FontFile, FontName, CabStatus); + DPRINT("CabinetExtractFile('%S', '%S') returned 0x%08x\n", FontFile, FontName, CabStatus); if (ConsoleCabinetContext.Data) RtlFreeHeap(ProcessHeap, 0, ConsoleCabinetContext.Data); return FALSE; @@ -744,7 +745,7 @@ SetConsoleOutputCP( NULL, NULL, &IoStatusBlock, - IOCTL_CONSOLE_SETFONT, + IOCTL_CONSOLE_LOADFONT, ConsoleCabinetContext.Data, ConsoleCabinetContext.Size, NULL, @@ -753,7 +754,7 @@ SetConsoleOutputCP( RtlFreeHeap(ProcessHeap, 0, ConsoleCabinetContext.Data); if (!NT_SUCCESS(Status)) - return FALSE; + return FALSE; LastLoadedCodepage = wCodepage; return TRUE; diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 2ca5c70389c..81011fe10cc 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -38,8 +38,7 @@ typedef struct _DEVICE_EXTENSION USHORT Rows; /* Number of rows */ USHORT Columns; /* Number of columns */ USHORT CursorX, CursorY; /* Cursor position */ - PUCHAR FontBitfield; /* Specifies the font. If NULL, use CodePage */ - ULONG CodePage; /* Specifies the font associated to this code page */ + PUCHAR FontBitfield; /* Specifies the font */ } DEVICE_EXTENSION, *PDEVICE_EXTENSION; typedef struct _VGA_REGISTERS @@ -484,15 +483,9 @@ ScrAcquireOwnership( // DeviceExtension->CursorX = min(max(DeviceExtension->CursorX, 0), DeviceExtension->Columns - 1); DeviceExtension->CursorY = min(max(DeviceExtension->CursorY, 0), DeviceExtension->Rows - 1); + /* Set the font */ if (DeviceExtension->FontBitfield) - { ScrSetFont(DeviceExtension->FontBitfield); - } - else - { - /* Upload a default font for the current codepage */ - ScrLoadFontTable(DeviceExtension->CodePage); - } DPRINT("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, @@ -529,7 +522,6 @@ ScrResetScreen( DeviceExtension->CharAttribute = BACKGROUND_BLUE | FOREGROUND_LIGHTGRAY; DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; - DeviceExtension->CodePage = 437; /* Use default codepage */ } if (Enable) @@ -1503,32 +1495,10 @@ ScrIoControl( case IOCTL_CONSOLE_LOADFONT: { - /* Validate input buffer */ - if (stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - ASSERT(Irp->AssociatedIrp.SystemBuffer); - - if (DeviceExtension->FontBitfield) - { - ExFreePoolWithTag(DeviceExtension->FontBitfield, TAG_BLUE); - DeviceExtension->FontBitfield = NULL; - } - DeviceExtension->CodePage = *(PULONG)Irp->AssociatedIrp.SystemBuffer; - - /* Upload a font for the codepage if needed */ - if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) - ScrLoadFontTable(DeviceExtension->CodePage); - - Irp->IoStatus.Information = 0; - Status = STATUS_SUCCESS; - break; - } + // + // FIXME: For the moment we support only a fixed 256-char 8-bit font. + // - case IOCTL_CONSOLE_SETFONT: - { /* Validate input buffer */ if (stk->Parameters.DeviceIoControl.InputBufferLength < 256 * 8) { @@ -1537,7 +1507,6 @@ ScrIoControl( } ASSERT(Irp->AssociatedIrp.SystemBuffer); - DeviceExtension->CodePage = 0; if (DeviceExtension->FontBitfield) ExFreePoolWithTag(DeviceExtension->FontBitfield, TAG_BLUE); DeviceExtension->FontBitfield = ExAllocatePoolWithTag(NonPagedPool, 256 * 8, TAG_BLUE); @@ -1548,7 +1517,7 @@ ScrIoControl( } RtlCopyMemory(DeviceExtension->FontBitfield, Irp->AssociatedIrp.SystemBuffer, 256 * 8); - /* Upload the font if needed */ + /* Set the font if needed */ if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) ScrSetFont(DeviceExtension->FontBitfield); diff --git a/drivers/setup/blue/blue.h b/drivers/setup/blue/blue.h index 3a3af7a4511..6baadfb83f0 100644 --- a/drivers/setup/blue/blue.h +++ b/drivers/setup/blue/blue.h @@ -67,35 +67,9 @@ typedef struct tagCONSOLE_CURSOR_INFO #define BACKGROUND_RED 0x0040 #define BACKGROUND_INTENSITY 0x0080 -typedef struct _CFHEADER -{ - ULONG Signature; // File signature 'MSCF' (CAB_SIGNATURE) - ULONG Reserved1; // Reserved field - ULONG CabinetSize; // Cabinet file size - ULONG Reserved2; // Reserved field - ULONG FileTableOffset; // Offset of first CFFILE - ULONG Reserved3; // Reserved field - USHORT Version; // Cabinet version (CAB_VERSION) - USHORT FolderCount; // Number of folders - USHORT FileCount; // Number of files - USHORT Flags; // Cabinet flags (CAB_FLAG_*) - USHORT SetID; // Cabinet set id - USHORT CabinetNumber; // Zero-based cabinet number -} CFHEADER, *PCFHEADER; - -typedef struct _CFFILE -{ - ULONG FileSize; // Uncompressed file size in bytes - ULONG FileOffset; // Uncompressed offset of file in the folder - USHORT FileControlID; // File control ID (CAB_FILE_*) - USHORT FileDate; // File date stamp, as used by DOS - USHORT FileTime; // File time stamp, as used by DOS - USHORT Attributes; // File attributes (CAB_ATTRIB_*) - /* After this is the NULL terminated filename */ -} CFFILE, *PCFFILE; - -#define CAB_SIGNATURE 0x4643534D // "MSCF" - +/* + * VGA registers + */ #define VIDMEM_BASE 0xb8000 #define BITPLANE_BASE 0xa0000 @@ -144,7 +118,6 @@ typedef struct _CFFILE #define PELINDEX (PUCHAR)0x3c8 #define PELDATA (PUCHAR)0x3c9 -VOID ScrLoadFontTable(_In_ ULONG CodePage); VOID ScrSetFont(_In_ PUCHAR FontBitfield); #endif /* _BLUE_PCH_ */ diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 57342c86235..5e09a58a707 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -10,58 +10,17 @@ /* INCLUDES ***************************************************************/ #include "blue.h" -#include <ndk/rtlfuncs.h> -#define NDEBUG -#include <debug.h> +// +// FIXME: For the moment we support only a fixed 256-char 8-bit font. +// -NTSTATUS ExtractFont(_In_ ULONG CodePage, _In_ PUCHAR FontBitField); VOID OpenBitPlane(VOID); VOID CloseBitPlane(VOID); VOID LoadFont(_In_ PUCHAR Bitplane, _In_ PUCHAR FontBitfield); /* FUNCTIONS ****************************************************************/ -VOID -ScrLoadFontTable( - _In_ ULONG CodePage) -{ - PHYSICAL_ADDRESS BaseAddress; - PUCHAR Bitplane; - PUCHAR FontBitfield = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - FontBitfield = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_BLUE); - if (FontBitfield == NULL) - { - DPRINT1("ExAllocatePoolWithTag failed\n"); - return; - } - - /* open bit plane for font table access */ - OpenBitPlane(); - - /* get pointer to video memory */ - BaseAddress.QuadPart = BITPLANE_BASE; - Bitplane = (PUCHAR)MmMapIoSpace(BaseAddress, 0xFFFF, MmNonCached); - - Status = ExtractFont(CodePage, FontBitfield); - if (NT_SUCCESS(Status)) - { - LoadFont(Bitplane, FontBitfield); - } - else - { - DPRINT1("ExtractFont failed with Status 0x%lx\n", Status); - } - - MmUnmapIoSpace(Bitplane, 0xFFFF); - ExFreePoolWithTag(FontBitfield, TAG_BLUE); - - /* close bit plane */ - CloseBitPlane(); -} - VOID ScrSetFont( _In_ PUCHAR FontBitfield) @@ -86,195 +45,6 @@ ScrSetFont( /* PRIVATE FUNCTIONS *********************************************************/ -NTSTATUS -ExtractFont( - _In_ ULONG CodePage, - _In_ PUCHAR FontBitField) -{ - BOOLEAN bFoundFile = FALSE; - HANDLE Handle; - NTSTATUS Status; - CHAR FileName[20]; - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName; - UNICODE_STRING SourceName; - CFHEADER CabFileHeader; - CFFILE CabFile; - ULONG CabFileOffset = 0; - LARGE_INTEGER ByteOffset; - WCHAR SourceBuffer[MAX_PATH] = { L'\0' }; - ULONG ReadCP; - - if (KeGetCurrentIrql() != PASSIVE_LEVEL) - return STATUS_INVALID_DEVICE_STATE; - - RtlInitUnicodeString(&LinkName, - L"\\SystemRoot"); - - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - - Status = ZwOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenSymbolicLinkObject failed with Status 0x%lx\n", Status); - return Status; - } - - SourceName.Length = 0; - SourceName.MaximumLength = MAX_PATH * sizeof(WCHAR); - SourceName.Buffer = SourceBuffer; - - Status = ZwQuerySymbolicLinkObject(Handle, - &SourceName, - NULL); - ZwClose(Handle); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwQuerySymbolicLinkObject failed with Status 0x%lx\n", Status); - return Status; - } - - Status = RtlAppendUnicodeToString(&SourceName, L"\\vgafonts.cab"); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppendUnicodeToString failed with Status 0x%lx\n", Status); - return Status; - } - - InitializeObjectAttributes(&ObjectAttributes, - &SourceName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - - Status = ZwCreateFile(&Handle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OPEN, - FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error: Cannot open vgafonts.cab (0x%lx)\n", Status); - return Status; - } - - ByteOffset.QuadPart = 0; - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - &CabFileHeader, - sizeof(CabFileHeader), - &ByteOffset, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error: Cannot read from file (0x%lx)\n", Status); - goto Exit; - } - - if (CabFileHeader.Signature != CAB_SIGNATURE) - { - DPRINT1("Invalid CAB signature: 0x%lx!\n", CabFileHeader.Signature); - Status = STATUS_UNSUCCESSFUL; - goto Exit; - } - - // We have a valid CAB file! - // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. - ByteOffset.QuadPart = CabFileHeader.FileTableOffset; - - while (CabFileHeader.FileCount) - { - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - &CabFile, - sizeof(CabFile), - &ByteOffset, - NULL); - - if (NT_SUCCESS(Status)) - { - ByteOffset.QuadPart += sizeof(CabFile); - - // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. - // This should be enough for our purpose. - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FileName, - sizeof(FileName), - &ByteOffset, - NULL); - - if (NT_SUCCESS(Status)) - { - if (!bFoundFile) - { - Status = RtlCharToInteger(FileName, 0, &ReadCP); - if (NT_SUCCESS(Status) && ReadCP == CodePage) - { - // We got the correct file. - // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. - CabFileOffset = CabFile.FileOffset; - bFoundFile = TRUE; - } - } - - ByteOffset.QuadPart += strlen(FileName) + 1; - } - } - - CabFileHeader.FileCount--; - } - - // 8 = Size of a CFFOLDER structure (see cabman). As we don't need the values of that structure, just increase the offset here. - ByteOffset.QuadPart += 8; - ByteOffset.QuadPart += CabFileOffset; - - // ByteOffset now contains the offset of the actual data, so we can read the RAW font - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FontBitField, - 2048, - &ByteOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwReadFile failed with Status 0x%lx\n", Status); - } - -Exit: - - ZwClose(Handle); - return Status; -} - /* Font-load specific funcs */ VOID OpenBitPlane(VOID) diff --git a/sdk/include/reactos/drivers/blue/ntddblue.h b/sdk/include/reactos/drivers/blue/ntddblue.h index 1c6d22e5008..0d41d0f158d 100644 --- a/sdk/include/reactos/drivers/blue/ntddblue.h +++ b/sdk/include/reactos/drivers/blue/ntddblue.h @@ -22,7 +22,6 @@ #define IOCTL_CONSOLE_DRAW CTL_CODE(FILE_DEVICE_SCREEN, 0x830, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_LOADFONT CTL_CODE(FILE_DEVICE_SCREEN, 0x840, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) -#define IOCTL_CONSOLE_SETFONT CTL_CODE(FILE_DEVICE_SCREEN, 0x841, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) /* TYPEDEFS **************************************************************/ diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index 3bc48c85940..a3f60e3895d 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -4,7 +4,7 @@ * FILE: win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c * PURPOSE: TUI Terminal Front-End - Virtual Consoles... * PROGRAMMERS: David Welch - * G� van Geldorp + * Gé van Geldorp * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -26,7 +26,41 @@ #include <debug.h> -/* GLOBALS ********************************************************************/ +/* CAB FILE STRUCTURES ******************************************************/ + +typedef struct _CFHEADER +{ + ULONG Signature; // File signature 'MSCF' (CAB_SIGNATURE) + ULONG Reserved1; // Reserved field + ULONG CabinetSize; // Cabinet file size + ULONG Reserved2; // Reserved field + ULONG FileTableOffset; // Offset of first CFFILE + ULONG Reserved3; // Reserved field + USHORT Version; // Cabinet version (CAB_VERSION) + USHORT FolderCount; // Number of folders + USHORT FileCount; // Number of files + USHORT Flags; // Cabinet flags (CAB_FLAG_*) + USHORT SetID; // Cabinet set id + USHORT CabinetNumber; // Zero-based cabinet number +} CFHEADER, *PCFHEADER; + +typedef struct _CFFILE +{ + ULONG FileSize; // Uncompressed file size in bytes + ULONG FileOffset; // Uncompressed offset of file in the folder + USHORT FileControlID; // File control ID (CAB_FILE_*) + USHORT FileDate; // File date stamp, as used by DOS + USHORT FileTime; // File time stamp, as used by DOS + USHORT Attributes; // File attributes (CAB_ATTRIB_*) + /* After this is the NULL terminated filename */ + // CHAR FileName[ANYSIZE_ARRAY]; +} CFFILE, *PCFFILE; + +#define CAB_SIGNATURE 0x4643534D // "MSCF" +#define CAB_VERSION 0x0103 + + +/* GLOBALS ******************************************************************/ #define ConsoleOutputUnicodeToAnsiChar(Console, dChar, sWChar) \ do { \ @@ -374,8 +408,222 @@ TuiConsoleThread(PVOID Param) return 0; } +static BOOLEAN +TuiSetConsoleOutputCP( + IN HANDLE hNtConddHandle, + IN UINT CodePage) +{ + static UINT LastLoadedCodepage = 0; + UNICODE_STRING FontFile = RTL_CONSTANT_STRING(L"\\SystemRoot\\vgafonts.cab"); + CHAR FontName[20]; + + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + // ULONG ReadCP; + PUCHAR FontBitField = NULL; + + /* CAB-specific data */ + HANDLE FileSectionHandle; + PUCHAR FileBuffer = NULL; + SIZE_T FileSize = 0; + PCFHEADER CabFileHeader; + union + { + PCFFILE CabFile; + PVOID Buffer; + } Data; + PCFFILE FoundFile = NULL; + PSTR FileName; + USHORT Index; + + if (CodePage == LastLoadedCodepage) + return TRUE; + + /* + * Open the *uncompressed* fonts archive file. + */ + InitializeObjectAttributes(&ObjectAttributes, + &FontFile, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Cannot open '%wZ' (0x%lx)\n", &FontFile, Status); + return FALSE; + } + + /* + * Load it. + */ + Status = NtCreateSection(&FileSectionHandle, + SECTION_ALL_ACCESS, + 0, 0, + PAGE_READONLY, + SEC_COMMIT, + FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSection failed (0x%lx)\n", Status); + goto Exit; + } + + Status = NtMapViewOfSection(FileSectionHandle, + NtCurrentProcess(), + (PVOID*)&FileBuffer, + 0, 0, NULL, + &FileSize, + ViewUnmap, + 0, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtMapViewOfSection failed (0x%lx)\n", Status); + goto Exit; + } + + /* Wrap in SEH to protect against ill-formed file */ + _SEH2_TRY + { + DPRINT("Cabinet file '%wZ' opened and mapped to 0x%p\n", + &FontFile, FileBuffer); + + CabFileHeader = (PCFHEADER)FileBuffer; + + /* Validate the CAB file */ + if (FileSize <= sizeof(CFHEADER) || + CabFileHeader->Signature != CAB_SIGNATURE || + CabFileHeader->Version != CAB_VERSION || + CabFileHeader->FolderCount == 0 || + CabFileHeader->FileCount == 0 || + CabFileHeader->FileTableOffset < sizeof(CFHEADER)) + { + DPRINT1("Cabinet file '%wZ' has an invalid header\n", &FontFile); + Status = STATUS_UNSUCCESSFUL; + _SEH2_YIELD(goto Exit); + } + + /* + * Find the font file within the archive. + */ + RtlStringCbPrintfA(FontName, sizeof(FontName), + "%u-8x8.bin", CodePage); + + /* Read the file table, find the file of interest and the end of the table */ + Data.CabFile = (PCFFILE)(FileBuffer + CabFileHeader->FileTableOffset); + for (Index = 0; Index < CabFileHeader->FileCount; ++Index) + { + FileName = (PSTR)(Data.CabFile + 1); + + if (!FoundFile) + { + // Status = RtlCharToInteger(FileName, 0, &ReadCP); + // if (NT_SUCCESS(Status) && (ReadCP == CodePage)) + if (_stricmp(FontName, FileName) == 0) + { + /* We've got the correct file. Save the offset and + * loop through the rest of the file table to find + * the position, where the actual data starts. */ + FoundFile = Data.CabFile; + } + } + + /* Move to the next file (go past the filename NULL terminator) */ + Data.CabFile = (PCFFILE)(strchr(FileName, 0) + 1); + } + + if (!FoundFile) + { + DPRINT("File '%S' not found in cabinet '%wZ'\n", + FontName, &FontFile); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + _SEH2_YIELD(goto Exit); + } + + /* + * Extract the font file. + */ + /* Verify the font file size; we only support a fixed 256-char 8-bit font */ + if (FoundFile->FileSize != 256 * 8) + { + DPRINT1("File of size %lu is not of the expected size %lu\n", + FoundFile->FileSize, 256 * 8); + Status = STATUS_INVALID_BUFFER_SIZE; + _SEH2_YIELD(goto Exit); + } + + FontBitField = RtlAllocateHeap(RtlGetProcessHeap(), 0, FoundFile->FileSize); + if (!FontBitField) + { + DPRINT1("ExAllocatePoolWithTag(%lu) failed\n", FoundFile->FileSize); + Status = STATUS_NO_MEMORY; + _SEH2_YIELD(goto Exit); + } + + /* 8 = Size of a CFFOLDER structure (see cabman). As we don't need + * the values of that structure, just increase the offset here. */ + Data.Buffer = (PVOID)((ULONG_PTR)Data.Buffer + 8); // sizeof(CFFOLDER); + Data.Buffer = (PVOID)((ULONG_PTR)Data.Buffer + FoundFile->FileOffset); + + /* Data.Buffer now points to the actual data of the RAW font */ + RtlCopyMemory(FontBitField, Data.Buffer, FoundFile->FileSize); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("TuiSetConsoleOutputCP - Caught an exception, Status = 0x%08lx\n", Status); + } + _SEH2_END; + + /* + * Load the font. + */ + if (NT_SUCCESS(Status)) + { + ASSERT(FoundFile); + ASSERT(FontBitField); + Status = NtDeviceIoControlFile(hNtConddHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_LOADFONT, + FontBitField, + FoundFile->FileSize, + NULL, + 0); + } + + if (FontBitField) + RtlFreeHeap(RtlGetProcessHeap(), 0, FontBitField); + +Exit: + if (FileBuffer) + NtUnmapViewOfSection(NtCurrentProcess(), FileBuffer); + + if (FileSectionHandle) + NtClose(FileSectionHandle); + + NtClose(FileHandle); + + if (NT_SUCCESS(Status)) + LastLoadedCodepage = CodePage; + + return NT_SUCCESS(Status); +} + static BOOL -TuiInit(DWORD OemCP) +TuiInit(IN UINT OemCP) { BOOL Success; CONSOLE_SCREEN_BUFFER_INFO ScrInfo; @@ -417,9 +665,7 @@ TuiInit(DWORD OemCP) return FALSE; } - if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT, - &OemCP, sizeof(OemCP), NULL, 0, - &BytesReturned, NULL)) + if (!TuiSetConsoleOutputCP(ConsoleDeviceHandle, OemCP)) { DPRINT1("Failed to load the font for codepage %d\n", OemCP); /* Let's suppose the font is good enough to continue */

1 0

[reactos] 01/03: [CONSRV] Stub out support for terminal-level changing of output code page. CORE-17601
by Hermès Bélusca-Maïto 15 Jan '22

15 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac2494994bfe072e6b991… commit ac2494994bfe072e6b991a8a18fc588c65774255 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 4 00:41:33 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 15 17:41:34 2022 +0100 [CONSRV] Stub out support for terminal-level changing of output code page. CORE-17601 --- win32ss/user/winsrv/consrv/condrv/console.c | 13 ++++++++++--- win32ss/user/winsrv/consrv/condrv/dummyterm.c | 8 ++++++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 12 ++++++++++++ win32ss/user/winsrv/consrv/frontends/terminal.c | 9 +++++++++ win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 12 ++++++++++++ win32ss/user/winsrv/consrv/include/conio.h | 6 ++++-- win32ss/user/winsrv/consrv/include/conio_winsrv.h | 2 ++ win32ss/user/winsrv/consrv/include/term.h | 2 ++ win32ss/user/winsrv/consrv/settings.c | 8 +++++--- 9 files changed, 64 insertions(+), 8 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index 1dd90fb7b2f..fae7beb7de3 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -424,20 +424,27 @@ ConDrvSetConsoleCP(IN PCONSOLE Console, IN UINT CodePage, IN BOOLEAN OutputCP) { + BOOL Success = TRUE; + if (Console == NULL || !IsValidCodePage(CodePage)) return STATUS_INVALID_PARAMETER; if (OutputCP) { - Console->OutputCodePage = CodePage; - Console->IsCJK = IsCJKCodePage(CodePage); + /* Request the terminal to change its code page support */ + Success = TermSetCodePage(Console, CodePage); + if (Success) + { + Console->OutputCodePage = CodePage; + Console->IsCJK = IsCJKCodePage(CodePage); + } } else { Console->InputCodePage = CodePage; } - return STATUS_SUCCESS; + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } /* EOF */ diff --git a/win32ss/user/winsrv/consrv/condrv/dummyterm.c b/win32ss/user/winsrv/consrv/condrv/dummyterm.c index eaeb94561c7..5d9156a2a96 100644 --- a/win32ss/user/winsrv/consrv/condrv/dummyterm.c +++ b/win32ss/user/winsrv/consrv/condrv/dummyterm.c @@ -126,6 +126,13 @@ DummySetPalette(IN OUT PTERMINAL This, return TRUE; } +static BOOL NTAPI +DummySetCodePage(IN OUT PTERMINAL This, + UINT CodePage) +{ + return TRUE; +} + static INT NTAPI DummyShowMouseCursor(IN OUT PTERMINAL This, BOOL Show) @@ -149,6 +156,7 @@ static TERMINAL_VTBL DummyVtbl = DummyReleaseScreenBuffer, DummyGetLargestConsoleWindowSize, DummySetPalette, + DummySetCodePage, DummyShowMouseCursor, }; diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 96dc93b52b5..778b11073c1 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -1034,6 +1034,17 @@ GuiSetPalette(IN OUT PFRONTEND This, return TRUE; } +static BOOL NTAPI +GuiSetCodePage(IN OUT PFRONTEND This, + UINT CodePage) +{ + // TODO: Find a suitable console font for the given code page, + // and set it if found; otherwise fail the call, or fall back + // to some default font... + + return TRUE; +} + static ULONG NTAPI GuiGetDisplayMode(IN OUT PFRONTEND This) { @@ -1164,6 +1175,7 @@ static FRONTEND_VTBL GuiVtbl = GuiGetLargestConsoleWindowSize, GuiGetSelectionInfo, GuiSetPalette, + GuiSetCodePage, GuiGetDisplayMode, GuiSetDisplayMode, GuiShowMouseCursor, diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index 24e43ccc0b5..ddf8f75af22 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -939,6 +939,14 @@ ConSrvTermSetPalette(IN OUT PTERMINAL This, return FrontEnd->Vtbl->SetPalette(FrontEnd, PaletteHandle, PaletteUsage); } +static BOOL NTAPI +ConSrvTermSetCodePage(IN OUT PTERMINAL This, + UINT CodePage) +{ + PFRONTEND FrontEnd = This->Context; + return FrontEnd->Vtbl->SetCodePage(FrontEnd, CodePage); +} + static INT NTAPI ConSrvTermShowMouseCursor(IN OUT PTERMINAL This, BOOL Show) @@ -963,6 +971,7 @@ static TERMINAL_VTBL ConSrvTermVtbl = ConSrvTermReleaseScreenBuffer, ConSrvTermGetLargestConsoleWindowSize, ConSrvTermSetPalette, + ConSrvTermSetCodePage, ConSrvTermShowMouseCursor, }; diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index fd58595ff69..3bc48c85940 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -881,6 +881,17 @@ TuiSetPalette(IN OUT PFRONTEND This, return TRUE; } +static BOOL NTAPI +TuiSetCodePage(IN OUT PFRONTEND This, + UINT CodePage) +{ + // TODO: Find a suitable console font for the given code page, + // and set it if found; otherwise fail the call, or fall back + // to some default font... + + return TRUE; +} + static ULONG NTAPI TuiGetDisplayMode(IN OUT PFRONTEND This) { @@ -945,6 +956,7 @@ static FRONTEND_VTBL TuiVtbl = TuiGetLargestConsoleWindowSize, TuiGetSelectionInfo, TuiSetPalette, + TuiSetCodePage, TuiGetDisplayMode, TuiSetDisplayMode, TuiShowMouseCursor, diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index 37360b17b11..ead041e51df 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -250,8 +250,10 @@ typedef struct _TERMINAL_VTBL BOOL (NTAPI *SetPalette)(IN OUT PTERMINAL This, HPALETTE PaletteHandle, UINT PaletteUsage); - INT (NTAPI *ShowMouseCursor)(IN OUT PTERMINAL This, - BOOL Show); + BOOL (NTAPI *SetCodePage)(IN OUT PTERMINAL This, + UINT CodePage); + INT (NTAPI *ShowMouseCursor)(IN OUT PTERMINAL This, + BOOL Show); #if 0 // Possible future terminal interface BOOL (NTAPI *GetTerminalProperty)(IN OUT PTERMINAL This, diff --git a/win32ss/user/winsrv/consrv/include/conio_winsrv.h b/win32ss/user/winsrv/consrv/include/conio_winsrv.h index 2f682bd8b2f..0dff19813cb 100644 --- a/win32ss/user/winsrv/consrv/include/conio_winsrv.h +++ b/win32ss/user/winsrv/consrv/include/conio_winsrv.h @@ -79,6 +79,8 @@ typedef struct _FRONTEND_VTBL BOOL (NTAPI *SetPalette)(IN OUT PFRONTEND This, HPALETTE PaletteHandle, UINT PaletteUsage); + BOOL (NTAPI *SetCodePage)(IN OUT PFRONTEND This, + UINT CodePage); ULONG (NTAPI *GetDisplayMode)(IN OUT PFRONTEND This); BOOL (NTAPI *SetDisplayMode)(IN OUT PFRONTEND This, ULONG NewMode); diff --git a/win32ss/user/winsrv/consrv/include/term.h b/win32ss/user/winsrv/consrv/include/term.h index 2766ec89068..6137d3742bb 100644 --- a/win32ss/user/winsrv/consrv/include/term.h +++ b/win32ss/user/winsrv/consrv/include/term.h @@ -35,6 +35,8 @@ (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) #define TermSetPalette(Console, PaletteHandle, PaletteUsage) \ (Console)->TermIFace.Vtbl->SetPalette(&(Console)->TermIFace, (PaletteHandle), (PaletteUsage)) +#define TermSetCodePage(Console, CodePage) \ + (Console)->TermIFace.Vtbl->SetCodePage(&(Console)->TermIFace, (CodePage)) #define TermShowMouseCursor(Console, Show) \ (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show)) diff --git a/win32ss/user/winsrv/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c index b0cef35638c..22cccc2d81c 100644 --- a/win32ss/user/winsrv/consrv/settings.c +++ b/win32ss/user/winsrv/consrv/settings.c @@ -64,11 +64,13 @@ ConSrvApplyUserSettings( if ((Console->OutputCodePage != ConsoleInfo->CodePage) && IsValidCodePage(ConsoleInfo->CodePage)) { - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, TRUE); // Output // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, FALSE); // Input - - Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + if (TermSetCodePage(Console, ConsoleInfo->CodePage)) + { + Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; + Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + } } // FIXME: Check ConsoleInfo->WindowSize with respect to

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs