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

svn path=/trunk/; revision=13349

diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 930a718..573b18e 100644 (file)
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -1532,6 +1532,20 @@ NtResumeProcess(
        IN HANDLE Process
        );
 
+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(
@@ -1964,6 +1978,20 @@ ZwResumeProcess(
        IN HANDLE Process
        );
 
+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(

diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index e968243..2682b07 100755 (executable)
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -465,46 +465,24 @@ ZwCompleteConnectPort (HANDLE PortHandle);
 
 
 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);
-
-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);
+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);
 
 /*
  * FUNCTION: Creates a directory object