From 58f976d27f3c116ebc10a05ffba454ce1fcc3ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 4 Aug 2014 21:09:46 +0000 Subject: [PATCH] [CONDRV]: Quick fix for ASCII strings for ConDrvWriteConsoleOutputString. [CONSRV]: Commit something forgotten from previous revision. svn path=/branches/condrv_restructure/; revision=63808 --- win32ss/user/winsrv/consrv/condrv/text.c | 6 ++++++ win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index 98d5a85acd3..96e30035931 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -966,6 +966,12 @@ ConDrvWriteConsoleOutputString(IN PCONSOLE Console, { Status = STATUS_NO_MEMORY; } + + // FIXME: Quick fix: fix the CodeType and CodeSize since the + // ASCII string was converted into UNICODE. + // A proper fix needs to be written. + CodeType = CODE_UNICODE; + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); } else { diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index 96cc38f4e62..1231148afb5 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -24,13 +24,6 @@ /* GLOBALS ********************************************************************/ -#define GetNextConsole(Console) \ - CONTAINING_RECORD(Console->Entry.Flink, TUI_CONSOLE_DATA, Entry) - -#define GetPrevConsole(Console) \ - CONTAINING_RECORD(Console->Entry.Blink, TUI_CONSOLE_DATA, Entry) - - /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass" @@ -46,6 +39,13 @@ typedef struct _TUI_CONSOLE_DATA // TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */ } TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; +#define GetNextConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Flink, TUI_CONSOLE_DATA, Entry) + +#define GetPrevConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Blink, TUI_CONSOLE_DATA, Entry) + + /* List of the maintained virtual consoles and its lock */ static LIST_ENTRY VirtConsList; static PTUI_CONSOLE_DATA ActiveConsole; /* The active console on screen */