Author: hbelusca Date: Mon Aug 4 21:09:46 2014 New Revision: 63808
URL: http://svn.reactos.org/svn/reactos?rev=63808&view=rev Log: [CONDRV]: Quick fix for ASCII strings for ConDrvWriteConsoleOutputString. [CONSRV]: Commit something forgotten from previous revision.
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Aug 4 21:09:46 2014 @@ -966,6 +966,12 @@ { 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 {
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/... ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Mon Aug 4 21:09:46 2014 @@ -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"
@@ -45,6 +38,13 @@ PCONSOLE Console; /* Pointer to the owned console */ // 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;