[NTDLL/KERNEL32/CSRSRV/WIN32K/USER32/WIN32CSR]

[reactos.git] / dll / ntdll / csr / api.c

diff --git a/dll/ntdll/csr/api.c b/dll/ntdll/csr/api.c
index de280d9..965fe5c 100644 (file)
--- a/dll/ntdll/csr/api.c
+++ b/dll/ntdll/csr/api.c
@@ -37,8 +37,8 @@ CsrSetPriorityClass(HANDLE hProcess,
                     PULONG PriorityClass)
 {
     NTSTATUS Status;
-    CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */
-    PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass;
+    CSR_API_MESSAGE ApiMessage;
+    PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.Data.SetPriorityClass;
 
     /* Set up the data for CSR */
     DbgBreakPoint();
@@ -46,10 +46,9 @@ CsrSetPriorityClass(HANDLE hProcess,
     SetPriorityClass->PriorityClass = *PriorityClass;
 
     /* Call it */
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+    Status = CsrClientCallServer(&ApiMessage,
                                  NULL,
-                                 CSR_MAKE_OPCODE(CsrpSetPriorityClass,
-                                                 CSR_SRV_SERVER),
+                                 CSR_CREATE_API_NUMBER(CSR_SRV_SERVER, CsrpSetPriorityClass),
                                  sizeof(CSR_SET_PRIORITY_CLASS));
     
     /* Return what we got, if requested */
@@ -67,19 +66,18 @@ NTAPI
 CsrIdentifyAlertableThread (VOID)
 {
     NTSTATUS Status;
-    CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */
+    CSR_API_MESSAGE ApiMessage;
     PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
     
     /* Set up the data for CSR */
     DbgBreakPoint();
-    IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread;
+    IdentifyAlertableThread = &ApiMessage.Data.IdentifyAlertableThread;
     IdentifyAlertableThread->Cid = NtCurrentTeb()->ClientId;
 
     /* Call it */
-    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+    Status = CsrClientCallServer(&ApiMessage,
                                  NULL,
-                                 CSR_MAKE_OPCODE(CsrpIdentifyAlertable,
-                                                 CSR_SRV_SERVER),
+                                 CSR_CREATE_API_NUMBER(CSR_SRV_SERVER, CsrpIdentifyAlertable),
                                  sizeof(CSR_SET_PRIORITY_CLASS));
 
     /* Return to caller */