Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API...

svn path=/trunk/; revision=59781

diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c
index 163eecb..bf89f90 100644 (file)
--- a/reactos/dll/ntdll/csr/connect.c
+++ b/reactos/dll/ntdll/csr/connect.c
@@ -44,8 +44,8 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory)
     SECURITY_QUALITY_OF_SERVICE SecurityQos;
     SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
     PSID SystemSid = NULL;
     SECURITY_QUALITY_OF_SERVICE SecurityQos;
     SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
     PSID SystemSid = NULL;

-    CSR_CONNECTION_INFO ConnectionInfo;
-    ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO);
+    CSR_API_CONNECTINFO ConnectionInfo;
+    ULONG ConnectionInfoLength = sizeof(CSR_API_CONNECTINFO);

 
     DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory);
 
 
     DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory);
 

diff --git a/reactos/dll/win32/kernel32/client/console/init.c b/reactos/dll/win32/kernel32/client/console/init.c
index a8735ae..55e8d64 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/init.c
+++ b/reactos/dll/win32/kernel32/client/console/init.c
@@ -175,7 +175,7 @@ BasepInitConsole(VOID)
     ULONG SessionId = NtCurrentPeb()->SessionId;
     BOOLEAN InServer;
 
     ULONG SessionId = NtCurrentPeb()->SessionId;
     BOOLEAN InServer;
 

-    CONSOLE_CONNECTION_INFO ConnectInfo;
+    CONSRV_API_CONNECTINFO ConnectInfo;

     ULONG ConnectInfoSize = sizeof(ConnectInfo);
 
     DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName);
     ULONG ConnectInfoSize = sizeof(ConnectInfo);
 
     DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName);

diff --git a/reactos/include/reactos/subsys/csr/csrmsg.h b/reactos/include/reactos/subsys/csr/csrmsg.h
index a7d08cf..4d0be5f 100644 (file)
--- a/reactos/include/reactos/subsys/csr/csrmsg.h
+++ b/reactos/include/reactos/subsys/csr/csrmsg.h
@@ -44,7 +44,7 @@ typedef ULONG CSR_API_NUMBER;
     (ULONG)((ULONG)(ApiNumber) & 0xFFFF)
 
 
     (ULONG)((ULONG)(ApiNumber) & 0xFFFF)
 
 

-typedef struct _CSR_CONNECTION_INFO
+typedef struct _CSR_API_CONNECTINFO

 {
     ULONG Version;
     ULONG Unknown;
 {
     ULONG Version;
     ULONG Unknown;


@@ -55,12 +55,12 @@ typedef struct _CSR_CONNECTION_INFO
     ULONG DebugFlags;
     ULONG Unknown2[3];
     HANDLE ProcessId;
     ULONG DebugFlags;
     ULONG Unknown2[3];
     HANDLE ProcessId;

-} CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO;
+} CSR_API_CONNECTINFO, *PCSR_API_CONNECTINFO;

 
 #define CSRSRV_VERSION 0x10000
 
 // We must have a size at most equal to the maximum acceptable LPC data size.
 
 #define CSRSRV_VERSION 0x10000
 
 // We must have a size at most equal to the maximum acceptable LPC data size.

-C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH);
+C_ASSERT(sizeof(CSR_API_CONNECTINFO) <= LPC_MAX_DATA_LENGTH);

 
 
 typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD
 
 
 typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD


