}
}
- if (! ConioIsRectEmpty(&UpdateRect) && Buff == Console->ActiveBuffer)
+ if (!ConioIsRectEmpty(&UpdateRect) && Buff == Console->ActiveBuffer)
{
ConioWriteStream(Console, &UpdateRect, CursorStartX, CursorStartY, ScrolledLines,
Buffer, Length);
return Size;
}
+static NTSTATUS
+DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage,
+ IN PCSR_THREAD ClientThread,
+ IN BOOL CreateWaitBlock OPTIONAL);
+
+// Wait function CSR_WAIT_FUNCTION
+static BOOLEAN
+WriteConsoleThread(IN PLIST_ENTRY WaitList,
+ IN PCSR_THREAD WaitThread,
+ IN PCSR_API_MESSAGE WaitApiMessage,
+ IN PVOID WaitContext,
+ IN PVOID WaitArgument1,
+ IN PVOID WaitArgument2,
+ IN ULONG WaitFlags)
+{
+ NTSTATUS Status;
+
+ Status = DoWriteConsole(WaitApiMessage,
+ WaitThread,
+ FALSE);
+
+ if (Status != STATUS_PENDING)
+ {
+ WaitApiMessage->Status = Status;
+ }
+
+ return (Status == STATUS_PENDING ? FALSE : TRUE);
+}
+
+static NTSTATUS
+DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage,
+ IN PCSR_THREAD ClientThread,
+ IN BOOL CreateWaitBlock OPTIONAL)
+{
+ NTSTATUS Status = STATUS_SUCCESS;
+ PCSRSS_WRITE_CONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest;
+ PCSRSS_CONSOLE Console;
+ PCSRSS_SCREEN_BUFFER Buff;
+ PCHAR Buffer;
+ DWORD Written = 0;
+ ULONG Length;
+
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
+
+ Console = Buff->Header.Console;
+
+ // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION))
+ if (Console->PauseFlags && Console->UnpauseEvent != NULL)
+ {
+ if (CreateWaitBlock)
+ {
+ if (!CsrCreateWait(&Console->WriteWaitQueue,
+ WriteConsoleThread,
+ ClientThread,
+ ApiMessage,
+ NULL,
+ NULL))
+ {
+ /* Fail */
+ ConioUnlockScreenBuffer(Buff);
+ return STATUS_NO_MEMORY;
+ }
+ }
+
+ /* Wait until we un-pause the console */
+ Status = STATUS_PENDING;
+ }
+ else
+ {
+ if(WriteConsoleRequest->Unicode)
+ {
+ Length = WideCharToMultiByte(Console->OutputCodePage, 0,
+ (PWCHAR)WriteConsoleRequest->Buffer,
+ WriteConsoleRequest->NrCharactersToWrite,
+ NULL, 0, NULL, NULL);
+ Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length);
+ if (Buffer)
+ {
+ WideCharToMultiByte(Console->OutputCodePage, 0,
+ (PWCHAR)WriteConsoleRequest->Buffer,
+ WriteConsoleRequest->NrCharactersToWrite,
+ Buffer, Length, NULL, NULL);
+ }
+ else
+ {
+ Status = STATUS_NO_MEMORY;
+ }
+ }
+ else
+ {
+ Buffer = (PCHAR)WriteConsoleRequest->Buffer;
+ }
+
+ if (Buffer)
+ {
+ if (NT_SUCCESS(Status))
+ {
+ Status = ConioWriteConsole(Console, Buff, Buffer,
+ WriteConsoleRequest->NrCharactersToWrite, TRUE);
+ if (NT_SUCCESS(Status))
+ {
+ Written = WriteConsoleRequest->NrCharactersToWrite;
+ }
+ }
+ if (WriteConsoleRequest->Unicode)
+ {
+ RtlFreeHeap(GetProcessHeap(), 0, Buffer);
+ }
+ }
+
+ WriteConsoleRequest->NrCharactersWritten = Written;
+ }
+
+ ConioUnlockScreenBuffer(Buff);
+ return Status;
+}
+
/* PUBLIC APIS ****************************************************************/
{
return STATUS_INVALID_PARAMETER;
}
-/*
- if (!Win32CsrValidateBuffer(ProcessData->Process, CharInfo,
- BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO)))
- {
- ConioUnlockScreenBuffer(Buff);
- return STATUS_ACCESS_VIOLATION;
- }
-*/
Status = ConioLockScreenBuffer(ProcessData, ReadConsoleOutputRequest->ConsoleHandle, &Buff, GENERIC_READ);
if (!NT_SUCCESS(Status)) return Status;
{
NTSTATUS Status;
PCSRSS_WRITE_CONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest;
- PCHAR Buffer;
- PCSRSS_SCREEN_BUFFER Buff;
- PCSR_PROCESS ProcessData = CsrGetClientThread()->Process;
- PCSRSS_CONSOLE Console;
- DWORD Written = 0;
- ULONG Length;
- ULONG CharSize = (WriteConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR));
DPRINT("SrvWriteConsole\n");
- if (ApiMessage->Header.u1.s1.TotalLength
- < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)
- + (WriteConsoleRequest->NrCharactersToWrite * CharSize))
+ if (!CsrValidateMessageBuffer(ApiMessage,
+ (PVOID)&WriteConsoleRequest->Buffer,
+ WriteConsoleRequest->BufferSize,
+ sizeof(BYTE)))
{
- DPRINT1("Invalid ApiMessage size\n");
return STATUS_INVALID_PARAMETER;
}
- Status = ConioLockScreenBuffer(ProcessData, WriteConsoleRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
- Console = Buff->Header.Console;
-
- if (Console->UnpauseEvent)
- {
- Status = NtDuplicateObject(GetCurrentProcess(), Console->UnpauseEvent,
- ProcessData->ProcessHandle, &WriteConsoleRequest->UnpauseEvent,
- SYNCHRONIZE, 0, 0);
- ConioUnlockScreenBuffer(Buff);
- return NT_SUCCESS(Status) ? STATUS_PENDING : Status;
- }
-
- if(WriteConsoleRequest->Unicode)
- {
- Length = WideCharToMultiByte(Console->OutputCodePage, 0,
- (PWCHAR)WriteConsoleRequest->Buffer,
- WriteConsoleRequest->NrCharactersToWrite,
- NULL, 0, NULL, NULL);
- Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length);
- if (Buffer)
- {
- WideCharToMultiByte(Console->OutputCodePage, 0,
- (PWCHAR)WriteConsoleRequest->Buffer,
- WriteConsoleRequest->NrCharactersToWrite,
- Buffer, Length, NULL, NULL);
- }
- else
- {
- Status = STATUS_NO_MEMORY;
- }
- }
- else
- {
- Buffer = (PCHAR)WriteConsoleRequest->Buffer;
- }
-
- if (Buffer)
- {
- if (NT_SUCCESS(Status))
- {
- Status = ConioWriteConsole(Console, Buff, Buffer,
- WriteConsoleRequest->NrCharactersToWrite, TRUE);
- if (NT_SUCCESS(Status))
- {
- Written = WriteConsoleRequest->NrCharactersToWrite;
- }
- }
- if (WriteConsoleRequest->Unicode)
- {
- RtlFreeHeap(GetProcessHeap(), 0, Buffer);
- }
- }
- ConioUnlockScreenBuffer(Buff);
+ Status = DoWriteConsole(ApiMessage,
+ CsrGetClientThread(),
+ TRUE);
- WriteConsoleRequest->NrCharactersWritten = Written;
+ if (Status == STATUS_PENDING)
+ *ReplyCode = CsrReplyPending;
return Status;
}
CSR_API(SrvWriteConsoleOutput)
{
PCSRSS_WRITE_CONSOLE_OUTPUT WriteConsoleOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleOutputRequest;
+ PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
SHORT i, X, Y, SizeX, SizeY;
- PCSR_PROCESS ProcessData = CsrGetClientThread()->Process;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
SMALL_RECT ScreenBuffer;
DPRINT("SrvWriteConsoleOutput\n");
+ BufferSize = WriteConsoleOutputRequest->BufferSize;
+ BufferCoord = WriteConsoleOutputRequest->BufferCoord;
+ CharInfo = WriteConsoleOutputRequest->CharInfo;
+
+ if (!CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&WriteConsoleOutputRequest->CharInfo,
+ BufferSize.X * BufferSize.Y,
+ sizeof(CHAR_INFO)))
+ {
+ return STATUS_INVALID_PARAMETER;
+ }
+
Status = ConioLockScreenBuffer(ProcessData,
WriteConsoleOutputRequest->ConsoleHandle,
&Buff,
GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
- BufferSize = WriteConsoleOutputRequest->BufferSize;
- BufferCoord = WriteConsoleOutputRequest->BufferCoord;
- CharInfo = WriteConsoleOutputRequest->CharInfo;
- if (!Win32CsrValidateBuffer(ProcessData, CharInfo,
- BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO)))
- {
- ConioUnlockScreenBuffer(Buff);
- return STATUS_ACCESS_VIOLATION;
- }
WriteRegion = WriteConsoleOutputRequest->WriteRegion;
SizeY = min(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&WriteRegion));
/* Make sure WriteRegion is inside the screen buffer */
ConioInitRect(&ScreenBuffer, 0, 0, Buff->MaxY - 1, Buff->MaxX - 1);
- if (! ConioGetIntersection(&WriteRegion, &ScreenBuffer, &WriteRegion))
+ if (!ConioGetIntersection(&WriteRegion, &ScreenBuffer, &WriteRegion))
{
ConioUnlockScreenBuffer(Buff);
DPRINT("SrvReadConsoleOutputString\n");
- ReadBuffer = ReadConsoleOutputCodeRequest->pCode.pCode;
-
CodeType = ReadConsoleOutputCodeRequest->CodeType;
switch (CodeType)
{
return STATUS_INVALID_PARAMETER;
}
+ if (!CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&ReadConsoleOutputCodeRequest->pCode.pCode,
+ ReadConsoleOutputCodeRequest->NumCodesToRead,
+ CodeSize))
+ {
+ return STATUS_INVALID_PARAMETER;
+ }
+
Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ReadConsoleOutputCodeRequest->ConsoleHandle, &Buff, GENERIC_READ);
if (!NT_SUCCESS(Status)) return Status;
Console = Buff->Header.Console;
+ ReadBuffer = ReadConsoleOutputCodeRequest->pCode.pCode;
Xpos = ReadConsoleOutputCodeRequest->ReadCoord.X;
Ypos = (ReadConsoleOutputCodeRequest->ReadCoord.Y + Buff->VirtualY) % Buff->MaxY;
return STATUS_SUCCESS;
}
-CSR_API(CsrWriteConsoleOutputChar)
+CSR_API(SrvWriteConsoleOutputString)
{
NTSTATUS Status;
- PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR WriteConsoleOutputCharRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleOutputCharRequest;
- PCHAR String, tmpString = NULL;
- PBYTE Buffer;
+ PCSRSS_WRITE_CONSOLE_OUTPUT_CODE WriteConsoleOutputCodeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleOutputCodeRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- DWORD X, Y, Length, CharSize, Written = 0;
+ USHORT CodeType;
+ PBYTE Buffer; // PUCHAR
+ PCHAR String, tmpString = NULL;
+ DWORD X, Y, Length; // , Written = 0;
+ ULONG CodeSize;
SMALL_RECT UpdateRect;
- DPRINT("CsrWriteConsoleOutputChar\n");
+ DPRINT("SrvWriteConsoleOutputString\n");
+
+ CodeType = WriteConsoleOutputCodeRequest->CodeType;
+ switch (CodeType)
+ {
+ case CODE_ASCII:
+ CodeSize = sizeof(CHAR);
+ break;
+
+ case CODE_UNICODE:
+ CodeSize = sizeof(WCHAR);
+ break;
- CharSize = (WriteConsoleOutputCharRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR));
+ case CODE_ATTRIBUTE:
+ CodeSize = sizeof(WORD);
+ break;
+
+ default:
+ return STATUS_INVALID_PARAMETER;
+ }
- if (ApiMessage->Header.u1.s1.TotalLength
- < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR)
- + (WriteConsoleOutputCharRequest->Length * CharSize))
+ if (!CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&WriteConsoleOutputCodeRequest->pCode.pCode,
+ WriteConsoleOutputCodeRequest->Length,
+ CodeSize))
{
- DPRINT1("Invalid ApiMessage size\n");
return STATUS_INVALID_PARAMETER;
}
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process,
- WriteConsoleOutputCharRequest->ConsoleHandle,
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+ WriteConsoleOutputCodeRequest->ConsoleHandle,
&Buff,
GENERIC_WRITE);
- if (NT_SUCCESS(Status))
+ if (!NT_SUCCESS(Status)) return Status;
+
+ Console = Buff->Header.Console;
+
+ switch (CodeType)
{
- Console = Buff->Header.Console;
- if(WriteConsoleOutputCharRequest->Unicode)
+ case CODE_UNICODE:
{
Length = WideCharToMultiByte(Console->OutputCodePage, 0,
- (PWCHAR)WriteConsoleOutputCharRequest->String,
- WriteConsoleOutputCharRequest->Length,
+ (PWCHAR)WriteConsoleOutputCodeRequest->pCode.UnicodeChar,
+ WriteConsoleOutputCodeRequest->Length,
NULL, 0, NULL, NULL);
tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length);
if (String)
{
WideCharToMultiByte(Console->OutputCodePage, 0,
- (PWCHAR)WriteConsoleOutputCharRequest->String,
- WriteConsoleOutputCharRequest->Length,
+ (PWCHAR)WriteConsoleOutputCodeRequest->pCode.UnicodeChar,
+ WriteConsoleOutputCodeRequest->Length,
String, Length, NULL, NULL);
}
else
{
Status = STATUS_NO_MEMORY;
}
- }
- else
- {
- String = (PCHAR)WriteConsoleOutputCharRequest->String;
- }
-
- if (String)
- {
- if (NT_SUCCESS(Status))
- {
- X = WriteConsoleOutputCharRequest->Coord.X;
- Y = (WriteConsoleOutputCharRequest->Coord.Y + Buff->VirtualY) % Buff->MaxY;
- Length = WriteConsoleOutputCharRequest->Length;
- Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X)];
- while (Length--)
- {
- *Buffer = *String++;
- Written++;
- Buffer += 2;
- if (++X == Buff->MaxX)
- {
- if (++Y == Buff->MaxY)
- {
- Y = 0;
- Buffer = Buff->Buffer;
- }
- X = 0;
- }
- }
- if (Buff == Console->ActiveBuffer)
- {
- ConioComputeUpdateRect(Buff, &UpdateRect, &WriteConsoleOutputCharRequest->Coord,
- WriteConsoleOutputCharRequest->Length);
- ConioDrawRegion(Console, &UpdateRect);
- }
- WriteConsoleOutputCharRequest->EndCoord.X = X;
- WriteConsoleOutputCharRequest->EndCoord.Y = (Y + Buff->MaxY - Buff->VirtualY) % Buff->MaxY;
-
- }
- if (WriteConsoleOutputCharRequest->Unicode)
- {
- RtlFreeHeap(GetProcessHeap(), 0, tmpString);
- }
+ break;
}
- ConioUnlockScreenBuffer(Buff);
- }
- WriteConsoleOutputCharRequest->NrCharactersWritten = Written;
- return Status;
-}
-
-CSR_API(CsrWriteConsoleOutputAttrib)
-{
- PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB WriteConsoleOutputAttribRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleOutputAttribRequest;
- PCSRSS_CONSOLE Console;
- PCSRSS_SCREEN_BUFFER Buff;
- PUCHAR Buffer;
- PWORD Attribute;
- int X, Y, Length;
- NTSTATUS Status;
- SMALL_RECT UpdateRect;
- DPRINT("CsrWriteConsoleOutputAttrib\n");
+ case CODE_ASCII:
+ String = (PCHAR)WriteConsoleOutputCodeRequest->pCode.AsciiChar;
+ break;
- if (ApiMessage->Header.u1.s1.TotalLength
- < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB)
- + WriteConsoleOutputAttribRequest->Length * sizeof(WORD))
- {
- DPRINT1("Invalid ApiMessage size\n");
- return STATUS_INVALID_PARAMETER;
+ case CODE_ATTRIBUTE:
+ default:
+ // *(ReadBuffer++) = Code;
+ String = (PCHAR)WriteConsoleOutputCodeRequest->pCode.Attribute;
+ break;
}
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process,
- WriteConsoleOutputAttribRequest->ConsoleHandle,
- &Buff,
- GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
+ if (String && NT_SUCCESS(Status))
{
- return Status;
- }
- Console = Buff->Header.Console;
+ X = WriteConsoleOutputCodeRequest->Coord.X;
+ Y = (WriteConsoleOutputCodeRequest->Coord.Y + Buff->VirtualY) % Buff->MaxY;
+ Length = WriteConsoleOutputCodeRequest->Length;
+ Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + (CodeType == CODE_ATTRIBUTE ? 1 : 0)];
- X = WriteConsoleOutputAttribRequest->Coord.X;
- Y = (WriteConsoleOutputAttribRequest->Coord.Y + Buff->VirtualY) % Buff->MaxY;
- Length = WriteConsoleOutputAttribRequest->Length;
- Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + 1];
- Attribute = WriteConsoleOutputAttribRequest->Attribute;
- while (Length--)
- {
- *Buffer = (UCHAR)(*Attribute++);
- Buffer += 2;
- if (++X == Buff->MaxX)
+ while (Length--)
{
- if (++Y == Buff->MaxY)
+ *Buffer = *String++;
+ // ReadBuffer = (PVOID)((ULONG_PTR)ReadBuffer + CodeSize);
+ String = (PCHAR)((ULONG_PTR)String + CodeSize);
+ // Written++;
+ Buffer += 2;
+ if (++X == Buff->MaxX)
{
- Y = 0;
- Buffer = Buff->Buffer + 1;
+ if (++Y == Buff->MaxY)
+ {
+ Y = 0;
+ Buffer = Buff->Buffer + (CodeType == CODE_ATTRIBUTE ? 1 : 0);
+ }
+ X = 0;
}
- X = 0;
}
+
+ if (Buff == Console->ActiveBuffer)
+ {
+ ConioComputeUpdateRect(Buff, &UpdateRect, &WriteConsoleOutputCodeRequest->Coord,
+ WriteConsoleOutputCodeRequest->Length);
+ ConioDrawRegion(Console, &UpdateRect);
+ }
+
+ WriteConsoleOutputCodeRequest->EndCoord.X = X;
+ WriteConsoleOutputCodeRequest->EndCoord.Y = (Y + Buff->MaxY - Buff->VirtualY) % Buff->MaxY;
}
- if (Buff == Console->ActiveBuffer)
+ if (tmpString)
{
- ConioComputeUpdateRect(Buff, &UpdateRect, &WriteConsoleOutputAttribRequest->Coord,
- WriteConsoleOutputAttribRequest->Length);
- ConioDrawRegion(Console, &UpdateRect);
+ RtlFreeHeap(GetProcessHeap(), 0, tmpString);
}
- WriteConsoleOutputAttribRequest->EndCoord.X = X;
- WriteConsoleOutputAttribRequest->EndCoord.Y = (Y + Buff->MaxY - Buff->VirtualY) % Buff->MaxY;
-
ConioUnlockScreenBuffer(Buff);
- return STATUS_SUCCESS;
+ // WriteConsoleOutputCodeRequest->NrCharactersWritten = Written;
+ return Status;
}
-CSR_API(CsrFillOutputChar)
+CSR_API(SrvFillConsoleOutput)
{
NTSTATUS Status;
PCSRSS_FILL_OUTPUT FillOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FillOutputRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- DWORD X, Y, Length, Written = 0;
- CHAR Char;
+ DWORD X, Y, Length; // , Written = 0;
+ USHORT CodeType;
+ BYTE Code;
PBYTE Buffer;
SMALL_RECT UpdateRect;
- DPRINT("CsrFillOutputChar\n");
+ DPRINT("SrvFillConsoleOutput\n");
+
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), FillOutputRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, FillOutputRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
Console = Buff->Header.Console;
- X = FillOutputRequest->Position.X;
- Y = (FillOutputRequest->Position.Y + Buff->VirtualY) % Buff->MaxY;
- Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X)];
- if(FillOutputRequest->Unicode)
- ConsoleUnicodeCharToAnsiChar(Console, &Char, &FillOutputRequest->Char.UnicodeChar);
- else
- Char = FillOutputRequest->Char.AsciiChar;
+ CodeType = FillOutputRequest->CodeType;
+
+ X = FillOutputRequest->Coord.X;
+ Y = (FillOutputRequest->Coord.Y + Buff->VirtualY) % Buff->MaxY;
Length = FillOutputRequest->Length;
- while (Length--)
- {
- *Buffer = Char;
- Buffer += 2;
- Written++;
- if (++X == Buff->MaxX)
- {
- if (++Y == Buff->MaxY)
- {
- Y = 0;
- Buffer = Buff->Buffer;
- }
- X = 0;
- }
- }
+ Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + (CodeType == CODE_ATTRIBUTE ? 1 : 0)];
- if (Buff == Console->ActiveBuffer)
+ switch (CodeType)
{
- ConioComputeUpdateRect(Buff, &UpdateRect, &FillOutputRequest->Position,
- FillOutputRequest->Length);
- ConioDrawRegion(Console, &UpdateRect);
- }
-
- ConioUnlockScreenBuffer(Buff);
- Length = FillOutputRequest->Length;
- FillOutputRequest->NrCharactersWritten = Length;
- return STATUS_SUCCESS;
-}
+ case CODE_ASCII:
+ Code = (BYTE)FillOutputRequest->Code.AsciiChar;
+ break;
-CSR_API(CsrFillOutputAttrib)
-{
- PCSRSS_FILL_OUTPUT_ATTRIB FillOutputAttribRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FillOutputAttribRequest;
- PCSRSS_SCREEN_BUFFER Buff;
- PUCHAR Buffer;
- NTSTATUS Status;
- int X, Y, Length;
- UCHAR Attr;
- SMALL_RECT UpdateRect;
- PCSRSS_CONSOLE Console;
+ case CODE_UNICODE:
+ ConsoleUnicodeCharToAnsiChar(Console, (PCHAR)&Code, &FillOutputRequest->Code.UnicodeChar);
+ break;
- DPRINT("CsrFillOutputAttrib\n");
+ case CODE_ATTRIBUTE:
+ Code = (BYTE)FillOutputRequest->Code.Attribute;
+ break;
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, FillOutputAttribRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
+ default:
+ ConioUnlockScreenBuffer(Buff);
+ return STATUS_INVALID_PARAMETER;
}
- Console = Buff->Header.Console;
- X = FillOutputAttribRequest->Coord.X;
- Y = (FillOutputAttribRequest->Coord.Y + Buff->VirtualY) % Buff->MaxY;
- Length = FillOutputAttribRequest->Length;
- Attr = FillOutputAttribRequest->Attribute;
- Buffer = &Buff->Buffer[(Y * Buff->MaxX * 2) + (X * 2) + 1];
while (Length--)
{
- *Buffer = Attr;
+ *Buffer = Code;
Buffer += 2;
+ // Written++;
if (++X == Buff->MaxX)
{
if (++Y == Buff->MaxY)
{
Y = 0;
- Buffer = Buff->Buffer + 1;
+ Buffer = Buff->Buffer + (CodeType == CODE_ATTRIBUTE ? 1 : 0);
}
X = 0;
}
if (Buff == Console->ActiveBuffer)
{
- ConioComputeUpdateRect(Buff, &UpdateRect, &FillOutputAttribRequest->Coord,
- FillOutputAttribRequest->Length);
+ ConioComputeUpdateRect(Buff, &UpdateRect, &FillOutputRequest->Coord,
+ FillOutputRequest->Length);
ConioDrawRegion(Console, &UpdateRect);
}
ConioUnlockScreenBuffer(Buff);
-
+/*
+ Length = FillOutputRequest->Length;
+ FillOutputRequest->NrCharactersWritten = Length;
+*/
return STATUS_SUCCESS;
}
CSR_API(SrvGetConsoleCursorInfo)
{
NTSTATUS Status;
- PCSRSS_GET_CURSOR_INFO GetCursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCursorInfoRequest;
+ PCSRSS_CURSOR_INFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest;
PCSRSS_SCREEN_BUFFER Buff;
DPRINT("SrvGetConsoleCursorInfo\n");
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, GetCursorInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
- GetCursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible;
- GetCursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize;
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
+ if (!NT_SUCCESS(Status)) return Status;
+
+ CursorInfoRequest->Info.bVisible = Buff->CursorInfo.bVisible;
+ CursorInfoRequest->Info.dwSize = Buff->CursorInfo.dwSize;
ConioUnlockScreenBuffer(Buff);
return STATUS_SUCCESS;
CSR_API(SrvSetConsoleCursorInfo)
{
- PCSRSS_SET_CURSOR_INFO SetCursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorInfoRequest;
+ NTSTATUS Status;
+ PCSRSS_CURSOR_INFO CursorInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CursorInfoRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
DWORD Size;
BOOL Visible;
- NTSTATUS Status;
DPRINT("SrvSetConsoleCursorInfo\n");
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetCursorInfoRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), CursorInfoRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
- Size = SetCursorInfoRequest->Info.dwSize;
- Visible = SetCursorInfoRequest->Info.bVisible;
+ Size = CursorInfoRequest->Info.dwSize;
+ Visible = CursorInfoRequest->Info.bVisible;
if (Size < 1)
{
Size = 1;
Size = 100;
}
- if (Size != Buff->CursorInfo.dwSize
- || (Visible && ! Buff->CursorInfo.bVisible) || (! Visible && Buff->CursorInfo.bVisible))
+ if ( (Size != Buff->CursorInfo.dwSize) ||
+ (Visible && ! Buff->CursorInfo.bVisible) ||
+ (! Visible && Buff->CursorInfo.bVisible) )
{
Buff->CursorInfo.dwSize = Size;
Buff->CursorInfo.bVisible = Visible;
- if (! ConioSetCursorInfo(Console, Buff))
+ if (!ConioSetCursorInfo(Console, Buff))
{
ConioUnlockScreenBuffer(Buff);
return STATUS_UNSUCCESSFUL;
CSR_API(SrvSetConsoleCursorPosition)
{
NTSTATUS Status;
- PCSRSS_SET_CURSOR SetCursorRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorRequest;
+ PCSRSS_SET_CURSOR_POSITION SetCursorPositionRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorPositionRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
LONG OldCursorX, OldCursorY;
DPRINT("SrvSetConsoleCursorPosition\n");
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetCursorRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorPositionRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
- NewCursorX = SetCursorRequest->Position.X;
- NewCursorY = SetCursorRequest->Position.Y;
- if (NewCursorX < 0 || NewCursorX >= Buff->MaxX ||
- NewCursorY < 0 || NewCursorY >= Buff->MaxY)
+ NewCursorX = SetCursorPositionRequest->Position.X;
+ NewCursorY = SetCursorPositionRequest->Position.Y;
+ if ( NewCursorX < 0 || NewCursorX >= Buff->MaxX ||
+ NewCursorY < 0 || NewCursorY >= Buff->MaxY )
{
ConioUnlockScreenBuffer(Buff);
return STATUS_INVALID_PARAMETER;
return STATUS_SUCCESS;
}
-CSR_API(CsrSetTextAttrib)
+CSR_API(SrvSetConsoleTextAttribute)
{
NTSTATUS Status;
PCSRSS_SET_ATTRIB SetAttribRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetAttribRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- DPRINT("CsrSetTextAttrib\n");
+ DPRINT("SrvSetConsoleTextAttribute\n");
+
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetAttribRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetAttribRequest->ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
Console = Buff->Header.Console;
Buff->DefaultAttrib = SetAttribRequest->Attrib;
if (Buff == Console->ActiveBuffer)
{
- if (! ConioUpdateScreenInfo(Console, Buff))
+ if (!ConioUpdateScreenInfo(Console, Buff))
{
ConioUnlockScreenBuffer(Buff);
return STATUS_UNSUCCESSFUL;
CSR_API(SrvCreateConsoleScreenBuffer)
{
+ NTSTATUS Status;
PCSRSS_CREATE_SCREEN_BUFFER CreateScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CreateScreenBufferRequest;
- PCSR_PROCESS ProcessData = CsrGetClientThread()->Process;
+ PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process);
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- NTSTATUS Status;
DPRINT("SrvCreateConsoleScreenBuffer\n");
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
+
Status = ConioConsoleFromProcessData(ProcessData, &Console);
- if (! NT_SUCCESS(Status))
+ if (!NT_SUCCESS(Status))
{
+ RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
return Status;
}
Buff = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER));
-
if (Buff != NULL)
{
if (Console->ActiveBuffer)
}
ConioUnlockConsole(Console);
+
RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
+
return Status;
}
-CSR_API(SrvGetConsoleScreenBufferInfo) // CsrGetScreenBufferInfo
+CSR_API(SrvGetConsoleScreenBufferInfo)
{
NTSTATUS Status;
PCSRSS_SCREEN_BUFFER_INFO ScreenBufferInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ScreenBufferInfoRequest;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- PCONSOLE_SCREEN_BUFFER_INFO pInfo;
+ PCONSOLE_SCREEN_BUFFER_INFO pInfo = &ScreenBufferInfoRequest->Info;
DPRINT("SrvGetConsoleScreenBufferInfo\n");
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, ScreenBufferInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ScreenBufferInfoRequest->ConsoleHandle, &Buff, GENERIC_READ);
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
- pInfo = &ScreenBufferInfoRequest->Info;
+
pInfo->dwSize.X = Buff->MaxX;
pInfo->dwSize.Y = Buff->MaxY;
pInfo->dwCursorPosition.X = Buff->CurrentX;
pInfo->srWindow.Bottom = Buff->ShowY + Console->Size.Y - 1;
pInfo->dwMaximumWindowSize.X = Buff->MaxX;
pInfo->dwMaximumWindowSize.Y = Buff->MaxY;
+
ConioUnlockScreenBuffer(Buff);
return STATUS_SUCCESS;
DPRINT("SrvSetConsoleActiveScreenBuffer\n");
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferRequest->OutputHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
if (Buff == Console->ActiveBuffer)
{
ConioDeleteScreenBuffer(Console->ActiveBuffer);
}
- /* tie console to new buffer */
+
+ /* Tie console to new buffer */
Console->ActiveBuffer = Buff;
+
/* Redraw the console */
ConioDrawConsole(Console);
DestinationOrigin = ScrollConsoleScreenBufferRequest->DestinationOrigin;
Fill = ScrollConsoleScreenBufferRequest->Fill;
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, ConsoleHandle, &Buff, GENERIC_WRITE);
- if (! NT_SUCCESS(Status))
- {
- return Status;
- }
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ConsoleHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
+
Console = Buff->Header.Console;
ScrollRectangle = ScrollConsoleScreenBufferRequest->ScrollRectangle;
{
NTSTATUS Status;
PCSRSS_SET_SCREEN_BUFFER_SIZE SetScreenBufferSize = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetScreenBufferSize;
- PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
- Status = ConioLockScreenBuffer(CsrGetClientThread()->Process, SetScreenBufferSize->OutputHandle, &Buff, GENERIC_WRITE);
- if (!NT_SUCCESS(Status))
- {
- return Status;
- }
- Console = Buff->Header.Console;
+ Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetScreenBufferSize->OutputHandle, &Buff, GENERIC_WRITE);
+ if (!NT_SUCCESS(Status)) return Status;
- Status = ConioResizeBuffer(Console, Buff, SetScreenBufferSize->Size);
+ Status = ConioResizeBuffer(Buff->Header.Console, Buff, SetScreenBufferSize->Size);
ConioUnlockScreenBuffer(Buff);
return Status;
projects / reactos.git / blobdiff