[ion] 24674: - Add correct calls to NtAcceptConnectPort if NTLPC is used. Now we freeze because CSRSS uses client/server views so I have to implement that.

Author: ion
Date: Mon Oct 30 19:21:21 2006
New Revision: 24674

URL: http://svn.reactos.org/svn/reactos?rev=24674&view=rev
Log:
- Add correct calls to NtAcceptConnectPort if NTLPC is used. Now we freeze because CSRSS uses client/server views so I have to implement that.

Modified:
    trunk/reactos/subsystems/win32/csrss/api/wapi.c
    trunk/reactos/subsystems/win32/csrss/csrss.rbuild

Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api/...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original)
+++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Oct 30 19:21:21 2006
@@ -217,7 +217,7 @@

CsrInitProcessData();

-	DPRINT("CSR: %s called", __FUNCTION__);
+	DPRINT1("CSR: %s called", __FUNCTION__);

for (;;)
      {
@@ -231,8 +231,13 @@
         break;
      }
    Status = NtAcceptConnectPort(& ServerPort,
+#ifdef NTLPC
+                     NULL,
+				     Request,
+#else
    			     hApiListenPort,
-				     NULL,
+                     NULL,
+#endif
    			     TRUE,
    			     0,
    			     & LpcRead);
@@ -307,7 +312,7 @@
    NTSTATUS        Status = STATUS_SUCCESS;
     PPORT_MESSAGE Reply = NULL;

-	DPRINT("CSR: %s called\n", __FUNCTION__);
+	DPRINT1("CSR: %s called\n", __FUNCTION__);

RtlZeroMemory(&Request, sizeof(PORT_MESSAGE));
    Status = NtListenPort (hSbApiPortListen, & Request);
@@ -318,8 +323,13 @@
    } else {
 DPRINT("-- 1\n");
    	Status = NtAcceptConnectPort (& hConnectedPort,
-						hSbApiPortListen,
-   						NULL,
+#ifdef NTLPC
+				     NULL,
+                     &Request,
+#else
+				     hSbApiPortListen,
+                     NULL,
+#endif
    						TRUE,
    						NULL,
       					NULL);

Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrss.rbuild (original)
+++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild Mon Oct 30 19:21:21 2006
@@ -6,6 +6,9 @@
    <define name="__USE_W32API" />
    <define name="_WIN32_WINNT">0x0600</define>
    <define name="WINVER">0x0501</define>
+    <if property="NTLPC" value="1">
+        <define name="NTLPC" />
+    </if>
    <library>nt</library>
    <library>intrlck</library>
    <library>ntdll</library>