@@ -102,7 +102,7 @@ typedef struct _CSR_API_MESSAGE
     PORT_MESSAGE Header;
     union
     {
     PORT_MESSAGE Header;
     union
     {

-        CSR_CONNECTION_INFO ConnectionInfo; // Uniquely used in CSRSRV for internal signaling (opening a new connection).
+        CSR_API_CONNECTINFO ConnectionInfo; // Uniquely used in CSRSRV for internal signaling (opening a new connection).

         struct
         {
             PCSR_CAPTURE_BUFFER CsrCaptureData;
         struct
         {
             PCSR_CAPTURE_BUFFER CsrCaptureData;

diff --git a/reactos/include/reactos/subsys/win/basemsg.h b/reactos/include/reactos/subsys/win/basemsg.h
index 8f4c5e4..2b77d74 100644 (file)
--- a/reactos/include/reactos/subsys/win/basemsg.h
+++ b/reactos/include/reactos/subsys/win/basemsg.h
@@ -53,7 +53,7 @@ typedef enum _BASESRV_API_NUMBER
 } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
 
 
 } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
 
 

-typedef struct
+typedef struct _BASESRV_API_CONNECTINFO

 {
     ULONG  ExpectedVersion;
     HANDLE DefaultObjectDirectory;
 {
     ULONG  ExpectedVersion;
     HANDLE DefaultObjectDirectory;

diff --git a/reactos/include/reactos/subsys/win/conmsg.h b/reactos/include/reactos/subsys/win/conmsg.h
index 0867163..bebd8ec 100644 (file)
--- a/reactos/include/reactos/subsys/win/conmsg.h
+++ b/reactos/include/reactos/subsys/win/conmsg.h
@@ -126,7 +126,7 @@ typedef struct _CONSOLE_START_INFO
     INT   IconIndex;                    // Index of the icon
 } CONSOLE_START_INFO, *PCONSOLE_START_INFO;
 
     INT   IconIndex;                    // Index of the icon
 } CONSOLE_START_INFO, *PCONSOLE_START_INFO;
 

-typedef struct _CONSOLE_CONNECTION_INFO
+typedef struct _CONSRV_API_CONNECTINFO

 {
     BOOL ConsoleNeeded; // Used for GUI apps only.
 
 {
     BOOL ConsoleNeeded; // Used for GUI apps only.
 


@@ -140,7 +140,7 @@ typedef struct _CONSOLE_CONNECTION_INFO
     HANDLE InputWaitHandle;
     LPTHREAD_START_ROUTINE CtrlDispatcher;
     LPTHREAD_START_ROUTINE PropDispatcher;
     HANDLE InputWaitHandle;
     LPTHREAD_START_ROUTINE CtrlDispatcher;
     LPTHREAD_START_ROUTINE PropDispatcher;

-} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO;
+} CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO;

 
 
 typedef struct
 
 
 typedef struct

diff --git a/reactos/subsystems/win32/csrsrv/api.c b/reactos/subsystems/win32/csrsrv/api.c
index d56b50d..123f302 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/api.c
+++ b/reactos/subsystems/win32/csrsrv/api.c
@@ -134,7 +134,7 @@ CsrApiHandleConnectionRequest(IN PCSR_API_MESSAGE ApiMessage)
     PCSR_THREAD CsrThread = NULL;
     PCSR_PROCESS CsrProcess = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
     PCSR_THREAD CsrThread = NULL;
     PCSR_PROCESS CsrProcess = NULL;
     NTSTATUS Status = STATUS_SUCCESS;

-    PCSR_CONNECTION_INFO ConnectInfo = &ApiMessage->ConnectionInfo;
+    PCSR_API_CONNECTINFO ConnectInfo = &ApiMessage->ConnectionInfo;

     BOOLEAN AllowConnection = FALSE;
     REMOTE_PORT_VIEW RemotePortView;
     HANDLE ServerPort;
     BOOLEAN AllowConnection = FALSE;
     REMOTE_PORT_VIEW RemotePortView;
     HANDLE ServerPort;


@@ -913,7 +913,7 @@ CsrApiPortInitialize(VOID)
     {
         DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName);
         DPRINT1("CSRSS: sizeof( CONNECTINFO ) == %ld  sizeof( API_MSG ) == %ld\n",
     {
         DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName);
         DPRINT1("CSRSS: sizeof( CONNECTINFO ) == %ld  sizeof( API_MSG ) == %ld\n",

-                sizeof(CSR_CONNECTION_INFO), sizeof(CSR_API_MESSAGE));
+                sizeof(CSR_API_CONNECTINFO), sizeof(CSR_API_MESSAGE));

     }
 
     /* FIXME: Create a Security Descriptor */
     }
 
     /* FIXME: Create a Security Descriptor */


