Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API_CONNECTINFO

Browse source 
svn path=/trunk/; revision=59781
This commit is contained in:
Hermès Bélusca-Maïto 2013-08-19 18:14:43 +00:00
parent 8925f44f91
commit 7e36ed9fa8
9 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/ntdll/csr/connect.c
View file

@ -44,8 +44,8 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory)
SECURITY_QUALITY_OF_SERVICE SecurityQos; SECURITY_QUALITY_OF_SERVICE SecurityQos;
SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY};
PSID SystemSid = NULL; PSID SystemSid = NULL;
CSR_CONNECTION_INFO ConnectionInfo; CSR_API_CONNECTINFO ConnectionInfo;
ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); ULONG ConnectionInfoLength = sizeof(CSR_API_CONNECTINFO);
DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory);

2
reactos/dll/win32/kernel32/client/console/init.c
View file

@ -175,7 +175,7 @@ BasepInitConsole(VOID)
ULONG SessionId = NtCurrentPeb()->SessionId; ULONG SessionId = NtCurrentPeb()->SessionId;
BOOLEAN InServer; BOOLEAN InServer;
CONSOLE_CONNECTION_INFO ConnectInfo; CONSRV_API_CONNECTINFO ConnectInfo;
ULONG ConnectInfoSize = sizeof(ConnectInfo); ULONG ConnectInfoSize = sizeof(ConnectInfo);
DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName); DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName);

8
reactos/include/reactos/subsys/csr/csrmsg.h
View file

@ -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 Version;
ULONG Unknown; ULONG Unknown;
@ -55,12 +55,12 @@ typedef struct _CSR_CONNECTION_INFO
ULONG DebugFlags; ULONG DebugFlags;
ULONG Unknown2[3]; ULONG Unknown2[3];
HANDLE ProcessId; HANDLE ProcessId;
} CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; } CSR_API_CONNECTINFO, *PCSR_API_CONNECTINFO;
#define CSRSRV_VERSION 0x10000 #define CSRSRV_VERSION 0x10000
// We must have a size at most equal to the maximum acceptable LPC data size. // 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; PORT_MESSAGE Header;
union 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 struct
{ {
PCSR_CAPTURE_BUFFER CsrCaptureData; PCSR_CAPTURE_BUFFER CsrCaptureData;

2
reactos/include/reactos/subsys/win/basemsg.h
View file

@ -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; ULONG ExpectedVersion;
HANDLE DefaultObjectDirectory; HANDLE DefaultObjectDirectory;

4
reactos/include/reactos/subsys/win/conmsg.h
View file

@ -126,7 +126,7 @@ typedef struct _CONSOLE_START_INFO
INT IconIndex; // Index of the icon INT IconIndex; // Index of the icon
} CONSOLE_START_INFO, *PCONSOLE_START_INFO; } 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; HANDLE InputWaitHandle;
LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE CtrlDispatcher;
LPTHREAD_START_ROUTINE PropDispatcher; LPTHREAD_START_ROUTINE PropDispatcher;
} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; } CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO;
typedef struct typedef struct

6
reactos/subsystems/win32/csrsrv/api.c
View file

@ -134,7 +134,7 @@ CsrApiHandleConnectionRequest(IN PCSR_API_MESSAGE ApiMessage)
PCSR_THREAD CsrThread = NULL; PCSR_THREAD CsrThread = NULL;
PCSR_PROCESS CsrProcess = NULL; PCSR_PROCESS CsrProcess = NULL;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PCSR_CONNECTION_INFO ConnectInfo = &ApiMessage->ConnectionInfo; PCSR_API_CONNECTINFO ConnectInfo = &ApiMessage->ConnectionInfo;
BOOLEAN AllowConnection = FALSE; BOOLEAN AllowConnection = FALSE;
REMOTE_PORT_VIEW RemotePortView; REMOTE_PORT_VIEW RemotePortView;
HANDLE ServerPort; HANDLE ServerPort;
@ -913,7 +913,7 @@ CsrApiPortInitialize(VOID)
{ {
DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName); DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName);
DPRINT1("CSRSS: sizeof( CONNECTINFO ) == %ld sizeof( API_MSG ) == %ld\n", 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 */ /* Create the Port Object */
Status = NtCreatePort(&CsrApiPort, Status = NtCreatePort(&CsrApiPort,
&ObjectAttributes, &ObjectAttributes,
sizeof(CSR_CONNECTION_INFO), sizeof(CSR_API_CONNECTINFO),
sizeof(CSR_API_MESSAGE), sizeof(CSR_API_MESSAGE),
16 * PAGE_SIZE); 16 * PAGE_SIZE);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))

2
reactos/subsystems/win32/csrsrv/api.h
View file

@ -172,7 +172,7 @@ CsrInitializeNtSessionList(VOID);
NTSTATUS NTSTATUS
NTAPI NTAPI
CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,
OUT PCSR_CONNECTION_INFO ConnectInfo); OUT PCSR_API_CONNECTINFO ConnectInfo);
NTSTATUS NTSTATUS
NTAPI NTAPI

2
reactos/subsystems/win32/csrsrv/server.c
View file

@ -444,7 +444,7 @@ CsrSrvCreateSharedSection(IN PCHAR ParameterValue)
NTSTATUS NTSTATUS
NTAPI NTAPI
CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL,
OUT PCSR_CONNECTION_INFO ConnectInfo) OUT PCSR_API_CONNECTINFO ConnectInfo)
{ {
NTSTATUS Status; NTSTATUS Status;
ULONG ViewSize = 0; ULONG ViewSize = 0;

4
reactos/win32ss/user/winsrv/consrv/init.c
View file

@ -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); PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess);
if ( ConnectionInfo == NULL || if ( ConnectionInfo == NULL ||
ConnectionInfoLength == NULL || ConnectionInfoLength == NULL ||
*ConnectionInfoLength != sizeof(CONSOLE_CONNECTION_INFO) ) *ConnectionInfoLength != sizeof(CONSRV_API_CONNECTINFO) )
{ {
DPRINT1("CONSRV: Connection failed\n"); DPRINT1("CONSRV: Connection failed\n");
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;