[KERNEL32]

[reactos.git] / dll / win32 / kernel32 / client / vdm.c

diff --git a/dll/win32/kernel32/client/vdm.c b/dll/win32/kernel32/client/vdm.c
index 8035587..051c9e4 100644 (file)
--- a/dll/win32/kernel32/client/vdm.c
+++ b/dll/win32/kernel32/client/vdm.c
@@ -70,7 +70,7 @@ BaseCheckVDM(IN ULONG BinaryType,
              IN PCWCH CommandLine,
              IN PCWCH CurrentDirectory,
              IN PANSI_STRING AnsiEnvironment,
              IN PCWCH CommandLine,
              IN PCWCH CurrentDirectory,
              IN PANSI_STRING AnsiEnvironment,

-             IN PCSR_API_MESSAGE Msg,
+             IN PCSR_API_MESSAGE ApiMessage,

              IN OUT PULONG iTask,
              IN DWORD CreationFlags,
              IN LPSTARTUPINFOW StartupInfo)
              IN OUT PULONG iTask,
              IN DWORD CreationFlags,
              IN LPSTARTUPINFOW StartupInfo)


@@ -87,8 +87,10 @@ BaseUpdateVDMEntry(IN ULONG UpdateIndex,
                    IN ULONG IndexInfo,
                    IN ULONG BinaryType)
 {
                    IN ULONG IndexInfo,
                    IN ULONG BinaryType)
 {

+#if 0 // Unimplemented in BASESRV

     NTSTATUS Status;
     NTSTATUS Status;

-    CSR_API_MESSAGE Msg;
+    BASE_API_MESSAGE ApiMessage;
+    PBASE_UPDATE_VDM_ENTRY UpdateVdmEntry = &ApiMessage.Data.UpdateVdmEntry;

 
     /* Check what update is being sent */
     switch (UpdateIndex)
 
     /* Check what update is being sent */
     switch (UpdateIndex)


@@ -97,16 +99,16 @@ BaseUpdateVDMEntry(IN ULONG UpdateIndex,
         case VdmEntryUndo:
 
             /* Tell the server how far we had gotten along */
         case VdmEntryUndo:
 
             /* Tell the server how far we had gotten along */

-            Msg.Data.UpdateVdmEntry.iTask = (ULONG)*WaitHandle;
-            Msg.Data.UpdateVdmEntry.VDMCreationState = IndexInfo;
+            UpdateVdmEntry->iTask = (ULONG)*WaitHandle;
+            UpdateVdmEntry->VDMCreationState = IndexInfo;

             break;
 
         /* VDM is ready with a new process handle */
         case VdmEntryUpdateProcess:
 
             /* Send it the process handle */
             break;
 
         /* VDM is ready with a new process handle */
         case VdmEntryUpdateProcess:
 
             /* Send it the process handle */

-            Msg.Data.UpdateVdmEntry.VDMProcessHandle = *WaitHandle;
-            Msg.Data.UpdateVdmEntry.iTask = IndexInfo;
+            UpdateVdmEntry->VDMProcessHandle = *WaitHandle;
+            UpdateVdmEntry->iTask = IndexInfo;

             break;
     }
 
             break;
     }
 


@@ -114,32 +116,32 @@ BaseUpdateVDMEntry(IN ULONG UpdateIndex,
     if (BinaryType == BINARY_TYPE_WOW)
     {
         /* Magic value for 16-bit apps */
     if (BinaryType == BINARY_TYPE_WOW)
     {
         /* Magic value for 16-bit apps */

-        Msg.Data.UpdateVdmEntry.ConsoleHandle = (HANDLE)-1;
+        UpdateVdmEntry->ConsoleHandle = (HANDLE)-1;

     }
     }

-    else if (Msg.Data.UpdateVdmEntry.iTask)
+    else if (UpdateVdmEntry->iTask)

     {
         /* No handle for true VDM */
     {
         /* No handle for true VDM */

-        Msg.Data.UpdateVdmEntry.ConsoleHandle = 0;
+        UpdateVdmEntry->ConsoleHandle = 0;

     }
     else
     {
         /* Otherwise, send the regular consoel handle */
     }
     else
     {
         /* Otherwise, send the regular consoel handle */

-        Msg.Data.UpdateVdmEntry.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+        UpdateVdmEntry->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;

     }
 
     /* Finally write the index and binary type */
     }
 
     /* Finally write the index and binary type */

-    Msg.Data.UpdateVdmEntry.EntryIndex = UpdateIndex;
-    Msg.Data.UpdateVdmEntry.BinaryType = BinaryType;
+    UpdateVdmEntry->EntryIndex = UpdateIndex;
+    UpdateVdmEntry->BinaryType = BinaryType;

 
     /* Send the message to CSRSS */
 
     /* Send the message to CSRSS */

-    Status = CsrClientCallServer(&Msg,
+    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,

                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry),
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry),

