[CSRSRV]: Port CsrCallServerFromServer (and hackplement a reactos-compatible implemem...

[reactos.git] / reactos / dll / ntdll / csr / connect.c

diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c
index 92227d0..e356cc7 100644 (file)
--- a/reactos/dll/ntdll/csr/connect.c
+++ b/reactos/dll/ntdll/csr/connect.c
@@ -19,7 +19,6 @@ HANDLE CsrProcessId;
 HANDLE CsrPortHeap;
 ULONG_PTR CsrPortMemoryDelta;
 BOOLEAN InsideCsrProcess = FALSE;
-BOOLEAN UsingOldCsr = TRUE;
 
 typedef NTSTATUS
 (NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request,
@@ -151,7 +150,7 @@ CsrClientCallServer(PCSR_API_MESSAGE ApiMessage,
     else
     {
         /* This is a server-to-server call. Save our CID and do a direct call */
-        DbgBreakPoint();
+        DPRINT1("Next gen server-to-server call\n");
         ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId;
         Status = CsrServerApiRoutine(&ApiMessage->Header,
                                      &ApiMessage->Header);
@@ -366,10 +365,10 @@ CsrClientConnectToServer(PWSTR ObjectDirectory,
     InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE);
 
     /* Now we can check if we are inside or not */
-    if (InsideCsrProcess && !UsingOldCsr)
+    if (InsideCsrProcess)
     {
         /* We're inside, so let's find csrsrv */
-        DbgBreakPoint();
+        DPRINT1("Next-GEN CSRSS support\n");
         RtlInitUnicodeString(&CsrSrvName, L"csrsrv");
         Status = LdrGetDllHandle(NULL,
                                  NULL,