[ros-diffs] [hbelusca] 64043: [CONSRV]: Code reorganization part 2 (add some comments for future fixes).

Author: hbelusca
Date: Fri Sep  5 21:08:15 2014
New Revision: 64043

URL: http://svn.reactos.org/svn/reactos?rev=64043&view=rev
Log:
[CONSRV]: Code reorganization part 2 (add some comments for future fixes).

Modified:
    branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c
    branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
    branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h
    branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c

Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/...
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c	[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c	[iso-8859-1] Fri Sep  5 21:08:15 2014
@@ -96,7 +96,7 @@
                  * even of the last buffer, but having to deal with a lack of
                  * any active buffer might be error-prone. */
                 if (Buffer->ListEntry.Flink != Buffer->ListEntry.Blink)
-                    ConioDeleteScreenBuffer(Buffer);
+                    ConDrvDeleteScreenBuffer(Buffer);
             }
             else if (Object->Type == INPUT_BUFFER)
             {

Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/...
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h	[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h	[iso-8859-1] Fri Sep  5 21:08:15 2014
@@ -191,7 +191,7 @@
 {
     CONSOLE_IO_OBJECT Header;       /* Object header - MUST BE IN FIRST PLACE */

-    ULONG       InputBufferSize;    /* Size of this input buffer */
+    ULONG       InputBufferSize;    /* Size of this input buffer -- UNUSED!! */
     LIST_ENTRY  InputEvents;        /* List head for input event queue */
     HANDLE      ActiveEvent;        /* Event set when an input event is added in its queue */

@@ -344,6 +344,11 @@
 ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent,
                        IN PCONSOLE_PROCESS_DATA ProcessData);

+
+#define GetConsoleInputBufferMode(Console)  \
+    (Console)->InputBuffer.Mode
+
+
 /* conoutput.c */
 PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);
 VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console);

Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/...
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h	[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h	[iso-8859-1] Fri Sep  5 21:08:15 2014
@@ -62,6 +62,9 @@

/*
  * Structure used to communicate with console.dll
+ *
+ * FIXME: It should overlap with the Windows' CONSOLE_STATE_INFO structure
+ * for GUI terminals!!
  */
 typedef struct _CONSOLE_PROPS
 {

Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user/...
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c	[iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c	[iso-8859-1] Fri Sep  5 21:08:15 2014
@@ -404,7 +404,7 @@

ConsoleInfo->QuickEdit  = FALSE;
     ConsoleInfo->InsertMode = TRUE;
-    // ConsoleInfo->InputBufferSize;
+    // ConsoleInfo->InputBufferSize = 0;

// Rule: ScreenBufferSize >= ConsoleSize
     ConsoleInfo->ScreenBufferSize.X = 80;