[KERNEL32][BASESRV]

Move the console/ID checking code from kernel32 to basesrv.


svn path=/branches/ntvdm/; revision=63125
This commit is contained in:
Aleksandar Andrejevic 2014-05-03 02:34:40 +00:00
parent 263f3da77d
commit c098b6e833
2 changed files with 9 additions and 12 deletions

View file

@ -401,17 +401,8 @@ BaseCheckVDM(IN ULONG BinaryType,
CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCheckVDM),
sizeof(BASE_CHECK_VDM));
/* Check if there is no console */
if (CheckVdm->ConsoleHandle == NULL)
{
/* Write back the task ID */
*iTask = CheckVdm->iTask;
}
else
{
/* Otherwise, iTask should be zero */
*iTask = 0;
}
/* Write back the task ID */
*iTask = CheckVdm->iTask;
Cleanup:

View file

@ -665,7 +665,13 @@ CSR_API(BaseSrvCheckVDM)
InsertTailList(&VDMConsoleListHead, &ConsoleRecord->Entry);
}
CheckVdmRequest->iTask = ConsoleRecord->SessionId;
if (ConsoleRecord->ConsoleHandle == NULL)
{
/* The parent doesn't have a console, so return the session ID */
CheckVdmRequest->iTask = ConsoleRecord->SessionId;
}
else CheckVdmRequest->iTask = 0;
CheckVdmRequest->VDMState = NewConsoleRecord ? VDM_NOT_LOADED : VDM_READY;
Status = STATUS_SUCCESS;
}