[ros-diffs] [ion] 55648: [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).

[ion]

Author: ion
Date: Thu Feb 16 20:08:34 2012
New Revision: 55648

URL: http://svn.reactos.org/svn/reactos?rev=55648&view=rev
Log:
[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).

Modified:
    trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/server.c
    trunk/reactos/subsystems/win32/csrss/include/api.h

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/init.c?rev=55648&r1=55647&r2=55648&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 
20:08:34 2012
@@ -783,11 +783,11 @@
                 return Status;
             }
 
+            /* Hackito ergo sum */
+            BasepFakeStaticServerData();
+
             /* Load us */
-            BasepFakeStaticServerData();
-            #if 0
             Status = CsrLoadServerDll("CSRSS", NULL, CSR_SRV_SERVER);
-            #endif
         }
         else if (!_stricmp(ParameterName, "ServerDLL"))
         {

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/server.c?rev=55648&r1=55647&r2=55648&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Feb 
16 20:08:34 2012
@@ -71,7 +71,7 @@
 {
     /* Setup the DLL Object */
     LoadedServerDll->ApiBase = 0;
-    LoadedServerDll->HighestApiSupported = 5;
+    LoadedServerDll->HighestApiSupported = CsrpMaxApiNumber;
     LoadedServerDll->DispatchTable = CsrServerApiDispatchTable;
     LoadedServerDll->ValidTable = CsrServerApiServerValidTable;
     LoadedServerDll->NameTable = CsrServerApiNameTable;

Modified: trunk/reactos/subsystems/win32/csrss/include/api.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/include/api.h?rev=55648&r1=55647&r2=55648&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 
20:08:34 2012
@@ -385,6 +385,12 @@
     IN OUT PULONG Reply
 );
 
+NTSTATUS
+NTAPI
+CsrLoadServerDll(IN PCHAR DllString,
+                 IN PCHAR EntryPoint OPTIONAL,
+                 IN ULONG ServerId);
+                 
 /* api/user.c */
 CSR_API(CsrRegisterServicesProcess);