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

[CSRSRV]: Make CSRSRV "load" its own DLL as it should. This lets it support CSRSRV native APIs from NTDLL (which we don't send yet).

Browse source 
svn path=/trunk/; revision=55648
This commit is contained in:
Alex Ionescu 2012-02-16 20:08:34 +00:00
parent d221bdfbb1
commit 63d6bdc644
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/csrss/csrsrv/init.c
View file

@ -783,11 +783,11 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount,
return Status; return Status;
} }
/* Load us */ /* Hackito ergo sum */
BasepFakeStaticServerData(); BasepFakeStaticServerData();
#if 0
/* Load us */
Status = CsrLoadServerDll("CSRSS", NULL, CSR_SRV_SERVER); Status = CsrLoadServerDll("CSRSS", NULL, CSR_SRV_SERVER);
#endif
} }
else if (!_stricmp(ParameterName, "ServerDLL")) else if (!_stricmp(ParameterName, "ServerDLL"))
{ {

2
reactos/subsystems/win32/csrss/csrsrv/server.c
View file

@ -71,7 +71,7 @@ CsrServerDllInitialization(IN PCSR_SERVER_DLL LoadedServerDll)
{ {
/* Setup the DLL Object */ /* Setup the DLL Object */
LoadedServerDll->ApiBase = 0; LoadedServerDll->ApiBase = 0;
LoadedServerDll->HighestApiSupported = 5; LoadedServerDll->HighestApiSupported = CsrpMaxApiNumber;
LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; LoadedServerDll->DispatchTable = CsrServerApiDispatchTable;
LoadedServerDll->ValidTable = CsrServerApiServerValidTable; LoadedServerDll->ValidTable = CsrServerApiServerValidTable;
LoadedServerDll->NameTable = CsrServerApiNameTable; LoadedServerDll->NameTable = CsrServerApiNameTable;

6
reactos/subsystems/win32/csrss/include/api.h
View file

@ -385,6 +385,12 @@ CsrSrvSetPriorityClass(
IN OUT PULONG Reply IN OUT PULONG Reply
); );
NTSTATUS
NTAPI
CsrLoadServerDll(IN PCHAR DllString,
IN PCHAR EntryPoint OPTIONAL,
IN ULONG ServerId);
/* api/user.c */ /* api/user.c */
CSR_API(CsrRegisterServicesProcess); CSR_API(CsrRegisterServicesProcess);