Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CSRSRV]: Update CSR_SERVER_DLL definition to Server 2003 instead of XP. Get rid of the whole initialization event stuff. This should make Windows CSRSS+CSRSRV work with our BASESRV. Thanks to Hermes for discovering there was a structure issue.

Browse source 
svn path=/trunk/; revision=60001
This commit is contained in:
Alex Ionescu 2013-09-10 08:55:09 +00:00
parent 5492bdcde2
commit 144100a4e2
3 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/include/reactos/subsys/csr/csrsrv.h
View file

@ -208,7 +208,6 @@ ULONG
typedef struct _CSR_SERVER_DLL typedef struct _CSR_SERVER_DLL
{ {
ULONG Length; ULONG Length;
HANDLE Event;
ANSI_STRING Name; ANSI_STRING Name;
HANDLE ServerHandle; HANDLE ServerHandle;
ULONG ServerId; ULONG ServerId;
@ -227,7 +226,7 @@ typedef struct _CSR_SERVER_DLL
PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback;
ULONG Unknown2[3]; ULONG Unknown2[3];
} CSR_SERVER_DLL, *PCSR_SERVER_DLL; } CSR_SERVER_DLL, *PCSR_SERVER_DLL;
C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C);
typedef typedef
NTSTATUS NTSTATUS

26
reactos/subsystems/win32/csrsrv/init.c
View file

@ -32,7 +32,6 @@ ULONG SessionId;
HANDLE BNOLinksDirectory; HANDLE BNOLinksDirectory;
HANDLE SessionObjectDirectory; HANDLE SessionObjectDirectory;
HANDLE DosDevicesDirectory; HANDLE DosDevicesDirectory;
HANDLE CsrInitializationEvent;
SYSTEM_BASIC_INFORMATION CsrNtSysInfo; SYSTEM_BASIC_INFORMATION CsrNtSysInfo;
@ -963,19 +962,6 @@ CsrServerInitialization(IN ULONG ArgumentCount,
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
/* Create the Init Event */
Status = NtCreateEvent(&CsrInitializationEvent,
EVENT_ALL_ACCESS,
NULL,
SynchronizationEvent,
FALSE);
if (!NT_SUCCESS(Status))
{
DPRINT1("CSRSRV:%s: NtCreateEvent failed (Status=%08lx)\n",
__FUNCTION__, Status);
return Status;
}
/* Cache System Basic Information so we don't always request it */ /* Cache System Basic Information so we don't always request it */
Status = NtQuerySystemInformation(SystemBasicInformation, Status = NtQuerySystemInformation(SystemBasicInformation,
&CsrNtSysInfo, &CsrNtSysInfo,
@ -1066,18 +1052,6 @@ CsrServerInitialization(IN ULONG ArgumentCount,
return Status; return Status;
} }
/* Finito! Signal the event */
Status = NtSetEvent(CsrInitializationEvent, NULL);
if (!NT_SUCCESS(Status))
{
DPRINT1("CSRSRV:%s: NtSetEvent failed (Status=%08lx)\n",
__FUNCTION__, Status);
return Status;
}
/* Close the event handle now */
NtClose(CsrInitializationEvent);
/* Have us handle Hard Errors */ /* Have us handle Hard Errors */
Status = NtSetDefaultHardErrorPort(CsrApiPort); Status = NtSetDefaultHardErrorPort(CsrApiPort);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))

1
reactos/subsystems/win32/csrsrv/server.c
View file

@ -168,7 +168,6 @@ CsrLoadServerDll(IN PCHAR DllString,
/* Set up the Object */ /* Set up the Object */
ServerDll->Length = Size; ServerDll->Length = Size;
ServerDll->SharedSection = CsrSrvSharedSectionHeap; // Send to the server dll our shared heap pointer. ServerDll->SharedSection = CsrSrvSharedSectionHeap; // Send to the server dll our shared heap pointer.
ServerDll->Event = CsrInitializationEvent;
ServerDll->Name.Length = DllName.Length; ServerDll->Name.Length = DllName.Length;
ServerDll->Name.MaximumLength = DllName.MaximumLength; ServerDll->Name.MaximumLength = DllName.MaximumLength;
ServerDll->Name.Buffer = (PCHAR)(ServerDll + 1); ServerDll->Name.Buffer = (PCHAR)(ServerDll + 1);