Synchronize with trunk revision 59781.

[reactos.git] / include / reactos / subsys / csr / csrmsg.h

diff --git a/include/reactos/subsys/csr/csrmsg.h b/include/reactos/subsys/csr/csrmsg.h
index b750aff..4d0be5f 100644 (file)
--- a/include/reactos/subsys/csr/csrmsg.h
+++ b/include/reactos/subsys/csr/csrmsg.h
@@ -32,13 +32,6 @@ typedef enum _CSRSRV_API_NUMBER
 } CSRSRV_API_NUMBER, *PCSRSRV_API_NUMBER;
 
 
-/*
-typedef struct _CSR_API_NUMBER
-{
-    WORD Index;
-    WORD Subsystem;
-} CSR_API_NUMBER, *PCSR_API_NUMBER;
-*/
 typedef ULONG CSR_API_NUMBER;
 
 #define CSR_CREATE_API_NUMBER(ServerId, ApiId) \
@@ -51,7 +44,7 @@ typedef ULONG CSR_API_NUMBER;
     (ULONG)((ULONG)(ApiNumber) & 0xFFFF)
 
 
-typedef struct _CSR_CONNECTION_INFO
+typedef struct _CSR_API_CONNECTINFO
 {
     ULONG Version;
     ULONG Unknown;
@@ -62,10 +55,12 @@ typedef struct _CSR_CONNECTION_INFO
     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
@@ -107,7 +102,7 @@ typedef struct _CSR_API_MESSAGE
     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;