[hbelusca] 60553: [CSRSRV][CONSRV] 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; ...

Author: hbelusca
Date: Sat Oct  5 23:34:25 2013
New Revision: 60553

URL: http://svn.reactos.org/svn/reactos?rev=60553&view=rev
Log:
[CSRSRV][CONSRV]
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).

Modified:
    trunk/reactos/include/reactos/subsys/csr/csrsrv.h
    trunk/reactos/win32ss/user/winsrv/consrv/coninput.c
    trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c

Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr…
==============================================================================
--- trunk/reactos/include/reactos/subsys/csr/csrsrv.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h	[iso-8859-1] Sat Oct  5 23:34:25
2013
@@ -134,7 +134,7 @@
  */
 typedef
 BOOLEAN
-(*CSR_WAIT_FUNCTION)(
+(NTAPI *CSR_WAIT_FUNCTION)(
     IN PLIST_ENTRY WaitList,
     IN PCSR_THREAD WaitThread,
     IN PCSR_API_MESSAGE WaitApiMessage,

Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c	[iso-8859-1] Sat Oct  5 23:34:25
2013
@@ -78,6 +78,7 @@
 
 // Wait function CSR_WAIT_FUNCTION
 static BOOLEAN
+NTAPI
 ReadCharsThread(IN PLIST_ENTRY WaitList,
                 IN PCSR_THREAD WaitThread,
                 IN PCSR_API_MESSAGE WaitApiMessage,
@@ -193,6 +194,7 @@
 
 // Wait function CSR_WAIT_FUNCTION
 static BOOLEAN
+NTAPI
 ReadInputBufferThread(IN PLIST_ENTRY WaitList,
                       IN PCSR_THREAD WaitThread,
                       IN PCSR_API_MESSAGE WaitApiMessage,

Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c	[iso-8859-1] Sat Oct  5 23:34:25
2013
@@ -308,6 +308,7 @@
 
 // Wait function CSR_WAIT_FUNCTION
 static BOOLEAN
+NTAPI
 WriteConsoleThread(IN PLIST_ENTRY WaitList,
                    IN PCSR_THREAD WaitThread,
                    IN PCSR_API_MESSAGE WaitApiMessage,