-                                 sizeof(Msg));
-    if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(Msg.Status)))
+                                 sizeof(BASE_UPDATE_VDM_ENTRY));
+    if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(ApiMessage.Status)))

     {
         /* Handle failure */
     {
         /* Handle failure */

-        BaseSetLastNTError(Msg.Status);
+        BaseSetLastNTError(ApiMessage.Status);

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -147,9 +149,9 @@ BaseUpdateVDMEntry(IN ULONG UpdateIndex,
     if (UpdateIndex == VdmEntryUpdateProcess)
     {
         /* Return it to the caller */
     if (UpdateIndex == VdmEntryUpdateProcess)
     {
         /* Return it to the caller */

-        *WaitHandle = Msg.Data.UpdateVdmEntry.WaitObjectForParent;
+        *WaitHandle = UpdateVdmEntry->WaitObjectForParent;

     }
     }

-
+#endif

     /* We made it */
     return TRUE;
 }
     /* We made it */
     return TRUE;
 }


@@ -159,9 +161,11 @@ WINAPI
 BaseCheckForVDM(IN HANDLE ProcessHandle,
                 OUT LPDWORD ExitCode)
 {
 BaseCheckForVDM(IN HANDLE ProcessHandle,
                 OUT LPDWORD ExitCode)
 {

+#if 0 // Unimplemented in BASESRV

     NTSTATUS Status;
     EVENT_BASIC_INFORMATION EventBasicInfo;
     NTSTATUS Status;
     EVENT_BASIC_INFORMATION EventBasicInfo;

-    CSR_API_MESSAGE Msg;
+    BASE_API_MESSAGE ApiMessage;
+    PBASE_GET_VDM_EXIT_CODE GetVdmExitCode = &ApiMessage.Data.GetVdmExitCode;

 
     /* It's VDM if the process is actually a wait handle (an event) */
     Status = NtQueryEvent(ProcessHandle,
 
     /* It's VDM if the process is actually a wait handle (an event) */
     Status = NtQueryEvent(ProcessHandle,


@@ -172,18 +176,19 @@ BaseCheckForVDM(IN HANDLE ProcessHandle,
     if (!NT_SUCCESS(Status)) return FALSE;
 
     /* Setup the input parameters */
     if (!NT_SUCCESS(Status)) return FALSE;
 
     /* Setup the input parameters */

-    Msg.Data.GetVdmExitCode.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
-    Msg.Data.GetVdmExitCode.hParent = ProcessHandle;
+    GetVdmExitCode->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle;
+    GetVdmExitCode->hParent = ProcessHandle;

 
     /* Call CSRSS */
 
     /* Call CSRSS */

-    Status = CsrClientCallServer(&Msg,
+    Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,

                                  NULL,
                                  NULL,

-                                 CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCheckVDM /* BasepGetVDMExitCode */),
-                                 sizeof(Msg));
+                                 CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetVDMExitCode /* BasepCheckVDM */),
+                                 sizeof(BASE_GET_VDM_EXIT_CODE));

     if (!NT_SUCCESS(Status)) return FALSE;
 
     /* Get the exit code from the reply */
     if (!NT_SUCCESS(Status)) return FALSE;
 
     /* Get the exit code from the reply */

-    *ExitCode = Msg.Data.GetVdmExitCode.ExitCode;
+    *ExitCode = GetVdmExitCode->ExitCode;
+#endif

     return TRUE;
 }
 
     return TRUE;
 }