reverted my previous two commits, they are part of not yet committed changes...

Modified: trunk/reactos/include/funcs.h
Modified: trunk/reactos/include/ntos/zw.h

--- trunk/reactos/include/funcs.h	2005-01-28 12:06:50 UTC (rev 13348)
+++ trunk/reactos/include/funcs.h	2005-01-28 12:12:42 UTC (rev 13349)
@@ -1534,6 +1534,20 @@

 
 NTSTATUS
 STDCALL

+NtSecureConnectPort(
+	OUT PHANDLE PortHandle,
+	IN PUNICODE_STRING PortName,
+	IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
+	IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL,
+	IN PSID ServerSid OPTIONAL,
+	IN OUT PPORT_SECTION_READ ReadSection OPTIONAL,
+	OUT PULONG MaxMessageSize OPTIONAL,
+	IN OUT PVOID ConnectData OPTIONAL,
+	IN OUT PULONG ConnectDataLength OPTIONAL
+	);
+
+NTSTATUS
+STDCALL

 NtSetHighWaitLowThread(
 	VOID
 	);
@@ -1966,6 +1980,20 @@

 
 NTSTATUS
 STDCALL

+ZwSecureConnectPort(
+	OUT PHANDLE PortHandle,
+	IN PUNICODE_STRING PortName,
+	IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
+	IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL,
+	IN PSID ServerSid OPTIONAL,
+	IN OUT PPORT_SECTION_READ ReadSection OPTIONAL,
+	OUT PULONG MaxMessageSize OPTIONAL,
+	IN OUT PVOID ConnectData OPTIONAL,
+	IN OUT PULONG ConnectDataLength OPTIONAL
+	);
+
+NTSTATUS
+STDCALL

 ZwSetHighWaitLowThread(
 	VOID
 	);

--- trunk/reactos/include/ntos/zw.h	2005-01-28 12:06:50 UTC (rev 13348)
+++ trunk/reactos/include/ntos/zw.h	2005-01-28 12:12:42 UTC (rev 13349)
@@ -465,47 +465,25 @@

 
 
 NTSTATUS STDCALL

-NtConnectPort(OUT PHANDLE PortHandle,
-              IN PUNICODE_STRING PortName,
-              IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
-              IN OUT PLPC_SECTION_WRITE ClientSharedMemory  OPTIONAL,
-              OUT PLPC_SECTION_READ ServerSharedMemory  OPTIONAL,
-              OUT PULONG MaxMessageSize  OPTIONAL,
-              IN PVOID ConnectInfo  OPTIONAL,
-              IN PULONG ConnectInfoLength  OPTIONAL);

+NtConnectPort (PHANDLE PortHandle,
+	       PUNICODE_STRING PortName,
+	       PSECURITY_QUALITY_OF_SERVICE SecurityQos,
+	       PLPC_SECTION_WRITE SectionInfo,
+	       PLPC_SECTION_READ MapInfo,
+	       PULONG MaxMessageSize,
+	       PVOID ConnectInfo,
+	       PULONG ConnectInfoLength);

 
 NTSTATUS STDCALL

-ZwConnectPort(OUT PHANDLE PortHandle,
-              IN PUNICODE_STRING PortName,
-              IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
-              IN OUT PLPC_SECTION_WRITE ClientSharedMemory  OPTIONAL,
-              OUT PLPC_SECTION_READ ServerSharedMemory  OPTIONAL,
-              OUT PULONG MaxMessageSize  OPTIONAL,
-              IN PVOID ConnectInfo  OPTIONAL,
-              IN PULONG ConnectInfoLength  OPTIONAL);

+ZwConnectPort (PHANDLE PortHandle,
+	       PUNICODE_STRING PortName,
+	       PSECURITY_QUALITY_OF_SERVICE SecurityQos,
+	       PLPC_SECTION_WRITE SectionInfo,
+	       PLPC_SECTION_READ MapInfo,
+	       PULONG MaxMessageSize,
+	       PVOID ConnectInfo,
+	       PULONG ConnectInfoLength);

-NTSTATUS STDCALL
-NtSecureConnectPort(OUT PHANDLE PortHandle,
-                    IN PUNICODE_STRING PortName,
-                    IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
-                    IN OUT PLPC_SECTION_WRITE ClientSharedMemory  OPTIONAL,
-                    IN PSID ServerSid  OPTIONAL,
-                    OUT PLPC_SECTION_READ ServerSharedMemory  OPTIONAL,
-                    OUT PULONG MaxMessageSize  OPTIONAL,
-                    IN PVOID ConnectInfo  OPTIONAL,
-                    IN PULONG ConnectInfoLength  OPTIONAL);
-
-NTSTATUS STDCALL
-ZwSecureConnectPort(OUT PHANDLE PortHandle,
-                    IN PUNICODE_STRING PortName,
-                    IN PSECURITY_QUALITY_OF_SERVICE SecurityQos,
-                    IN OUT PLPC_SECTION_WRITE ClientSharedMemory  OPTIONAL,
-                    IN PSID ServerSid  OPTIONAL,
-                    OUT PLPC_SECTION_READ ServerSharedMemory  OPTIONAL,
-                    OUT PULONG MaxMessageSize  OPTIONAL,
-                    IN PVOID ConnectInfo  OPTIONAL,
-                    IN PULONG ConnectInfoLength  OPTIONAL);
-

 /*
  * FUNCTION: Creates a directory object
  * ARGUMENTS: