mirror of
https://github.com/reactos/reactos.git
synced 2024-07-30 16:18:43 +00:00
[CSRSRV]: Some misc cleanup of dead code. No functional change.
svn path=/trunk/; revision=55722
This commit is contained in:
parent
79ef1a1380
commit
ca2598c831
|
@ -839,34 +839,7 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request)
|
||||||
Request->ClientId.UniqueProcess,
|
Request->ClientId.UniqueProcess,
|
||||||
Request->ClientId.UniqueThread);
|
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;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1055,7 +1028,7 @@ ClientConnectionThread(IN PVOID Parameter)
|
||||||
DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n",
|
DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n",
|
||||||
Teb->CountOfOwnedCriticalSections);
|
Teb->CountOfOwnedCriticalSections);
|
||||||
DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n",
|
DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n",
|
||||||
&Request, Reply);
|
Request, Reply);
|
||||||
DbgBreakPoint();
|
DbgBreakPoint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,14 +60,12 @@ _main(int argc,
|
||||||
{
|
{
|
||||||
/* Raise a hard error */
|
/* Raise a hard error */
|
||||||
DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status);
|
DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status);
|
||||||
#if 0
|
|
||||||
Status = NtRaiseHardError(STATUS_IO_PRIVILEGE_FAILED,
|
Status = NtRaiseHardError(STATUS_IO_PRIVILEGE_FAILED,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
OptionOk,
|
OptionOk,
|
||||||
&Response);
|
&Response);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize CSR through CSRSRV */
|
/* Initialize CSR through CSRSRV */
|
||||||
|
|
|
@ -326,12 +326,7 @@ CreateSystemThreads(PVOID pParam)
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
WINAPI
|
WINAPI
|
||||||
#if 1
|
|
||||||
Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll)
|
Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll)
|
||||||
#else
|
|
||||||
Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
|
|
||||||
PCSRPLUGIN_SERVER_PROCS ServerProcs)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
HANDLE ServerThread;
|
HANDLE ServerThread;
|
||||||
CLIENT_ID ClientId;
|
CLIENT_ID ClientId;
|
||||||
|
@ -347,19 +342,12 @@ Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
|
||||||
CsrInitConsoleSupport();
|
CsrInitConsoleSupport();
|
||||||
|
|
||||||
/* HACK */
|
/* HACK */
|
||||||
#if 1
|
|
||||||
ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions;
|
ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions;
|
||||||
ServerDll->HighestApiSupported = 0xDEADBABE;
|
ServerDll->HighestApiSupported = 0xDEADBABE;
|
||||||
|
|
||||||
ServerDll->HardErrorCallback = Win32CsrHardError;
|
ServerDll->HardErrorCallback = Win32CsrHardError;
|
||||||
ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable;
|
ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable;
|
||||||
ServerDll->DisconnectCallback = Win32CsrReleaseConsole;
|
ServerDll->DisconnectCallback = Win32CsrReleaseConsole;
|
||||||
#else
|
|
||||||
*ApiDefinitions = Win32CsrApiDefinitions;
|
|
||||||
ServerProcs->HardErrorProc = Win32CsrHardError;
|
|
||||||
ServerProcs->ProcessInheritProc = Win32CsrDuplicateHandleTable;
|
|
||||||
ServerProcs->ProcessDeletedProc = Win32CsrReleaseConsole;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec);
|
RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec);
|
||||||
InitializeListHead(&DosDeviceHistory);
|
InitializeListHead(&DosDeviceHistory);
|
||||||
|
|
Loading…
Reference in a new issue