From ca2598c831cfec8d7d84d97e47940000966c93b5 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sun, 19 Feb 2012 20:16:36 +0000
Subject: [PATCH] [CSRSRV]: Some misc cleanup of dead code. No functional
 change.

svn path=/trunk/; revision=55722
---
 .../subsystems/win32/csrss/csrsrv/api/wapi.c  | 29 +------------------
 reactos/subsystems/win32/csrss/csrss.c        |  2 --
 .../subsystems/win32/csrss/win32csr/dllmain.c | 12 --------
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
index 319f93f2011..f5d3b49548c 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
@@ -839,34 +839,7 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request)
                 Request->ClientId.UniqueProcess,
                 Request->ClientId.UniqueThread);
     }
-#if 0
-    if (!NT_SUCCESS(Status)) return Status;
 
-    Status = RtlCreateUserThread(NtCurrentProcess(),
-                                 NULL,
-                                 TRUE,
-                                 0,
-                                 0,
-                                 0,
-                                 (PTHREAD_START_ROUTINE)ClientConnectionThread,
-                                 NULL,
-                                 & ServerThread,
-                                 &ClientId);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("CSR: Unable to create server thread\n");
-        return Status;
-    }
-
-    CsrAddStaticServerThread(ServerThread, &ClientId, 0);
-
-    NtResumeThread(ServerThread, NULL);
-
-    NtClose(ServerThread);
-
-    Status = STATUS_SUCCESS;
-    DPRINT("CSR: %s done\n", __FUNCTION__);
-#endif
     return Status;
 }
 
@@ -1055,7 +1028,7 @@ ClientConnectionThread(IN PVOID Parameter)
             DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n",
                     Teb->CountOfOwnedCriticalSections);
             DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n",
-                    &Request, Reply);
+                    Request, Reply);
             DbgBreakPoint();
         }
 
diff --git a/reactos/subsystems/win32/csrss/csrss.c b/reactos/subsystems/win32/csrss/csrss.c
index ac226628011..15d0bf909bc 100644
--- a/reactos/subsystems/win32/csrss/csrss.c
+++ b/reactos/subsystems/win32/csrss/csrss.c
@@ -60,14 +60,12 @@ _main(int argc,
     {
         /* Raise a hard error */
         DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status);
-        #if 0
         Status = NtRaiseHardError(STATUS_IO_PRIVILEGE_FAILED,
                                   0,
                                   0,
                                   NULL,
                                   OptionOk,
                                   &Response);
-                                  #endif
     }
 
     /* Initialize CSR through CSRSRV */
diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
index cbfaf15ae21..ad93d92296e 100644
--- a/reactos/subsystems/win32/csrss/win32csr/dllmain.c
+++ b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
@@ -326,12 +326,7 @@ CreateSystemThreads(PVOID pParam)
 
 NTSTATUS
 WINAPI
-#if 1
 Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll)
-#else
-Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
-                       PCSRPLUGIN_SERVER_PROCS ServerProcs)
-#endif
 {
     HANDLE ServerThread;
     CLIENT_ID ClientId;
@@ -347,19 +342,12 @@ Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
     CsrInitConsoleSupport();
 
     /* HACK */
-#if 1
     ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions;
     ServerDll->HighestApiSupported = 0xDEADBABE;
     
     ServerDll->HardErrorCallback = Win32CsrHardError;
     ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable;
     ServerDll->DisconnectCallback = Win32CsrReleaseConsole;
-#else
-    *ApiDefinitions = Win32CsrApiDefinitions;
-    ServerProcs->HardErrorProc = Win32CsrHardError;
-    ServerProcs->ProcessInheritProc = Win32CsrDuplicateHandleTable;
-    ServerProcs->ProcessDeletedProc = Win32CsrReleaseConsole;
-#endif
 
     RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec);
     InitializeListHead(&DosDeviceHistory);