Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 14:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
reactos/dll/win32/kernel32/client/console/readwrite.c

1464 lines
44 KiB
C
Raw Normal View History

[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* FILE: dll/win32/kernel32/client/console/readwrite.c
* PURPOSE: Win32 Console Client read-write functions
* PROGRAMMERS: Emanuele Aliberti
* Marty Dill
* Filip Navara (xnavara@volny.cz)
* Thomas Weidenmueller (w3seek@reactos.org)
* Jeffrey Morlan
*/
/* INCLUDES *******************************************************************/
#include <k32.h>
#define NDEBUG
#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
/******************
* Read functions *
******************/
static
BOOL
IntReadConsole(HANDLE hConsoleInput,
PVOID lpBuffer,
DWORD nNumberOfCharsToRead,
LPDWORD lpNumberOfCharsRead,
PCONSOLE_READCONSOLE_CONTROL pInputControl,
BOOL bUnicode)
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_READCONSOLE ReadConsoleRequest = &ApiMessage.Data.ReadConsoleRequest;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ULONG CharSize;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
/* Determine the needed size */
CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR));
ReadConsoleRequest->BufferSize = nNumberOfCharsToRead * CharSize;
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, ReadConsoleRequest->BufferSize);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
/* Allocate space in the Buffer */
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CsrAllocateMessagePointer(CaptureBuffer,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ReadConsoleRequest->BufferSize,
(PVOID*)&ReadConsoleRequest->Buffer);
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
/* Set up the data to send to the Console Server */
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
ReadConsoleRequest->InputHandle = hConsoleInput;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ReadConsoleRequest->Unicode = bUnicode;
[KERNEL32] Remove a spurious cast, and add a note for the pInputControl parameter of ReadConsole. [CONSRV] - Move some input/output console function helpers to condrv. - The way we notify for the presence of new input data, or for console pausing/unpausing, should be reconsidered (who should do this? The console driver? The active front-end?) svn path=/trunk/; revision=59345
2013-06-27 00:20:58 +00:00
ReadConsoleRequest->NrCharactersToRead = nNumberOfCharsToRead;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ReadConsoleRequest->NrCharactersRead = 0;
ReadConsoleRequest->CtrlWakeupMask = 0;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL))
{
[KERNEL32] Remove a spurious cast, and add a note for the pInputControl parameter of ReadConsole. [CONSRV] - Move some input/output console function helpers to condrv. - The way we notify for the presence of new input data, or for console pausing/unpausing, should be reconsidered (who should do this? The console driver? The active front-end?) svn path=/trunk/; revision=59345
2013-06-27 00:20:58 +00:00
/*
* From MSDN (ReadConsole function), the description
* for pInputControl says:
* "This parameter requires Unicode input by default.
* For ANSI mode, set this parameter to NULL."
*/
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ReadConsoleRequest->NrCharactersRead = pInputControl->nInitialChars;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
RtlCopyMemory(ReadConsoleRequest->Buffer,
lpBuffer,
pInputControl->nInitialChars * sizeof(WCHAR));
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsole),
sizeof(*ReadConsoleRequest));
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
/* Check for success */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
if (NT_SUCCESS(ApiMessage.Status))
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
RtlCopyMemory(lpBuffer,
ReadConsoleRequest->Buffer,
ReadConsoleRequest->NrCharactersRead * CharSize);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
if (lpNumberOfCharsRead != NULL)
*lpNumberOfCharsRead = ReadConsoleRequest->NrCharactersRead;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL))
pInputControl->dwControlKeyState = ReadConsoleRequest->ControlKeyState;
}
else
{
DPRINT1("CSR returned error in ReadConsole\n");
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
if (lpNumberOfCharsRead != NULL)
*lpNumberOfCharsRead = 0;
/* Error out */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
BaseSetLastNTError(ApiMessage.Status);
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
}
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
/* Return TRUE or FALSE */
// return TRUE;
return (ReadConsoleRequest->NrCharactersRead > 0);
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
// return NT_SUCCESS(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
IntGetConsoleInput(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead,
IN WORD wFlags,
IN BOOLEAN bUnicode)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
BOOL Success;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_GETINPUT GetInputRequest = &ApiMessage.Data.GetInputRequest;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer = NULL;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
if (!IsConsoleHandle(hConsoleInput))
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_TRY
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
*lpNumberOfEventsRead = 0;
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_HANDLE);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
SetLastError(ERROR_INVALID_ACCESS);
}
_SEH2_END;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
return FALSE;
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
DPRINT("IntGetConsoleInput: %lx %p\n", nLength, lpNumberOfEventsRead);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Set up the data to send to the Console Server */
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
GetInputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
GetInputRequest->InputHandle = hConsoleInput;
GetInputRequest->NumRecords = nLength;
GetInputRequest->Flags = wFlags;
GetInputRequest->Unicode = bUnicode;
/*
* For optimization purposes, Windows (and hence ReactOS, too, for
* compatibility reasons) uses a static buffer if no more than five
* input records are read. Otherwise a new buffer is allocated.
* This behaviour is also expected in the server-side.
*/
if (nLength <= sizeof(GetInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD))
{
GetInputRequest->RecordBufPtr = GetInputRequest->RecordStaticBuffer;
// CaptureBuffer = NULL;
}
else
{
ULONG Size = nLength * sizeof(INPUT_RECORD);
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, Size);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
/* Allocate space in the Buffer */
CsrAllocateMessagePointer(CaptureBuffer,
Size,
(PVOID*)&GetInputRequest->RecordBufPtr);
}
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleInput),
sizeof(*GetInputRequest));
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
/* Check for success */
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
Success = NT_SUCCESS(ApiMessage.Status);
/* Retrieve the results */
_SEH2_TRY
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
DPRINT("Events read: %lx\n", GetInputRequest->NumRecords);
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
*lpNumberOfEventsRead = GetInputRequest->NumRecords;
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
if (Success)
{
RtlCopyMemory(lpBuffer,
GetInputRequest->RecordBufPtr,
GetInputRequest->NumRecords * sizeof(INPUT_RECORD));
}
else
{
BaseSetLastNTError(ApiMessage.Status);
}
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
[KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. svn path=/branches/ros-csrss/; revision=57817
2012-12-08 00:39:24 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_ACCESS);
Success = FALSE;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_END;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
/* Release the capture buffer if needed */
if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Return success status */
return Success;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
IntReadConsoleOutput(HANDLE hConsoleOutput,
PCHAR_INFO lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpReadRegion,
BOOL bUnicode)
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_READOUTPUT ReadOutputRequest = &ApiMessage.Data.ReadOutputRequest;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer;
DWORD Size, SizeX, SizeY;
if (lpBuffer == NULL)
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
SetLastError(ERROR_INVALID_ACCESS);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
return FALSE;
}
Size = dwBufferSize.X * dwBufferSize.Y * sizeof(CHAR_INFO);
DPRINT("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion);
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
/* Allocate a Capture Buffer */
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CaptureBuffer = CsrAllocateCaptureBuffer(1, Size);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed with size 0x%x!\n", Size);
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
/* Allocate space in the Buffer */
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CsrAllocateMessagePointer(CaptureBuffer,
Size,
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
(PVOID*)&ReadOutputRequest->CharInfo);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Set up the data to send to the Console Server */
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
ReadOutputRequest->OutputHandle = hConsoleOutput;
ReadOutputRequest->Unicode = bUnicode;
ReadOutputRequest->BufferSize = dwBufferSize;
ReadOutputRequest->BufferCoord = dwBufferCoord;
ReadOutputRequest->ReadRegion = *lpReadRegion;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Call the server */
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CaptureBuffer,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutput),
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
sizeof(*ReadOutputRequest));
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Check for success */
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
if (NT_SUCCESS(ApiMessage.Status))
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
/* Copy into the buffer */
DPRINT("Copying to buffer\n");
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
SizeX = ReadOutputRequest->ReadRegion.Right -
ReadOutputRequest->ReadRegion.Left + 1;
SizeY = ReadOutputRequest->ReadRegion.Bottom -
ReadOutputRequest->ReadRegion.Top + 1;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
RtlCopyMemory(lpBuffer,
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
ReadOutputRequest->CharInfo,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
sizeof(CHAR_INFO) * SizeX * SizeY);
}
else
{
/* Error out */
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
BaseSetLastNTError(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/* Return the read region */
[KERNEL32] * Fix several print specifiers. svn path=/trunk/; revision=59881
2013-08-29 20:37:02 +00:00
DPRINT("read region: %p\n", ReadOutputRequest->ReadRegion);
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
*lpReadRegion = ReadOutputRequest->ReadRegion;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Release the capture buffer */
CsrFreeCaptureBuffer(CaptureBuffer);
/* Return TRUE or FALSE */
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return NT_SUCCESS(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
IntReadConsoleOutputCode(IN HANDLE hConsoleOutput,
IN CODE_TYPE CodeType,
OUT PVOID pCode,
IN DWORD nLength,
IN COORD dwReadCoord,
OUT LPDWORD lpNumberOfCodesRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
BOOL Success;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &ApiMessage.Data.ReadOutputCodeRequest;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer = NULL;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
ULONG SizeBytes, CodeSize;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
DPRINT("IntReadConsoleOutputCode\n");
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
if ( (CodeType != CODE_ASCII ) &&
(CodeType != CODE_UNICODE ) &&
(CodeType != CODE_ATTRIBUTE) )
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Set up the data to send to the Console Server */
ReadOutputCodeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
ReadOutputCodeRequest->OutputHandle = hConsoleOutput;
ReadOutputCodeRequest->Coord = dwReadCoord;
ReadOutputCodeRequest->NumCodes = nLength;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
/* Determine the needed size */
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
ReadOutputCodeRequest->CodeType = CodeType;
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
switch (CodeType)
{
case CODE_ASCII:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar);
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
break;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
case CODE_UNICODE:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar);
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
break;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
case CODE_ATTRIBUTE:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute);
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
break;
}
SizeBytes = nLength * CodeSize;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/*
* For optimization purposes, Windows (and hence ReactOS, too, for
* compatibility reasons) uses a static buffer if no more than eighty
* bytes are read. Otherwise a new buffer is allocated.
* This behaviour is also expected in the server-side.
*/
if (SizeBytes <= sizeof(ReadOutputCodeRequest->CodeStaticBuffer))
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
ReadOutputCodeRequest->pCode = ReadOutputCodeRequest->CodeStaticBuffer;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
// CaptureBuffer = NULL;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
else
{
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Allocate space in the Buffer */
CsrAllocateMessagePointer(CaptureBuffer,
SizeBytes,
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
(PVOID*)&ReadOutputCodeRequest->pCode);
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
}
[KERNEL32] Clean-up IntReadConsoleOutputCode a little bit. [CONSRV] Fix a buffer overflow in SrvReadConsoleOutputString, which was translated sometimes into heap corruption and assert, triggered when freeing a remote captured buffer in csrsrv, when executing kernel32_winetest console, just during a call to ReadConsoleOutputCharacterA. Nevertheless I still keep the culprit code (commented-out now) because it might be useful in the future. svn path=/branches/ros-csrss/; revision=58229
2013-01-26 19:07:59 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutputString),
sizeof(*ReadOutputCodeRequest));
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Check for success */
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
Success = NT_SUCCESS(ApiMessage.Status);
/* Retrieve the results */
_SEH2_TRY
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
*lpNumberOfCodesRead = ReadOutputCodeRequest->NumCodes;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
if (Success)
{
RtlCopyMemory(pCode,
ReadOutputCodeRequest->pCode,
ReadOutputCodeRequest->NumCodes * CodeSize);
}
else
{
BaseSetLastNTError(ApiMessage.Status);
}
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_ACCESS);
Success = FALSE;
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_END;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Release the capture buffer if needed */
if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Return success status */
return Success;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*******************
* Write functions *
*******************/
static
BOOL
IntWriteConsole(HANDLE hConsoleOutput,
PVOID lpBuffer,
DWORD nNumberOfCharsToWrite,
LPDWORD lpNumberOfCharsWritten,
LPVOID lpReserved,
BOOL bUnicode)
{
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
BOOL bRet = TRUE;
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_WRITECONSOLE WriteConsoleRequest = &ApiMessage.Data.WriteConsoleRequest;
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer;
[NTDLL] Fix CsrCaptureTimeout (verified against Windows Server 2003). [KERNEL32-CSRSRV-BASESRV-CONSRV-WINSRV] Clean the code: remove unuseful comments and dprints, reorganize a little bit few source files. svn path=/branches/ros-csrss/; revision=58453
2013-03-09 21:08:23 +00:00
ULONG CharSize;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
/* Determine the needed size */
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR));
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
WriteConsoleRequest->BufferSize = nNumberOfCharsToWrite * CharSize;
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, WriteConsoleRequest->BufferSize);
if (CaptureBuffer == NULL)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
/* Capture the buffer to write */
CsrCaptureMessageBuffer(CaptureBuffer,
(PVOID)lpBuffer,
WriteConsoleRequest->BufferSize,
(PVOID*)&WriteConsoleRequest->Buffer);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
/* Start writing */
WriteConsoleRequest->NrCharactersToWrite = nNumberOfCharsToWrite;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
WriteConsoleRequest->OutputHandle = hConsoleOutput;
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
WriteConsoleRequest->Unicode = bUnicode;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsole),
sizeof(*WriteConsoleRequest));
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Check for success */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
if (NT_SUCCESS(ApiMessage.Status))
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
{
if (lpNumberOfCharsWritten != NULL)
*lpNumberOfCharsWritten = WriteConsoleRequest->NrCharactersWritten;
bRet = TRUE;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
else
{
if (lpNumberOfCharsWritten != NULL)
*lpNumberOfCharsWritten = 0;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Error out */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
BaseSetLastNTError(ApiMessage.Status);
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
bRet = FALSE;
}
[KERNEL32/CONSRV] - Modify the helper function IntWriteConsole to make it use of capture buffers for passing things to write. - Now, the loop disappears. - I moved the pause-event wait (introduced in revision r47359) inside consrv, and (concerning the server-api-part SrvWriteConsole), especially in the ConioWriteConsole function, to be sure that all functions calling ConioWriteConsole become sensible to pause event. This REALLY NEEDS testing (and of course the code needs cleaning of the introduced comments, when I'm sure it works). svn path=/branches/ros-csrss/; revision=57738
2012-11-19 21:48:22 +00:00
CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
return bRet;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
IntWriteConsoleInput(IN HANDLE hConsoleInput,
IN PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsWritten,
IN BOOLEAN bUnicode,
IN BOOLEAN bAppendToEnd)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
BOOL Success;
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_WRITEINPUT WriteInputRequest = &ApiMessage.Data.WriteInputRequest;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer = NULL;
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
DPRINT("IntWriteConsoleInput: %lx %p\n", nLength, lpNumberOfEventsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Set up the data to send to the Console Server */
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
WriteInputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
WriteInputRequest->InputHandle = hConsoleInput;
WriteInputRequest->NumRecords = nLength;
WriteInputRequest->Unicode = bUnicode;
WriteInputRequest->AppendToEnd = bAppendToEnd;
/*
* For optimization purposes, Windows (and hence ReactOS, too, for
* compatibility reasons) uses a static buffer if no more than five
* input records are written. Otherwise a new buffer is allocated.
* This behaviour is also expected in the server-side.
*/
if (nLength <= sizeof(WriteInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD))
{
WriteInputRequest->RecordBufPtr = WriteInputRequest->RecordStaticBuffer;
// CaptureBuffer = NULL;
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_TRY
{
RtlCopyMemory(WriteInputRequest->RecordBufPtr,
lpBuffer,
nLength * sizeof(INPUT_RECORD));
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
SetLastError(ERROR_INVALID_ACCESS);
return FALSE;
}
_SEH2_END;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
}
else
{
ULONG Size = nLength * sizeof(INPUT_RECORD);
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, Size);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
/* Capture the user buffer */
CsrCaptureMessageBuffer(CaptureBuffer,
lpBuffer,
Size,
(PVOID*)&WriteInputRequest->RecordBufPtr);
}
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Call the server */
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CaptureBuffer,
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleInput),
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
sizeof(*WriteInputRequest));
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Check for success */
Success = NT_SUCCESS(ApiMessage.Status);
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
/* Release the capture buffer if needed */
if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Retrieve the results */
_SEH2_TRY
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
DPRINT("Events written: %lx\n", WriteInputRequest->NumRecords);
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
*lpNumberOfEventsWritten = WriteInputRequest->NumRecords;
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
if (!Success)
BaseSetLastNTError(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_ACCESS);
Success = FALSE;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_END;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Return success status */
return Success;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
IntWriteConsoleOutput(HANDLE hConsoleOutput,
CONST CHAR_INFO *lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpWriteRegion,
BOOL bUnicode)
{
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_WRITEOUTPUT WriteOutputRequest = &ApiMessage.Data.WriteOutputRequest;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer;
ULONG Size;
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
if ((lpBuffer == NULL) || (lpWriteRegion == NULL))
{
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63754
2014-07-28 21:20:36 +00:00
SetLastError(ERROR_INVALID_ACCESS);
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
return FALSE;
}
[KERNEL32] Further correct 4 console winetests. svn path=/branches/ros-csrss/; revision=58449
2013-03-09 14:18:10 +00:00
/*
if (lpWriteRegion == NULL)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
*/
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO);
DPRINT("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion);
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
/* Allocate a Capture Buffer */
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CaptureBuffer = CsrAllocateCaptureBuffer(1, Size);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
/* Capture the user buffer */
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CsrCaptureMessageBuffer(CaptureBuffer,
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
(PVOID)lpBuffer,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
Size,
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
(PVOID*)&WriteOutputRequest->CharInfo);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Set up the data to send to the Console Server */
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
WriteOutputRequest->OutputHandle = hConsoleOutput;
WriteOutputRequest->Unicode = bUnicode;
WriteOutputRequest->BufferSize = dwBufferSize;
WriteOutputRequest->BufferCoord = dwBufferCoord;
WriteOutputRequest->WriteRegion = *lpWriteRegion;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Call the server */
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
CaptureBuffer,
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutput),
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
sizeof(*WriteOutputRequest));
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Check for success */
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
if (!NT_SUCCESS(ApiMessage.Status))
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
/* Error out */
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
BaseSetLastNTError(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/* Return the read region */
[KERNEL32] * Fix several print specifiers. svn path=/trunk/; revision=59881
2013-08-29 20:37:02 +00:00
DPRINT("read region: %p\n", WriteOutputRequest->WriteRegion);
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
*lpWriteRegion = WriteOutputRequest->WriteRegion;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
/* Release the capture buffer */
CsrFreeCaptureBuffer(CaptureBuffer);
/* Return TRUE or FALSE */
[KERNEL32] Use new structures and api indices namings. [CONSRV] Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. svn path=/branches/ros-csrss/; revision=57729
2012-11-18 13:54:32 +00:00
return NT_SUCCESS(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
IntWriteConsoleOutputCode(IN HANDLE hConsoleOutput,
IN CODE_TYPE CodeType,
IN CONST VOID *pCode,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCodesWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
BOOL Success;
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &ApiMessage.Data.WriteOutputCodeRequest;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
PCSR_CAPTURE_BUFFER CaptureBuffer = NULL;
ULONG SizeBytes, CodeSize;
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
if ( (CodeType != CODE_ASCII ) &&
(CodeType != CODE_UNICODE ) &&
(CodeType != CODE_ATTRIBUTE) )
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
DPRINT("IntWriteConsoleOutputCode\n");
/* Set up the data to send to the Console Server */
WriteOutputCodeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
WriteOutputCodeRequest->OutputHandle = hConsoleOutput;
WriteOutputCodeRequest->Coord = dwWriteCoord;
WriteOutputCodeRequest->NumCodes = nLength;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
/* Determine the needed size */
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
WriteOutputCodeRequest->CodeType = CodeType;
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
switch (CodeType)
{
case CODE_ASCII:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar);
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
break;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
case CODE_UNICODE:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar);
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
break;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
case CODE_ATTRIBUTE:
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute);
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
break;
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
SizeBytes = nLength * CodeSize;
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/*
* For optimization purposes, Windows (and hence ReactOS, too, for
* compatibility reasons) uses a static buffer if no more than eighty
* bytes are written. Otherwise a new buffer is allocated.
* This behaviour is also expected in the server-side.
*/
if (SizeBytes <= sizeof(WriteOutputCodeRequest->CodeStaticBuffer))
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
WriteOutputCodeRequest->pCode = WriteOutputCodeRequest->CodeStaticBuffer;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
// CaptureBuffer = NULL;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_TRY
{
RtlCopyMemory(WriteOutputCodeRequest->pCode,
pCode,
SizeBytes);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
SetLastError(ERROR_INVALID_ACCESS);
return FALSE;
}
_SEH2_END;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
}
else
{
/* Allocate a Capture Buffer */
CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes);
if (CaptureBuffer == NULL)
{
DPRINT1("CsrAllocateCaptureBuffer failed!\n");
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Capture the buffer to write */
CsrCaptureMessageBuffer(CaptureBuffer,
(PVOID)pCode,
SizeBytes,
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
(PVOID*)&WriteOutputCodeRequest->pCode);
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
}
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
CaptureBuffer,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutputString),
sizeof(*WriteOutputCodeRequest));
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Check for success */
Success = NT_SUCCESS(ApiMessage.Status);
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Release the capture buffer if needed */
if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer);
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Retrieve the results */
_SEH2_TRY
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
*lpNumberOfCodesWritten = WriteOutputCodeRequest->NumCodes;
if (!Success)
BaseSetLastNTError(ApiMessage.Status);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_ACCESS);
Success = FALSE;
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_END;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Return success status */
return Success;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
static
BOOL
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
IntFillConsoleOutputCode(IN HANDLE hConsoleOutput,
IN CODE_TYPE CodeType,
IN CODE_ELEMENT Code,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCodesWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
BOOL Success;
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
CONSOLE_API_MESSAGE ApiMessage;
[KERNEL32-CONSRV] Rename some structures (CSRSS_... ---> CONSOLE_...) and clarify what the ConsoleHandle members are for (--> OutputHandle or InputHandle). No code changes otherwise. svn path=/branches/ros-csrss/; revision=58119
2013-01-05 23:10:12 +00:00
PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
Simplify code. svn path=/branches/condrv_restructure/; revision=63768
2014-07-29 13:49:03 +00:00
DPRINT("IntFillConsoleOutputCode\n");
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
if ( (CodeType != CODE_ASCII ) &&
(CodeType != CODE_UNICODE ) &&
(CodeType != CODE_ATTRIBUTE) )
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
/* Set up the data to send to the Console Server */
FillOutputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
FillOutputRequest->OutputHandle = hConsoleOutput;
FillOutputRequest->WriteCoord = dwWriteCoord;
FillOutputRequest->CodeType = CodeType;
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
FillOutputRequest->Code = Code;
FillOutputRequest->NumCodes = nLength;
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Call the server */
[KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. svn path=/branches/condrv_restructure/; revision=63753
2014-07-28 13:37:54 +00:00
CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
NULL,
CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFillConsoleOutput),
sizeof(*FillOutputRequest));
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
/* Check for success */
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
Success = NT_SUCCESS(ApiMessage.Status);
/* Retrieve the results */
_SEH2_TRY
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
*lpNumberOfCodesWritten = FillOutputRequest->NumCodes;
if (!Success)
BaseSetLastNTError(ApiMessage.Status);
[CONSRV] Fix the initialization of screen buffers (concerning the cursor size). [KERNEL32] Fix almost all of the console winetests. Only 26 tests remain to be fixed, concerning principally WriteConsoleInputA/W and GetNumberOfConsoleInputEvents. svn path=/branches/ros-csrss/; revision=58448
2013-03-09 01:39:49 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
SetLastError(ERROR_INVALID_ACCESS);
Success = FALSE;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
_SEH2_END;
[KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 svn path=/branches/condrv_restructure/; revision=63755
2014-07-29 00:00:21 +00:00
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
/* Return success status */
return Success;
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/* FUNCTIONS ******************************************************************/
/******************
* Read functions *
******************/
/*--------------------------------------------------------------
* ReadConsoleW
*
* @implemented
*/
BOOL
WINAPI
ReadConsoleW(HANDLE hConsoleInput,
LPVOID lpBuffer,
DWORD nNumberOfCharsToRead,
LPDWORD lpNumberOfCharsRead,
PCONSOLE_READCONSOLE_CONTROL pInputControl)
{
return IntReadConsole(hConsoleInput,
lpBuffer,
nNumberOfCharsToRead,
lpNumberOfCharsRead,
pInputControl,
TRUE);
}
/*--------------------------------------------------------------
* ReadConsoleA
*
* @implemented
*/
BOOL
WINAPI
ReadConsoleA(HANDLE hConsoleInput,
LPVOID lpBuffer,
DWORD nNumberOfCharsToRead,
LPDWORD lpNumberOfCharsRead,
PCONSOLE_READCONSOLE_CONTROL pInputControl)
{
return IntReadConsole(hConsoleInput,
lpBuffer,
nNumberOfCharsToRead,
lpNumberOfCharsRead,
NULL,
FALSE);
}
/*--------------------------------------------------------------
* PeekConsoleInputW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
PeekConsoleInputW(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
CONSOLE_READ_KEEPEVENT | CONSOLE_READ_CONTINUE,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
TRUE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* PeekConsoleInputA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
PeekConsoleInputA(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
CONSOLE_READ_KEEPEVENT | CONSOLE_READ_CONTINUE,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
FALSE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* ReadConsoleInputW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleInputW(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
0,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
TRUE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* ReadConsoleInputA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleInputA(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
0,
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
FALSE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
/*--------------------------------------------------------------
* ReadConsoleInputExW
*
* @implemented
*/
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleInputExW(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead,
IN WORD wFlags)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
wFlags,
TRUE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
/*--------------------------------------------------------------
* ReadConsoleInputExA
*
* @implemented
*/
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleInputExA(IN HANDLE hConsoleInput,
OUT PINPUT_RECORD lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsRead,
IN WORD wFlags)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] Implement ReadConsoleInputExA/W, which are a generalization of ReadConsoleInputA/W and PeekConsoleInputA/W. They allow you to read console input events by either waiting (or not) for their presence, and to remove them from the console input list (or not). Those functions are the read-equivalent of WriteConsoleInputVDMA/W. Used in Windows' NTVDM (guess why ;) ). svn path=/trunk/; revision=60920
2013-11-10 20:20:57 +00:00
return IntGetConsoleInput(hConsoleInput,
lpBuffer,
nLength,
lpNumberOfEventsRead,
wFlags,
FALSE);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* ReadConsoleOutputW
*
* @implemented
*/
BOOL
WINAPI
ReadConsoleOutputW(HANDLE hConsoleOutput,
PCHAR_INFO lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpReadRegion)
{
return IntReadConsoleOutput(hConsoleOutput,
lpBuffer,
dwBufferSize,
dwBufferCoord,
lpReadRegion,
TRUE);
}
/*--------------------------------------------------------------
* ReadConsoleOutputA
*
* @implemented
*/
BOOL
WINAPI
ReadConsoleOutputA(HANDLE hConsoleOutput,
PCHAR_INFO lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpReadRegion)
{
return IntReadConsoleOutput(hConsoleOutput,
lpBuffer,
dwBufferSize,
dwBufferCoord,
lpReadRegion,
FALSE);
}
/*--------------------------------------------------------------
* ReadConsoleOutputCharacterW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
OUT LPWSTR lpCharacter,
IN DWORD nLength,
IN COORD dwReadCoord,
OUT LPDWORD lpNumberOfCharsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntReadConsoleOutputCode(hConsoleOutput,
CODE_UNICODE,
lpCharacter,
nLength,
dwReadCoord,
lpNumberOfCharsRead);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* ReadConsoleOutputCharacterA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
OUT LPSTR lpCharacter,
IN DWORD nLength,
IN COORD dwReadCoord,
OUT LPDWORD lpNumberOfCharsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntReadConsoleOutputCode(hConsoleOutput,
CODE_ASCII,
lpCharacter,
nLength,
dwReadCoord,
lpNumberOfCharsRead);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* ReadConsoleOutputAttribute
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
ReadConsoleOutputAttribute(IN HANDLE hConsoleOutput,
OUT LPWORD lpAttribute,
IN DWORD nLength,
IN COORD dwReadCoord,
OUT LPDWORD lpNumberOfAttrsRead)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Move the waiting loop of IntReadConsole into SrvReadConsole instead. - Merge IntPeekConsoleInput and IntReadConsoleInput helpers into a single IntGetConsoleInput helper function and make PeekConsoleInputW/A and ReadConsoleInputW/A use it. Indeed, the "only" difference between these two functions, is that the first one keeps the data read inside the console input buffer, but on the contrary the second removes the data and does not return until at least one input record has been read. In server-side, CsrReadInputEvent and CsrPeekConsoleInput are merged into SrvGetConsoleInput. Merge the corresponding structures. - Use shorter variable names in IntReadConsoleOutput and use CONSOLE_PROCESS_DATA structure in SrvReadConsoleOutput. - Merge IntReadConsoleOutputCharacter and ReadConsoleOutputAttribute functions into a single IntReadConsoleOutputCode helper function, and make ReadConsoleOutputAttribute and ReadConsoleOutputCharacterW/A use it. In server-side, CsrReadConsoleOutputChar and CsrReadConsoleOutputAttrib are merged into SrvReadConsoleOutputString. (Remark: the SrvReadConsoleOutputString name comes from http://j00ru.vexillium.org/csrss_list/api_list.html and I checked that it was indeed the server function that was called by both ReadConsoleOutputAttribute and ReadConsoleOutputCharacter). The idea behind merging these two functions is, that an attribute or a character are instances of the same entity, namely a "code" (what would be called an (ANSI) escape sequence). Therefore I encode them inside the same CSRSS_READ_CONSOLE_OUTPUT_CODE structure and I use it with the previous functions. [CONSRV] - Make use of the CONSOLE_PROCESS_DATA structure (introduced in r57685). - Use CsrValidateMessageBuffer instead of Win32CsrValidateBuffer. - Reorganize conmsg.h a little bit. svn path=/branches/ros-csrss/; revision=57721
2012-11-17 21:39:41 +00:00
return IntReadConsoleOutputCode(hConsoleOutput,
CODE_ATTRIBUTE,
lpAttribute,
nLength,
dwReadCoord,
lpNumberOfAttrsRead);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*******************
* Write functions *
*******************/
/*--------------------------------------------------------------
* WriteConsoleW
*
* @implemented
*/
BOOL
WINAPI
WriteConsoleW(HANDLE hConsoleOutput,
CONST VOID *lpBuffer,
DWORD nNumberOfCharsToWrite,
LPDWORD lpNumberOfCharsWritten,
LPVOID lpReserved)
{
return IntWriteConsole(hConsoleOutput,
(PVOID)lpBuffer,
nNumberOfCharsToWrite,
lpNumberOfCharsWritten,
lpReserved,
TRUE);
}
/*--------------------------------------------------------------
* WriteConsoleA
*
* @implemented
*/
BOOL
WINAPI
WriteConsoleA(HANDLE hConsoleOutput,
CONST VOID *lpBuffer,
DWORD nNumberOfCharsToWrite,
LPDWORD lpNumberOfCharsWritten,
LPVOID lpReserved)
{
return IntWriteConsole(hConsoleOutput,
(PVOID)lpBuffer,
nNumberOfCharsToWrite,
lpNumberOfCharsWritten,
lpReserved,
FALSE);
}
/*--------------------------------------------------------------
* WriteConsoleInputW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleInputW(IN HANDLE hConsoleInput,
IN CONST INPUT_RECORD *lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
return IntWriteConsoleInput(hConsoleInput,
(PINPUT_RECORD)lpBuffer,
nLength,
lpNumberOfEventsWritten,
[KERNEL32][CONSRV] Implement WriteConsoleInputVDMA/W, its only purpose being putting console input events at the beginning of the console input event list instead of putting them at the end, as it is done with WriteConsoleInputA/W . svn path=/trunk/; revision=60756
2013-10-26 20:53:05 +00:00
TRUE,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
TRUE);
}
/*--------------------------------------------------------------
* WriteConsoleInputA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleInputA(IN HANDLE hConsoleInput,
IN CONST INPUT_RECORD *lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
return IntWriteConsoleInput(hConsoleInput,
(PINPUT_RECORD)lpBuffer,
nLength,
lpNumberOfEventsWritten,
[KERNEL32][CONSRV] Implement WriteConsoleInputVDMA/W, its only purpose being putting console input events at the beginning of the console input event list instead of putting them at the end, as it is done with WriteConsoleInputA/W . svn path=/trunk/; revision=60756
2013-10-26 20:53:05 +00:00
FALSE,
TRUE);
}
/*--------------------------------------------------------------
* WriteConsoleInputVDMW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleInputVDMW(IN HANDLE hConsoleInput,
IN CONST INPUT_RECORD *lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsWritten)
[KERNEL32][CONSRV] Implement WriteConsoleInputVDMA/W, its only purpose being putting console input events at the beginning of the console input event list instead of putting them at the end, as it is done with WriteConsoleInputA/W . svn path=/trunk/; revision=60756
2013-10-26 20:53:05 +00:00
{
return IntWriteConsoleInput(hConsoleInput,
(PINPUT_RECORD)lpBuffer,
nLength,
lpNumberOfEventsWritten,
TRUE,
FALSE);
}
/*--------------------------------------------------------------
* WriteConsoleInputVDMA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleInputVDMA(IN HANDLE hConsoleInput,
IN CONST INPUT_RECORD *lpBuffer,
IN DWORD nLength,
OUT LPDWORD lpNumberOfEventsWritten)
[KERNEL32][CONSRV] Implement WriteConsoleInputVDMA/W, its only purpose being putting console input events at the beginning of the console input event list instead of putting them at the end, as it is done with WriteConsoleInputA/W . svn path=/trunk/; revision=60756
2013-10-26 20:53:05 +00:00
{
return IntWriteConsoleInput(hConsoleInput,
(PINPUT_RECORD)lpBuffer,
nLength,
lpNumberOfEventsWritten,
FALSE,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
FALSE);
}
/*--------------------------------------------------------------
* WriteConsoleOutputW
*
* @implemented
*/
BOOL
WINAPI
WriteConsoleOutputW(HANDLE hConsoleOutput,
CONST CHAR_INFO *lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpWriteRegion)
{
return IntWriteConsoleOutput(hConsoleOutput,
lpBuffer,
dwBufferSize,
dwBufferCoord,
lpWriteRegion,
TRUE);
}
/*--------------------------------------------------------------
* WriteConsoleOutputA
*
* @implemented
*/
BOOL
WINAPI
WriteConsoleOutputA(HANDLE hConsoleOutput,
CONST CHAR_INFO *lpBuffer,
COORD dwBufferSize,
COORD dwBufferCoord,
PSMALL_RECT lpWriteRegion)
{
return IntWriteConsoleOutput(hConsoleOutput,
lpBuffer,
dwBufferSize,
dwBufferCoord,
lpWriteRegion,
FALSE);
}
/*--------------------------------------------------------------
* WriteConsoleOutputCharacterW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
IN LPCWSTR lpCharacter,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
return IntWriteConsoleOutputCode(hConsoleOutput,
CODE_UNICODE,
lpCharacter,
nLength,
dwWriteCoord,
lpNumberOfCharsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* WriteConsoleOutputCharacterA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
IN LPCSTR lpCharacter,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
return IntWriteConsoleOutputCode(hConsoleOutput,
CODE_ASCII,
lpCharacter,
nLength,
dwWriteCoord,
lpNumberOfCharsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* WriteConsoleOutputAttribute
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
WriteConsoleOutputAttribute(IN HANDLE hConsoleOutput,
IN CONST WORD *lpAttribute,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfAttrsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32/CONSRV] - Merge IntWriteConsoleOutputCharacter and WriteConsoleOutputAttribute functions into IntWriteConsoleOutputCode helper functions, which is used inside WriteConsoleOutputAttribute and WriteConsoleOutputCharacterW/A. - In server-side, merge CsrWriteConsoleOutputChar and CsrWriteConsoleOutputAttrib into the server API SrvWriteConsoleOutputString. - The structures CSRSS_WRITE_CONSOLE_OUTPUT_CHAR and CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB are merged into CSRSS_WRITE_CONSOLE_OUTPUT_CODE. [CONSRV] - Add a CsrValidateMessageBuffer usage. svn path=/branches/ros-csrss/; revision=57740
2012-11-19 23:26:36 +00:00
return IntWriteConsoleOutputCode(hConsoleOutput,
CODE_ATTRIBUTE,
lpAttribute,
nLength,
dwWriteCoord,
lpNumberOfAttrsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* FillConsoleOutputCharacterW
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
FillConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
IN WCHAR cCharacter,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfCharsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
CODE_ELEMENT Code;
Code.UnicodeChar = cCharacter;
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
return IntFillConsoleOutputCode(hConsoleOutput,
CODE_UNICODE,
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
Code,
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
nLength,
dwWriteCoord,
lpNumberOfCharsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* FillConsoleOutputCharacterA
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
FillConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
IN CHAR cCharacter,
IN DWORD nLength,
IN COORD dwWriteCoord,
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
LPDWORD lpNumberOfCharsWritten)
{
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
CODE_ELEMENT Code;
Code.AsciiChar = cCharacter;
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
return IntFillConsoleOutputCode(hConsoleOutput,
CODE_ASCII,
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
Code,
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
nLength,
dwWriteCoord,
lpNumberOfCharsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/*--------------------------------------------------------------
* FillConsoleOutputAttribute
*
* @implemented
*/
BOOL
WINAPI
[KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. svn path=/branches/condrv_restructure/; revision=63772
2014-07-29 15:59:17 +00:00
FillConsoleOutputAttribute(IN HANDLE hConsoleOutput,
IN WORD wAttribute,
IN DWORD nLength,
IN COORD dwWriteCoord,
OUT LPDWORD lpNumberOfAttrsWritten)
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
{
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
CODE_ELEMENT Code;
Code.Attribute = wAttribute;
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
return IntFillConsoleOutputCode(hConsoleOutput,
CODE_ATTRIBUTE,
[KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. svn path=/branches/condrv_restructure/; revision=63766
2014-07-29 13:18:59 +00:00
Code,
[KERNEL32/CONSRV] - Merge IntFillConsoleOutputCharacter and FillConsoleOutputAttribute functions into IntFillConsoleOutputCode helper and make it used by FillConsoleOutputAttribute/CharacterW/A. - In server-side, CsrFillOutputChar and CsrFillOutputAttrib are merged into SrvFillConsoleOutput. - Merge CSRSS_FILL_OUTPUT and CSRSS_FILL_OUTPUT_ATTRIB structures into CSRSS_FILL_OUTPUT. svn path=/branches/ros-csrss/; revision=57734
2012-11-18 17:06:48 +00:00
nLength,
dwWriteCoord,
lpNumberOfAttrsWritten);
[KERNEL32] - Move all the read/write related functions to an appropriate source file and add it to compilation. - Fix credits for alias.c svn path=/branches/ros-csrss/; revision=57711
2012-11-15 18:06:17 +00:00
}
/* EOF */
Reference in a new issue Copy permalink