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

[CSRSRV][CONSRV]

Browse source 
CSR_WAIT_FUNCTION functions are callbacks and therefore are __stdcall aka. NTAPI. Fix this.
Now, using either our csrsrv or win2k3' csrsrv works without problems; there is no console key-press problems anymore (aka. stack corruption when calling multiple times CsrNotifyWait, which called those CSR_WAIT_FUNCTION functions).

svn path=/trunk/; revision=60553
This commit is contained in:
Hermès Bélusca-Maïto 2013-10-05 23:34:25 +00:00
parent 5cd9f97182
commit 607b6f3f01
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/reactos/subsys/csr/csrsrv.h
View file

@ -134,7 +134,7 @@ typedef enum _CSR_REPLY_CODE
*/ */
typedef typedef
BOOLEAN BOOLEAN
(*CSR_WAIT_FUNCTION)( (NTAPI *CSR_WAIT_FUNCTION)(
IN PLIST_ENTRY WaitList, IN PLIST_ENTRY WaitList,
IN PCSR_THREAD WaitThread, IN PCSR_THREAD WaitThread,
IN PCSR_API_MESSAGE WaitApiMessage, IN PCSR_API_MESSAGE WaitApiMessage,

2
reactos/win32ss/user/winsrv/consrv/coninput.c
View file

@ -78,6 +78,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
// Wait function CSR_WAIT_FUNCTION // Wait function CSR_WAIT_FUNCTION
static BOOLEAN static BOOLEAN
NTAPI
ReadCharsThread(IN PLIST_ENTRY WaitList, ReadCharsThread(IN PLIST_ENTRY WaitList,
IN PCSR_THREAD WaitThread, IN PCSR_THREAD WaitThread,
IN PCSR_API_MESSAGE WaitApiMessage, IN PCSR_API_MESSAGE WaitApiMessage,
@ -193,6 +194,7 @@ ReadInputBuffer(IN PGET_INPUT_INFO InputInfo,
// Wait function CSR_WAIT_FUNCTION // Wait function CSR_WAIT_FUNCTION
static BOOLEAN static BOOLEAN
NTAPI
ReadInputBufferThread(IN PLIST_ENTRY WaitList, ReadInputBufferThread(IN PLIST_ENTRY WaitList,
IN PCSR_THREAD WaitThread, IN PCSR_THREAD WaitThread,
IN PCSR_API_MESSAGE WaitApiMessage, IN PCSR_API_MESSAGE WaitApiMessage,

1
reactos/win32ss/user/winsrv/consrv/conoutput.c
View file

@ -308,6 +308,7 @@ DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage,
// Wait function CSR_WAIT_FUNCTION // Wait function CSR_WAIT_FUNCTION
static BOOLEAN static BOOLEAN
NTAPI
WriteConsoleThread(IN PLIST_ENTRY WaitList, WriteConsoleThread(IN PLIST_ENTRY WaitList,
IN PCSR_THREAD WaitThread, IN PCSR_THREAD WaitThread,
IN PCSR_API_MESSAGE WaitApiMessage, IN PCSR_API_MESSAGE WaitApiMessage,