2003-08-11 Casper S. Hornstrup <chorns@users.sourceforge.net>

[reactos.git] / reactos / subsys / csrss / init.c

diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index e020b9b..adbb53f 100644 (file)
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.18 2002/10/31 01:49:39 ekohl Exp $
+/* $Id: init.c,v 1.20 2003/08/11 18:50:12 chorns Exp $
  * 
  * reactos/subsys/csrss/init.c
  *
@@ -17,6 +17,9 @@
 
 #include "api.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS ******************************************************************/
 
 /*
@@ -85,6 +88,8 @@ CsrInitVideo(VOID)
   HANDLE VideoHandle;
   NTSTATUS Status;
 
+  InitializeVideoAddressSpace();
+
   RtlInitUnicodeStringFromLiteral(&DeviceName, L"\\??\\DISPLAY1");
   InitializeObjectAttributes(&ObjectAttributes,
                             &DeviceName,
@@ -134,7 +139,7 @@ CsrServerInitialization (
    Status = CsrParseCommandLine (ArgumentCount, ArgumentArray);
    if (!NT_SUCCESS(Status))
      {
-       PrintString("CSR: Unable to parse the command line (Status: %x)\n", Status);
+       DPRINT1("CSR: Unable to parse the command line (Status: %x)\n", Status);
        return(FALSE);
      }
 
@@ -155,7 +160,7 @@ CsrServerInitialization (
                         0);
    if (!NT_SUCCESS(Status))
      {
-       PrintString("CSR: Unable to create \\ApiPort (Status %x)\n", Status);
+       DPRINT1("CSR: Unable to create \\ApiPort (Status %x)\n", Status);
        return(FALSE);
      }
    CsrssApiHeap = RtlCreateHeap(HEAP_GROWABLE,
@@ -166,7 +171,7 @@ CsrServerInitialization (
                                NULL);
    if (CsrssApiHeap == NULL)
      {
-       PrintString("CSR: Failed to create private heap, aborting\n");
+       DPRINT1("CSR: Failed to create private heap, aborting\n");
        return FALSE;
      }
 
@@ -183,7 +188,7 @@ CsrServerInitialization (
                                NULL);
    if (!NT_SUCCESS(Status))
      {
-       PrintString("CSR: Unable to create server thread\n");
+       DPRINT1("CSR: Unable to create server thread\n");
        NtClose(ApiPortHandle);
        return FALSE;
      }
@@ -192,18 +197,16 @@ CsrServerInitialization (
    Status = NtCreateEvent( &RefreshEventHandle, STANDARD_RIGHTS_ALL, &RefreshEventAttr, FALSE, FALSE );
    if( !NT_SUCCESS( Status ) )
      {
-       PrintString( "CSR: Unable to create refresh event!\n" );
+       DPRINT1( "CSR: Unable to create refresh event!\n" );
        return FALSE;
      }
    Status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, 0, NULL, NULL, (PTHREAD_START_ROUTINE)Console_Api, (PVOID) RefreshEventHandle, NULL, NULL );
    if( !NT_SUCCESS( Status ) )
      {
-       PrintString( "CSR: Unable to create console thread\n" );
+       DPRINT1( "CSR: Unable to create console thread\n" );
        return FALSE;
      }
 
-   InitializeVideoAddressSpace();
-
    W32kInitialize();
 
    return TRUE;