[hbelusca] 59781: Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API_CONNECTINFO
Author: hbelusca Date: Mon Aug 19 18:14:43 2013 New Revision: 59781
URL: http://svn.reactos.org/svn/reactos?rev=59781&view=rev Log: Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API_CONNECTINFO
Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/include/reactos/subsys/csr/csrmsg.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/server.c trunk/reactos/win32ss/user/winsrv/consrv/init.c
Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?rev... ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -44,8 +44,8 @@ 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);
Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/c... ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -175,7 +175,7 @@ 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);
Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr/... ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -44,7 +44,7 @@ (ULONG)((ULONG)(ApiNumber) & 0xFFFF)
-typedef struct _CSR_CONNECTION_INFO +typedef struct _CSR_API_CONNECTINFO { ULONG Version; ULONG Unknown; @@ -55,12 +55,12 @@ 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. -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 @@ -102,7 +102,7 @@ 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;
Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win/... ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -53,7 +53,7 @@ } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
-typedef struct +typedef struct _BASESRV_API_CONNECTINFO { ULONG ExpectedVersion; HANDLE DefaultObjectDirectory;
Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win/... ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -126,7 +126,7 @@ 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.
@@ -140,7 +140,7 @@ HANDLE InputWaitHandle; LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE PropDispatcher; -} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; +} CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO;
typedef struct
Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/api... ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -134,7 +134,7 @@ 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; @@ -913,7 +913,7 @@ { 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 */ @@ -928,7 +928,7 @@ /* 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))
Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/api... ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -172,7 +172,7 @@ NTSTATUS NTAPI CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, - OUT PCSR_CONNECTION_INFO ConnectInfo); + OUT PCSR_API_CONNECTINFO ConnectInfo);
NTSTATUS NTAPI
Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ser... ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -444,7 +444,7 @@ NTSTATUS NTAPI CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, - OUT PCSR_CONNECTION_INFO ConnectInfo) + OUT PCSR_API_CONNECTINFO ConnectInfo) { NTSTATUS Status; ULONG ViewSize = 0;
Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -397,12 +397,12 @@ **************************************************************************/
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 || - *ConnectionInfoLength != sizeof(CONSOLE_CONNECTION_INFO) ) + *ConnectionInfoLength != sizeof(CONSRV_API_CONNECTINFO) ) { DPRINT1("CONSRV: Connection failed\n"); return STATUS_UNSUCCESSFUL;
-
hbelusca＠svn.reactos.org