Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge r65567.

Browse source 
svn path=/branches/condrv_restructure/; revision=65570
This commit is contained in:
Hermès Bélusca-Maïto 2014-12-05 22:24:49 +00:00
commit f6b392dd4c
4 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -226,8 +226,6 @@ GuiConsoleInputThread(PVOID Data)
} }
continue; continue;
continue;
} }
case PM_DESTROY_CONSOLE: case PM_DESTROY_CONSOLE:
@ -254,7 +252,6 @@ GuiConsoleInputThread(PVOID Data)
if (GuiData->hWindow == NULL) continue; if (GuiData->hWindow == NULL) continue;
DestroyWindow(GuiData->hWindow); DestroyWindow(GuiData->hWindow);
PrivateCsrssManualGuiCheck(+1); // RemoveGuiApp
NtSetEvent(GuiData->hGuiTermEvent, NULL); NtSetEvent(GuiData->hGuiTermEvent, NULL);
@ -489,7 +486,6 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
NULL, SynchronizationEvent, FALSE); NULL, SynchronizationEvent, FALSE);
NtCreateEvent(&GuiData->hGuiTermEvent, EVENT_ALL_ACCESS, NtCreateEvent(&GuiData->hGuiTermEvent, EVENT_ALL_ACCESS,
NULL, SynchronizationEvent, FALSE); NULL, SynchronizationEvent, FALSE);
GuiData->hGuiTermEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
DPRINT("GUI - Checkpoint\n"); DPRINT("GUI - Checkpoint\n");

2
win32ss/user/winsrv/consrv/history.c
View file

@ -587,7 +587,7 @@ CSR_API(SrvSetConsoleCommandHistoryMode)
PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest; PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest;
PCONSRV_CONSOLE Console; PCONSRV_CONSOLE Console;
DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", DPRINT("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n",
SetHistoryModeRequest->Mode); SetHistoryModeRequest->Mode);
Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),

4
win32ss/user/winsrv/consrv/init.c
View file

@ -513,10 +513,6 @@ ConSrvDisconnect(PCSR_PROCESS Process)
{ {
DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n");
ConSrvRemoveConsole(ProcessData); ConSrvRemoveConsole(ProcessData);
/* Mark the process as not having a console anymore */
ProcessData->ConsoleApp = FALSE;
Process->Flags &= ~CsrProcessIsConsoleApp;
} }
RtlDeleteCriticalSection(&ProcessData->HandleTableLock); RtlDeleteCriticalSection(&ProcessData->HandleTableLock);

31
win32ss/user/winsrv/consrv/popup.c
View file

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