PLIST_ENTRY i;
PVDM_CONSOLE_RECORD CurrentRecord = NULL;
+ /* NULL is not a valid console handle */
+ if (ConsoleHandle == NULL) return STATUS_INVALID_PARAMETER;
+
/* Search for a record that has the same console handle */
for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink)
{
if (CurrentRecord->ConsoleHandle == ConsoleHandle) break;
}
+ /* Check if nothing was found */
+ if (i == &VDMConsoleListHead) CurrentRecord = NULL;
+
*Record = CurrentRecord;
return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND;
}
if (CurrentRecord->SessionId == TaskId) break;
}
+ /* Check if nothing was found */
+ if (i == &VDMConsoleListHead) CurrentRecord = NULL;
+
*Record = CurrentRecord;
return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND;
}
return Status;
}
-VOID BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo)
+VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo)
{
/* Free the allocated structure members */
if (CommandInfo->CmdLine != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->CmdLine);
RtlFreeHeap(BaseSrvHeap, 0, CommandInfo);
}
+VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId)
+{
+ PLIST_ENTRY i;
+ PVDM_CONSOLE_RECORD ConsoleRecord = NULL;
+ PVDM_DOS_RECORD DosRecord;
+
+ /* Enter the critical section */
+ RtlEnterCriticalSection(&DosCriticalSection);
+
+ /* Search for a record that has the same process handle */
+ for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink)
+ {
+ ConsoleRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry);
+
+ if (ConsoleRecord->ProcessId == ProcessId)
+ {
+ /* Cleanup the DOS records */
+ while (ConsoleRecord->DosListHead.Flink != &ConsoleRecord->DosListHead)
+ {
+ DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink,
+ VDM_DOS_RECORD,
+ Entry);
+
+ /* Set the event and close it */
+ NtSetEvent(DosRecord->ServerEvent, NULL);
+ NtClose(DosRecord->ServerEvent);
+
+ /* Remove the DOS entry */
+ if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo);
+ RemoveEntryList(&DosRecord->Entry);
+ RtlFreeHeap(BaseSrvHeap, 0, DosRecord);
+ }
+
+ if (ConsoleRecord->CurrentDirs != NULL)
+ {
+ /* Free the current directories */
+ RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord->CurrentDirs);
+ ConsoleRecord->CurrentDirs = NULL;
+ ConsoleRecord->CurDirsLength = 0;
+ }
+
+ /* Close the event handle */
+ if (ConsoleRecord->ServerEvent) NtClose(ConsoleRecord->ServerEvent);
+
+ /* Remove the console record */
+ i = i->Blink;
+ RemoveEntryList(&ConsoleRecord->Entry);
+ RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord);
+ }
+ }
+
+ /* Leave the critical section */
+ RtlLeaveCriticalSection(&DosCriticalSection);
+}
+
BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord)
{
BOOLEAN Success = FALSE;
return Success;
}
-VOID NTAPI BaseSrvFillCommandInfo(PVDM_COMMAND_INFO CommandInfo,
- PBASE_GET_NEXT_VDM_COMMAND Message)
+NTSTATUS NTAPI BaseSrvFillCommandInfo(PVDM_COMMAND_INFO CommandInfo,
+ PBASE_GET_NEXT_VDM_COMMAND Message)
{
/* Copy the data */
Message->iTask = CommandInfo->TaskId;
Message->VDMState = CommandInfo->VDMState;
Message->fComingFromBat = CommandInfo->ComingFromBat;
- if (CommandInfo->CmdLen)
+ if (CommandInfo->CmdLen && Message->CmdLen)
{
+ if (Message->CmdLen < CommandInfo->CmdLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the command line */
RtlMoveMemory(Message->CmdLine, CommandInfo->CmdLine, CommandInfo->CmdLen);
Message->CmdLen = CommandInfo->CmdLen;
}
- if (CommandInfo->AppLen)
+ if (CommandInfo->AppLen && Message->AppLen)
{
+ if (Message->AppLen < CommandInfo->CmdLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the application name */
RtlMoveMemory(Message->AppName, CommandInfo->AppName, CommandInfo->AppLen);
Message->AppLen = CommandInfo->AppLen;
}
- if (CommandInfo->PifLen)
+ if (CommandInfo->PifLen && Message->PifLen)
{
+ if (Message->PifLen < CommandInfo->PifLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the PIF file name */
RtlMoveMemory(Message->PifFile, CommandInfo->PifFile, CommandInfo->PifLen);
Message->PifLen = CommandInfo->PifLen;
}
- if (CommandInfo->CurDirectoryLen)
+ if (CommandInfo->CurDirectoryLen && Message->CurDirectoryLen)
{
+ if (Message->CurDirectoryLen < CommandInfo->CurDirectoryLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the current directory */
RtlMoveMemory(Message->CurDirectory, CommandInfo->CurDirectory, CommandInfo->CurDirectoryLen);
Message->CurDirectoryLen = CommandInfo->CurDirectoryLen;
}
- if (CommandInfo->EnvLen)
+ if (CommandInfo->EnvLen && Message->EnvLen)
{
+ if (Message->EnvLen < CommandInfo->EnvLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the environment */
RtlMoveMemory(Message->Env, CommandInfo->Env, CommandInfo->EnvLen);
Message->EnvLen = CommandInfo->EnvLen;
&CommandInfo->StartupInfo,
sizeof(STARTUPINFOA));
- if (CommandInfo->DesktopLen)
+ if (CommandInfo->DesktopLen && Message->DesktopLen)
{
+ if (Message->DesktopLen < CommandInfo->DesktopLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the desktop name */
RtlMoveMemory(Message->Desktop, CommandInfo->Desktop, CommandInfo->DesktopLen);
Message->DesktopLen = CommandInfo->DesktopLen;
}
- if (CommandInfo->TitleLen)
+ if (CommandInfo->TitleLen && Message->TitleLen)
{
+ if (Message->TitleLen < CommandInfo->TitleLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the title */
RtlMoveMemory(Message->Title, CommandInfo->Title, CommandInfo->TitleLen);
Message->TitleLen = CommandInfo->TitleLen;
}
- if (CommandInfo->ReservedLen)
+ if (CommandInfo->ReservedLen && Message->ReservedLen)
{
+ if (Message->ReservedLen < CommandInfo->ReservedLen) return STATUS_BUFFER_TOO_SMALL;
+
/* Copy the reserved parameter */
RtlMoveMemory(Message->Reserved, CommandInfo->Reserved, CommandInfo->ReservedLen);
Message->ReservedLen = CommandInfo->ReservedLen;
}
+
+ return STATUS_SUCCESS;
}
VOID NTAPI BaseInitializeVDM(VOID)
{
NTSTATUS Status;
PBASE_CHECK_VDM CheckVdmRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.CheckVDMRequest;
- PCSR_PROCESS ClientProcess;
PRTL_CRITICAL_SECTION CriticalSection = NULL;
PVDM_CONSOLE_RECORD ConsoleRecord = NULL;
PVDM_DOS_RECORD DosRecord = NULL;
return STATUS_INVALID_PARAMETER;
}
- /* Lock the process */
- Status = CsrLockProcessByClientId(ApiMessage->Header.ClientId.UniqueProcess,
- &ClientProcess);
- if (!NT_SUCCESS(Status)) return Status;
-
CriticalSection = (CheckVdmRequest->BinaryType != BINARY_TYPE_SEPARATE_WOW)
? &DosCriticalSection
: &WowCriticalSection;
goto Cleanup;
}
+ /* Remember that the console record was allocated here */
+ NewConsoleRecord = TRUE;
+
/* Initialize the console record */
ConsoleRecord->ConsoleHandle = CheckVdmRequest->ConsoleHandle;
- ConsoleRecord->ProcessHandle = ClientProcess->ProcessHandle;
+ ConsoleRecord->ProcessHandle = CsrGetClientThread()->Process->ProcessHandle;
ConsoleRecord->ServerEvent = ConsoleRecord->ClientEvent = NULL;
ConsoleRecord->ReenterCount = 0;
ConsoleRecord->CurrentDirs = NULL;
ConsoleRecord->CurDirsLength = 0;
ConsoleRecord->SessionId = GetNextDosSesId();
InitializeListHead(&ConsoleRecord->DosListHead);
- // TODO: The console record structure is incomplete
-
- /* Remember that the console record was allocated here */
- NewConsoleRecord = TRUE;
}
/* Allocate a new DOS record */
}
/* Initialize the DOS record */
- DosRecord->State = NewConsoleRecord ? VDM_NOT_LOADED : VDM_READY;
+ DosRecord->State = VDM_NOT_LOADED;
DosRecord->ExitCode = 0;
- // TODO: The DOS record structure is incomplete
Status = BaseSrvCreatePairWaitHandles(&DosRecord->ServerEvent, &DosRecord->ClientEvent);
if (!NT_SUCCESS(Status)) goto Cleanup;
/* Add the DOS record */
InsertHeadList(&ConsoleRecord->DosListHead, &DosRecord->Entry);
+ if (ConsoleRecord->ServerEvent)
+ {
+ /* Signal the session event */
+ NtSetEvent(ConsoleRecord->ServerEvent, NULL);
+ }
+
if (NewConsoleRecord)
{
/* Add the console record */
InsertTailList(&VDMConsoleListHead, &ConsoleRecord->Entry);
}
- CheckVdmRequest->VDMState = DosRecord->State;
+ 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;
}
else
/* Leave the critical section */
RtlLeaveCriticalSection(CriticalSection);
- /* Unlock the process */
- CsrUnlockProcess(ClientProcess);
-
return Status;
}
*/
if (ConsoleRecord->DosListHead.Flink == &ConsoleRecord->DosListHead)
{
+ if (ConsoleRecord->ServerEvent) NtClose(ConsoleRecord->ServerEvent);
RemoveEntryList(&ConsoleRecord->Entry);
RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord);
}
CSR_API(BaseSrvGetNextVDMCommand)
{
- DPRINT1("%s not yet implemented\n", __FUNCTION__);
- return STATUS_NOT_IMPLEMENTED;
+ NTSTATUS Status;
+ PBASE_GET_NEXT_VDM_COMMAND GetNextVdmCommandRequest =
+ &((PBASE_API_MESSAGE)ApiMessage)->Data.GetNextVDMCommandRequest;
+ PRTL_CRITICAL_SECTION CriticalSection;
+ PLIST_ENTRY i = NULL;
+ PVDM_CONSOLE_RECORD ConsoleRecord = NULL;
+ PVDM_DOS_RECORD DosRecord = NULL;
+
+ /* Validate the message buffers */
+ if (!CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->CmdLine,
+ GetNextVdmCommandRequest->CmdLen,
+ sizeof(*GetNextVdmCommandRequest->CmdLine))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->AppName,
+ GetNextVdmCommandRequest->AppLen,
+ sizeof(*GetNextVdmCommandRequest->AppName))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->PifFile,
+ GetNextVdmCommandRequest->PifLen,
+ sizeof(*GetNextVdmCommandRequest->PifFile))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->CurDirectory,
+ GetNextVdmCommandRequest->CurDirectoryLen,
+ sizeof(*GetNextVdmCommandRequest->CurDirectory))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->Env,
+ GetNextVdmCommandRequest->EnvLen,
+ sizeof(*GetNextVdmCommandRequest->Env))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->Desktop,
+ GetNextVdmCommandRequest->DesktopLen,
+ sizeof(*GetNextVdmCommandRequest->Desktop))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->Title,
+ GetNextVdmCommandRequest->TitleLen,
+ sizeof(*GetNextVdmCommandRequest->Title))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->Reserved,
+ GetNextVdmCommandRequest->ReservedLen,
+ sizeof(*GetNextVdmCommandRequest->Reserved))
+ || !CsrValidateMessageBuffer(ApiMessage,
+ (PVOID*)&GetNextVdmCommandRequest->StartupInfo,
+ 1,
+ sizeof(STARTUPINFOA)))
+ {
+ return STATUS_INVALID_PARAMETER;
+ }
+
+ CriticalSection = (GetNextVdmCommandRequest->VDMState & VDM_FLAG_WOW)
+ ? &WowCriticalSection
+ : &DosCriticalSection;
+
+ /* Enter the critical section */
+ RtlEnterCriticalSection(CriticalSection);
+
+ if (!(GetNextVdmCommandRequest->VDMState & VDM_FLAG_WOW))
+ {
+ if (GetNextVdmCommandRequest->iTask != 0)
+ {
+ /* Get the console record using the task ID */
+ Status = GetConsoleRecordBySessionId(GetNextVdmCommandRequest->iTask,
+ &ConsoleRecord);
+ }
+ else
+ {
+ /* Get the console record using the console handle */
+ Status = BaseSrvGetConsoleRecord(GetNextVdmCommandRequest->ConsoleHandle,
+ &ConsoleRecord);
+ }
+
+ /* Make sure we found the console record */
+ if (!NT_SUCCESS(Status)) goto Cleanup;
+
+ /* Return the session ID */
+ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId;
+ GetNextVdmCommandRequest->WaitObjectForVDM = NULL;
+
+ if (GetNextVdmCommandRequest->VDMState & VDM_GET_FIRST_COMMAND)
+ {
+ /* Check if the DOS record list is empty */
+ if (ConsoleRecord->DosListHead.Flink == &ConsoleRecord->DosListHead)
+ {
+ Status = STATUS_INVALID_PARAMETER;
+ goto Cleanup;
+ }
+
+ /* Get the first DOS record */
+ DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, VDM_DOS_RECORD, Entry);
+
+ /* Make sure its command information is still there */
+ if (DosRecord->CommandInfo == NULL)
+ {
+ Status = STATUS_INVALID_PARAMETER;
+ goto Cleanup;
+ }
+
+ /* Fill the command information */
+ Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest);
+ goto Cleanup;
+ }
+
+ /* Check if we should set the state of a running DOS record to ready */
+ if (!(GetNextVdmCommandRequest->VDMState
+ & (VDM_FLAG_FIRST_TASK | VDM_FLAG_RETRY | VDM_FLAG_NESTED_TASK)))
+ {
+ /* Search for a DOS record that is currently running */
+ for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink)
+ {
+ DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry);
+ if (DosRecord->State == VDM_NOT_READY) break;
+ }
+
+ /* Check if we found any */
+ if (i == &ConsoleRecord->DosListHead)
+ {
+ Status = STATUS_INVALID_PARAMETER;
+ goto Cleanup;
+ }
+
+ /* Set the exit code */
+ DosRecord->ExitCode = GetNextVdmCommandRequest->ExitCode;
+
+ /* Update the VDM state */
+ DosRecord->State = VDM_READY;
+
+ /* Notify all waiting threads that the task is finished */
+ NtSetEvent(DosRecord->ServerEvent, NULL);
+ NtClose(DosRecord->ServerEvent);
+ DosRecord->ServerEvent = NULL;
+ }
+
+ /* Search for a DOS record that isn't loaded yet */
+ for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink)
+ {
+ DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry);
+ if (DosRecord->State == VDM_NOT_LOADED) break;
+ }
+
+ if (i != &ConsoleRecord->DosListHead)
+ {
+ /* DOS tasks which haven't been loaded yet should have a command info structure */
+ ASSERT(DosRecord->CommandInfo != NULL);
+
+ /* Check if the caller only wants environment data */
+ if (GetNextVdmCommandRequest->VDMState & VDM_GET_ENVIRONMENT)
+ {
+ if (GetNextVdmCommandRequest->EnvLen < DosRecord->CommandInfo->EnvLen)
+ {
+ /* Not enough space was reserved */
+ GetNextVdmCommandRequest->EnvLen = DosRecord->CommandInfo->EnvLen;
+ Status = STATUS_BUFFER_OVERFLOW;
+ goto Cleanup;
+ }
+
+ /* Copy the environment data */
+ RtlMoveMemory(GetNextVdmCommandRequest->Env,
+ DosRecord->CommandInfo->Env,
+ DosRecord->CommandInfo->EnvLen);
+
+ /* Return the actual size to the caller */
+ GetNextVdmCommandRequest->EnvLen = DosRecord->CommandInfo->EnvLen;
+ }
+ else
+ {
+ /* Fill the command information */
+ Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest);
+
+ /* Free the command information, it's no longer needed */
+ BaseSrvFreeVDMInfo(DosRecord->CommandInfo);
+ DosRecord->CommandInfo = NULL;
+
+ /* Update the VDM state */
+ GetNextVdmCommandRequest->VDMState = DosRecord->State = VDM_NOT_READY;
+ }
+
+ Status = STATUS_SUCCESS;
+ goto Cleanup;
+ }
+ }
+ else
+ {
+ // TODO: WOW SUPPORT NOT IMPLEMENTED
+ Status = STATUS_NOT_IMPLEMENTED;
+ goto Cleanup;
+ }
+
+ /* There is no command yet */
+ if ((GetNextVdmCommandRequest->VDMState & (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY))
+ != (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY))
+ {
+ if (ConsoleRecord->ServerEvent)
+ {
+ /* Reset the event */
+ NtResetEvent(ConsoleRecord->ServerEvent, NULL);
+ }
+ else
+ {
+ /* Create a pair of wait handles */
+ Status = BaseSrvCreatePairWaitHandles(&ConsoleRecord->ServerEvent,
+ &ConsoleRecord->ClientEvent);
+ if (!NT_SUCCESS(Status)) goto Cleanup;
+ }
+
+ /* Return the client event handle */
+ GetNextVdmCommandRequest->WaitObjectForVDM = ConsoleRecord->ClientEvent;
+ }
+
+Cleanup:
+ /* Leave the critical section */
+ RtlLeaveCriticalSection(CriticalSection);
+
+ return Status;
}
CSR_API(BaseSrvExitVDM)
ConsoleRecord->CurDirsLength = 0;
}
+ /* Close the event handle */
+ if (ConsoleRecord->ServerEvent) NtClose(ConsoleRecord->ServerEvent);
+
/* Remove the console record */
RemoveEntryList(&ConsoleRecord->Entry);
RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord);
projects / reactos.git / blobdiff