Fix merge r65567.

svn path=/branches/condrv_restructure/; revision=65570

diff --combined win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
index ca03d8d,dde7e74..dde7e74
--- 1/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
--- 2/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
@@@ -226,8 -226,6 +226,6 @@@ GuiConsoleInputThread(PVOID Data
                  }
  
                  continue;
- 
-                 continue;
              }
  
              case PM_DESTROY_CONSOLE:
@@@ -254,7 -252,6 +252,6 @@@
                  if (GuiData->hWindow == NULL) continue;
  
                  DestroyWindow(GuiData->hWindow);
-                 PrivateCsrssManualGuiCheck(+1); // RemoveGuiApp
  
                  NtSetEvent(GuiData->hGuiTermEvent, NULL);
  
@@@ -489,7 -486,6 +486,6 @@@ GuiInitFrontEnd(IN OUT PFRONTEND This
                    NULL, SynchronizationEvent, FALSE);
      NtCreateEvent(&GuiData->hGuiTermEvent, EVENT_ALL_ACCESS,
                    NULL, SynchronizationEvent, FALSE);
-     GuiData->hGuiTermEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
  
      DPRINT("GUI - Checkpoint\n");
  

diff --combined win32ss/user/winsrv/consrv/history.c
index a885d20,2b82d83..2b82d83
--- 1/win32ss/user/winsrv/consrv/history.c
--- 2/reactos/win32ss/user/winsrv/consrv/history.c
+++ b/win32ss/user/winsrv/consrv/history.c
@@@ -587,7 -587,7 +587,7 @@@ CSR_API(SrvSetConsoleCommandHistoryMode
      PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest;
      PCONSRV_CONSOLE Console;
  
-     DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
+     DPRINT("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
              SetHistoryModeRequest->Mode);
  
      Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),

diff --combined win32ss/user/winsrv/consrv/init.c
index ea584a7,72194cd..72194cd
--- 1/win32ss/user/winsrv/consrv/init.c
--- 2/reactos/win32ss/user/winsrv/consrv/init.c
+++ b/win32ss/user/winsrv/consrv/init.c
@@@ -513,10 -513,6 +513,6 @@@ ConSrvDisconnect(PCSR_PROCESS Process
      {
          DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n");
          ConSrvRemoveConsole(ProcessData);
- 
-         /* Mark the process as not having a console anymore */
-         ProcessData->ConsoleApp = FALSE;
-         Process->Flags &= ~CsrProcessIsConsoleApp;
      }
  
      RtlDeleteCriticalSection(&ProcessData->HandleTableLock);

diff --combined win32ss/user/winsrv/consrv/popup.c
index 98751e5,559e37f..559e37f
--- 1/win32ss/user/winsrv/consrv/popup.c
--- 2/reactos/win32ss/user/winsrv/consrv/popup.c
+++ b/win32ss/user/winsrv/consrv/popup.c
@@@ -54,15 -54,17 +54,17 @@@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer
  {
      COORD coPos;
      DWORD Written;
+     CODE_ELEMENT Code;
  
      /* Set screen attributes */
      coPos.X = xLeft;
      for (coPos.Y = yTop; coPos.Y < yTop + Height; coPos.Y++)
      {
+         Code.Attribute = Buffer->PopupDefaultAttrib;
          ConDrvFillConsoleOutput(Buffer->Header.Console,
                                  Buffer,
                                  CODE_ATTRIBUTE,
-                                 (CODE_ELEMENT)(WORD)Buffer->PopupDefaultAttrib,
+                                 Code,
                                  Width,
                                  &coPos,
                                  &Written);
@@@ -71,10 -73,11 +73,11 @@@
      /* draw upper left corner */
      coPos.X = xLeft;
      coPos.Y = yTop;
+     Code.AsciiChar = 0xDA; // '+'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xDA, // '+',
+                             Code,
                              1,
                              &coPos,
                              &Written);
@@@ -82,10 -85,11 +85,11 @@@
      /* draw upper edge */
      coPos.X = xLeft + 1;
      coPos.Y = yTop;
+     Code.AsciiChar = 0xC4; // '-'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xC4, // '-',
+                             Code,
                              Width - 2,
                              &coPos,
                              &Written);
@@@ -93,10 -97,11 +97,11 @@@
      /* draw upper right corner */
      coPos.X = xLeft + Width - 1;
      coPos.Y = yTop;
+     Code.AsciiChar = 0xBF; // '+'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xBF, // '+',
+                             Code,
                              1,
                              &coPos,
                              &Written);
@@@ -105,28 -110,31 +110,31 @@@
      for (coPos.Y = yTop + 1; coPos.Y < yTop + Height - 1; coPos.Y++)
      {
          coPos.X = xLeft;
+         Code.AsciiChar = 0xB3; // '|'
          ConDrvFillConsoleOutput(Buffer->Header.Console,
                                  Buffer,
                                  CODE_ASCII,
-                                 (CODE_ELEMENT)(CHAR)0xB3, // '|',
+                                 Code,
                                  1,
                                  &coPos,
                                  &Written);
  
          coPos.X = xLeft + 1;
+         Code.AsciiChar = ' ';
          ConDrvFillConsoleOutput(Buffer->Header.Console,
                                  Buffer,
                                  CODE_ASCII,
-                                 (CODE_ELEMENT)(CHAR)' ',
+                                 Code,
                                  Width - 2,
                                  &coPos,
                                  &Written);
  
          coPos.X = xLeft + Width - 1;
+         Code.AsciiChar = 0xB3; // '|'
          ConDrvFillConsoleOutput(Buffer->Header.Console,
                                  Buffer,
                                  CODE_ASCII,
-                                 (CODE_ELEMENT)(CHAR)0xB3, // '|',
+                                 Code,
                                  1,
                                  &coPos,
                                  &Written);
@@@ -135,10 -143,11 +143,11 @@@
      /* draw lower left corner */
      coPos.X = xLeft;
      coPos.Y = yTop + Height - 1;
+     Code.AsciiChar = 0xC0; // '+'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xC0, // '+',
+                             Code,
                              1,
                              &coPos,
                              &Written);
@@@ -146,10 -155,11 +155,11 @@@
      /* draw lower edge */
      coPos.X = xLeft + 1;
      coPos.Y = yTop + Height - 1;
+     Code.AsciiChar = 0xC4; // '-'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xC4, // '-',
+                             Code,
                              Width - 2,
                              &coPos,
                              &Written);
@@@ -157,10 -167,11 +167,11 @@@
      /* draw lower right corner */
      coPos.X = xLeft + Width - 1;
      coPos.Y = yTop + Height - 1;
+     Code.AsciiChar = 0xD9; // '+'
      ConDrvFillConsoleOutput(Buffer->Header.Console,
                              Buffer,
                              CODE_ASCII,
-                             (CODE_ELEMENT)(CHAR)0xD9, // '+',
+                             Code,
                              1,
                              &coPos,
                              &Written);