Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 13:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
Remove spurious cast to CSR_API_MESSAGE. What should be noted is that CsrMsg is used by both VDM thing (via CheckVdmMsg pointer) and CreateProcess thing (via CreateProcessMsg), but one after the other (first VDM only, then CreateProcess only) so that, even if the common struct/union CsrMsg is used in both cases, there is no data corruption by, e.g. CreateProcess using pieces of VDM data and vice-versa.

svn path=/trunk/; revision=61913
This commit is contained in:
Hermès Bélusca-Maïto 2014-02-02 00:08:54 +00:00
parent 005703c2dc
commit 1826feb50f
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/dll/win32/kernel32/client/proc.c
View file

@ -2378,7 +2378,7 @@ CreateProcessInternalW(IN HANDLE hUserToken,
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 @@ CreateProcessInternalW(IN HANDLE hUserToken,
/* 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 @@ StartScan:
lpCommandLine,
lpCurrentDirectory,
&VdmAnsiEnv,
(PCSR_API_MESSAGE)VdmMsg,
&CsrMsg,
&VdmTask,
dwCreationFlags,
&StartupInfo,
@ -3232,9 +3232,9 @@ StartScan:
}
/* 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 @@ StartScan:
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 @@ StartScan:
lpCommandLine,
lpCurrentDirectory,
&VdmAnsiEnv,
(PCSR_API_MESSAGE)VdmMsg,
&CsrMsg,
&VdmTask,
dwCreationFlags,
&StartupInfo,
@ -3358,9 +3358,9 @@ StartScan:
};
/* 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 @@ StartScan:
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 @@ StartScan:
{
/* 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;