[ros-diffs] [hbelusca] 61915: Sync with trunk rev.61914 for BaseVdm fixes.

Author: hbelusca
Date: Sun Feb  2 00:25:25 2014
New Revision: 61915

URL: http://svn.reactos.org/svn/reactos?rev=61915&view=rev
Log:
Sync with trunk rev.61914 for BaseVdm fixes.

Modified:
    branches/ntvdm/   (props changed)
    branches/ntvdm/dll/win32/kernel32/client/proc.c
    branches/ntvdm/dll/win32/kernel32/client/vdm.c
    branches/ntvdm/dll/win32/kernel32/include/vdm.h

Propchange: branches/ntvdm/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Feb  2 00:25:25 2014
@@ -16,4 +16,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:59241-61910
+/trunk/reactos:59241-61914

Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client…
==============================================================================
--- branches/ntvdm/dll/win32/kernel32/client/proc.c	[iso-8859-1] (original)
+++ branches/ntvdm/dll/win32/kernel32/client/proc.c	[iso-8859-1] Sun Feb  2 00:25:25 2014
@@ -2378,7 +2378,7 @@
     ANSI_STRING VdmAnsiEnv;
     UNICODE_STRING VdmString, VdmUnicodeEnv;
     BOOLEAN IsWowApp;
-    PBASE_CHECK_VDM VdmMsg;
+    PBASE_CHECK_VDM CheckVdmMsg;
 
     /* Zero out the initial core variables and handles */
     QuerySection = FALSE;
@@ -2433,7 +2433,7 @@
 
     /* Set message structures */
     CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest;
-    VdmMsg = &CsrMsg.Data.CheckVDMRequest;
+    CheckVdmMsg = &CsrMsg.Data.CheckVDMRequest;
 
     /* Clear the more complex structures by zeroing out their entire memory */
     RtlZeroMemory(&Context, sizeof(Context));
@@ -3206,7 +3206,7 @@
                                           lpCommandLine,
                                           lpCurrentDirectory,
                                           &VdmAnsiEnv,
-                                          (PCSR_API_MESSAGE)VdmMsg,
+                                          &CsrMsg,
                                           &VdmTask,
                                           dwCreationFlags,
                                           &StartupInfo,
@@ -3232,9 +3232,9 @@
                 }
 
                 /* Check which VDM state we're currently in */
-                switch (VdmMsg->VDMState & (VDM_NOT_LOADED |
-                                            VDM_NOT_READY |
-                                            VDM_READY))
+                switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED |
+                                                 VDM_NOT_READY |
+                                                 VDM_READY))
                 {
                     case VDM_NOT_LOADED:
                         /* VDM is not fully loaded, so not that much to undo */
@@ -3274,7 +3274,7 @@
                         VdmUndoLevel = VDM_UNDO_REUSE;
 
                         /* Check if CSRSS wants us to wait on VDM */
-                        VdmWaitObject = VdmMsg->WaitObjectForParent;
+                        VdmWaitObject = CheckVdmMsg->WaitObjectForParent;
                         break;
 
                     case VDM_NOT_READY:
@@ -3343,7 +3343,7 @@
                                       lpCommandLine,
                                       lpCurrentDirectory,
                                       &VdmAnsiEnv,
-                                      (PCSR_API_MESSAGE)VdmMsg,
+                                      &CsrMsg,
                                       &VdmTask,
                                       dwCreationFlags,
                                       &StartupInfo,
@@ -3358,9 +3358,9 @@
                 };
 
                 /* Handle possible VDM states */
-                switch (VdmMsg->VDMState & (VDM_NOT_LOADED |
-                                            VDM_NOT_READY |
-                                            VDM_READY))
+                switch (CheckVdmMsg->VDMState & (VDM_NOT_LOADED |
+                                                 VDM_NOT_READY |
+                                                 VDM_READY))
                 {
                     case VDM_NOT_LOADED:
                         /* If VDM is not loaded, we'll do a partial undo */
@@ -3397,7 +3397,7 @@
                         VdmUndoLevel = VDM_UNDO_REUSE;
 
                         /* Check if CSRSS wants us to wait on VDM */
-                        VdmWaitObject = VdmMsg->WaitObjectForParent;
+                        VdmWaitObject = CheckVdmMsg->WaitObjectForParent;
                         break;
 
                     case VDM_NOT_READY:
@@ -4254,7 +4254,7 @@
     {
         /* IA32, IA64 and AMD64 are supported in Server 2003 */
         case IMAGE_FILE_MACHINE_I386:
-         CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
+            CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
             break;
         case IMAGE_FILE_MACHINE_IA64:
             CreateProcessMsg->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_IA64;

Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client…
==============================================================================
--- branches/ntvdm/dll/win32/kernel32/client/vdm.c	[iso-8859-1] (original)
+++ branches/ntvdm/dll/win32/kernel32/client/vdm.c	[iso-8859-1] Sun Feb  2 00:25:25 2014
@@ -71,7 +71,7 @@
              IN PCWCH CommandLine,
              IN PCWCH CurrentDirectory,
              IN PANSI_STRING AnsiEnvironment,
-             IN PCSR_API_MESSAGE ApiMessage,
+             IN PBASE_API_MESSAGE ApiMessage,
              IN OUT PULONG iTask,
              IN DWORD CreationFlags,
              IN LPSTARTUPINFOW StartupInfo,

Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ…
==============================================================================
--- branches/ntvdm/dll/win32/kernel32/include/vdm.h	[iso-8859-1] (original)
+++ branches/ntvdm/dll/win32/kernel32/include/vdm.h	[iso-8859-1] Sun Feb  2 00:25:25 2014
@@ -127,7 +127,7 @@
     IN PCWCH CommandLine,
     IN PCWCH CurrentDirectory,
     IN PANSI_STRING AnsiEnvironment,
-    IN PCSR_API_MESSAGE ApiMessage,
+    IN PBASE_API_MESSAGE ApiMessage,
     IN OUT PULONG iTask,
     IN DWORD CreationFlags,
     IN LPSTARTUPINFOW StartupInfo,