[KERNEL32/CONSRV]

- Use a standard win32 thread function for the ConsoleControlDispatcher thread, instead of a custom PCONTROLDISPATCHER one.
- Deactivate debug outputs in console.c, which were activated by error in r57706.

svn path=/branches/ros-csrss/; revision=57714

dll/win32/kernel32/client/console/console.c

@@ -15,7 +15,7 @@
 
 #include <k32.h>
 
-// #define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 extern RTL_CRITICAL_SECTION ConsoleLock;
@@ -66,16 +66,16 @@ DefaultConsoleCtrlHandler(DWORD Event)
     return TRUE;
 }
 
-__declspec(noreturn)
-VOID
-CALLBACK
-ConsoleControlDispatcher(DWORD CodeAndFlag)
+DWORD
+WINAPI
+ConsoleControlDispatcher(IN LPVOID lpThreadParameter)
 {
     DWORD nExitCode = 0;
+    DWORD CodeAndFlag = PtrToUlong(lpThreadParameter);
     DWORD nCode = CodeAndFlag & MAXLONG;
     UINT i;
     EXCEPTION_RECORD erException;
-    
+
     DPRINT("Console Dispatcher Active: %lx %lx\n", CodeAndFlag, nCode);
     SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
 
@@ -92,7 +92,7 @@ ConsoleControlDispatcher(DWORD CodeAndFlag)
                 erException.ExceptionRecord = NULL;
                 erException.ExceptionAddress = DefaultConsoleCtrlHandler;
                 erException.NumberParameters = 0;
-                
+
                 _SEH2_TRY
                 {
                     RtlRaiseException(&erException);
@@ -100,7 +100,7 @@ ConsoleControlDispatcher(DWORD CodeAndFlag)
                 _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
                 {
                     RtlEnterCriticalSection(&ConsoleLock);
-                    
+
                     if ((nCode != CTRL_C_EVENT) ||
                         (NtCurrentPeb()->ProcessParameters->ConsoleFlags != 1))
                     {
@@ -109,14 +109,13 @@ ConsoleControlDispatcher(DWORD CodeAndFlag)
                             if (CtrlHandlers[i - 1](nCode)) break;
                         }
                     }
-                    
+
                     RtlLeaveCriticalSection(&ConsoleLock);
                 }
                 _SEH2_END;
-                
+
                 ExitThread(0);
             }
-            
             break;
         }
 
@@ -124,25 +123,22 @@ ConsoleControlDispatcher(DWORD CodeAndFlag)
         case CTRL_LOGOFF_EVENT:
         case CTRL_SHUTDOWN_EVENT:
             break;
-            
+
         case 3:
-        
             ExitThread(0);
             break;
-        
+
         case 4:
-        
             ExitProcess(CONTROL_C_EXIT);
             break;
 
         default:
-        
             ASSERT(FALSE);
             break;
     }
-    
+
     ASSERT(ConsoleInitialized);
-    
+
     RtlEnterCriticalSection(&ConsoleLock);
     nExitCode = 0;
     if ((nCode != CTRL_C_EVENT) || (NtCurrentPeb()->ProcessParameters->ConsoleFlags != 1))
@@ -172,9 +168,10 @@ ConsoleControlDispatcher(DWORD CodeAndFlag)
             }
         }
     }
-    
+
     RtlLeaveCriticalSection(&ConsoleLock);
     ExitThread(nExitCode);
+    return STATUS_SUCCESS;
 }
 
 

include/reactos/subsys/win/conmsg.h

@@ -153,12 +153,10 @@ typedef struct
     DWORD ControlKeyState;
 } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE;
 
-typedef VOID (CALLBACK *PCONTROLDISPATCHER)(DWORD);
-
 typedef struct
 {
-    PCONTROLDISPATCHER CtrlDispatcher;
-    BOOLEAN ConsoleNeeded;
+    LPTHREAD_START_ROUTINE CtrlDispatcher;
+    BOOL ConsoleNeeded;
     INT ShowCmd;
     HANDLE Console;
     HANDLE InputHandle;
@@ -308,7 +306,7 @@ typedef struct
     HANDLE ConsoleHandle;
     BOOL Unicode;
     SMALL_RECT ScrollRectangle;
-    BOOLEAN UseClipRectangle;
+    BOOL UseClipRectangle;
     SMALL_RECT ClipRectangle;
     COORD DestinationOrigin;
     CHAR_INFO Fill;