- Allowed multiple calls to CsrClientConnectToServer.

- Removed CsrIsCsrss.

svn path=/trunk/; revision=9979

reactos/include/ntdll/csr.h

@@ -1,4 +1,4 @@
-/* $Id: csr.h,v 1.8 2003/12/02 11:38:46 gvg Exp $
+/* $Id: csr.h,v 1.9 2004/07/03 17:13:09 hbirr Exp $
  *
  */
 
@@ -33,8 +33,6 @@ CsrCaptureParameterBuffer(PVOID ParameterBuffer,
 NTSTATUS STDCALL
 CsrReleaseParameterBuffer(PVOID ClientAddress);
 
-VOID STDCALL CsrIsCsrss(VOID);
-
 #endif /* __INCLUDE_NTDLL_CSR_H */
 
 /* EOF */

reactos/lib/ntdll/csr/lpc.c

@@ -1,4 +1,4 @@
-/* $Id: lpc.c,v 1.12 2003/12/02 11:38:46 gvg Exp $
+/* $Id: lpc.c,v 1.13 2004/07/03 17:13:09 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -30,8 +30,6 @@ static PVOID CsrSectionMapBase = NULL;
 static PVOID CsrSectionMapServerBase = NULL;
 static HANDLE CsrCommHeap = NULL;
 
-static BOOL IsCsrss = FALSE;
-
 #define CSR_CONTROL_HEAP_SIZE (65536)
 
 /* FUNCTIONS *****************************************************************/
@@ -128,7 +126,7 @@ CsrClientConnectToServer(VOID)
    HANDLE CsrSectionHandle;
    LARGE_INTEGER CsrSectionViewSize;
 
-   if (IsCsrss)
+   if (WindowsApiPort != INVALID_HANDLE_VALUE)
      {
        return STATUS_SUCCESS;
      }
@@ -161,6 +159,7 @@ CsrClientConnectToServer(VOID)
 			  &ConnectInfoLength);
    if (!NT_SUCCESS(Status))
      {
+     	WindowsApiPort = INVALID_HANDLE_VALUE;
 	return(Status);
      }
 
@@ -196,10 +195,4 @@ CsrClientConnectToServer(VOID)
    return(STATUS_SUCCESS);
 }
 
-void STDCALL
-CsrIsCsrss()
-{
-   IsCsrss = TRUE;
-}
-
 /* EOF */

reactos/lib/ntdll/def/ntdll.def

@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.122 2004/06/27 12:21:14 ekohl Exp $
+; $Id: ntdll.def,v 1.123 2004/07/03 17:13:09 hbirr Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -17,7 +17,6 @@ CsrClientCallServer@16
 CsrClientConnectToServer@0
 CsrFreeCaptureBuffer@4
 CsrIdentifyAlertableThread@0
-CsrIsCsrss@0
 CsrNewThread@0
 CsrProbeForRead@12
 CsrProbeForWrite@12

reactos/lib/ntdll/def/ntdll.edf

@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.112 2004/06/27 12:21:14 ekohl Exp $
+; $Id: ntdll.edf,v 1.113 2004/07/03 17:13:09 hbirr Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -17,7 +17,6 @@ CsrClientCallServer=CsrClientCallServer@16
 CsrClientConnectToServer=CsrClientConnectToServer@0
 CsrFreeCaptureBuffer=CsrFreeCaptureBuffer@4
 CsrIdentifyAlertableThread=CsrIdentifyAlertableThread@0
-CsrIsCsrss=CsrIsCsrss@0
 CsrNewThread=CsrNewThread@0
 CsrProbeForRead=CsrProbeForRead@12
 CsrProbeForWrite=CsrProbeForWrite@12