@@ -928,7 +928,7 @@ CsrApiPortInitialize(VOID)
     /* Create the Port Object */
     Status = NtCreatePort(&CsrApiPort,
                           &ObjectAttributes,
     /* Create the Port Object */
     Status = NtCreatePort(&CsrApiPort,
                           &ObjectAttributes,

-                          sizeof(CSR_CONNECTION_INFO),
+                          sizeof(CSR_API_CONNECTINFO),

                           sizeof(CSR_API_MESSAGE),
                           16 * PAGE_SIZE);
     if (NT_SUCCESS(Status))
                           sizeof(CSR_API_MESSAGE),
                           16 * PAGE_SIZE);
     if (NT_SUCCESS(Status))

diff --git a/reactos/subsystems/win32/csrsrv/api.h b/reactos/subsystems/win32/csrsrv/api.h
index 60385d9..e03cc89 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/api.h
+++ b/reactos/subsystems/win32/csrsrv/api.h
@@ -172,7 +172,7 @@ CsrInitializeNtSessionList(VOID);
 NTSTATUS
 NTAPI
 CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,
 NTSTATUS
 NTAPI
 CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,

-                          OUT PCSR_CONNECTION_INFO ConnectInfo);
+                          OUT PCSR_API_CONNECTINFO ConnectInfo);

 
 NTSTATUS
 NTAPI
 
 NTSTATUS
 NTAPI

diff --git a/reactos/subsystems/win32/csrsrv/server.c b/reactos/subsystems/win32/csrsrv/server.c
index 15d2e59..668a0f4 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/server.c
+++ b/reactos/subsystems/win32/csrsrv/server.c
@@ -444,7 +444,7 @@ CsrSrvCreateSharedSection(IN PCHAR ParameterValue)
 NTSTATUS
 NTAPI
 CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,
 NTSTATUS
 NTAPI
 CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,

-                          OUT PCSR_CONNECTION_INFO ConnectInfo)
+                          OUT PCSR_API_CONNECTINFO ConnectInfo)

 {
     NTSTATUS Status;
     ULONG ViewSize = 0;
 {
     NTSTATUS Status;
     ULONG ViewSize = 0;

diff --git a/reactos/win32ss/user/winsrv/consrv/init.c b/reactos/win32ss/user/winsrv/consrv/init.c
index a1ba235..e2ee993 100644 (file)
--- a/reactos/win32ss/user/winsrv/consrv/init.c
+++ b/reactos/win32ss/user/winsrv/consrv/init.c
@@ -397,12 +397,12 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
      **************************************************************************/
 
     NTSTATUS Status = STATUS_SUCCESS;
      **************************************************************************/
 
     NTSTATUS Status = STATUS_SUCCESS;

-    PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo;
+    PCONSRV_API_CONNECTINFO ConnectInfo = (PCONSRV_API_CONNECTINFO)ConnectionInfo;

     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess);
 
     if ( ConnectionInfo       == NULL ||
          ConnectionInfoLength == NULL ||
     PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess);
 
     if ( ConnectionInfo       == NULL ||
          ConnectionInfoLength == NULL ||

-        *ConnectionInfoLength != sizeof(CONSOLE_CONNECTION_INFO) )
+        *ConnectionInfoLength != sizeof(CONSRV_API_CONNECTINFO) )

     {
         DPRINT1("CONSRV: Connection failed\n");
         return STATUS_UNSUCCESSFUL;
     {
         DPRINT1("CONSRV: Connection failed\n");
         return STATUS_UNSUCCESSFUL;