Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67591: [FAST486] Add support for legacy (286) Task State Segments.
by aandrejevic＠svn.reactos.org 07 May '15

07 May '15

Author: aandrejevic Date: Thu May 7 03:22:18 2015 New Revision: 67591 URL: http://svn.reactos.org/svn/reactos?rev=67591&view=rev Log: [FAST486] Add support for legacy (286) Task State Segments. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Thu May 7 03:22:18 2015 @@ -554,22 +554,39 @@ { ULONG NewTssAddress; ULONG NewTssLimit; + FAST486_SYSTEM_DESCRIPTOR NewTssDescriptor; FAST486_TSS OldTss; + PFAST486_LEGACY_TSS OldLegacyTss = (PFAST486_LEGACY_TSS)&OldTss; FAST486_TSS NewTss; - FAST486_SYSTEM_DESCRIPTOR NewTssDescriptor; + PFAST486_LEGACY_TSS NewLegacyTss = (PFAST486_LEGACY_TSS)&NewTss; + USHORT NewLdtr, NewEs, NewCs, NewSs, NewDs; + + if (State->TaskReg.Limit < sizeof(FAST486_TSS) + && State->TaskReg.Limit != sizeof(FAST486_LEGACY_TSS)) + { + /* Invalid task register limit */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, State->TaskReg.Selector); + return FALSE; + } /* Read the old TSS */ if (!Fast486ReadLinearMemory(State, State->TaskReg.Base, &OldTss, - sizeof(OldTss))) + State->TaskReg.Limit >= sizeof(FAST486_TSS) + ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS))) { /* Exception occurred */ return FALSE; } + /* If this is a task return, use the linked previous selector */ - if (Type == FAST486_TASK_RETURN) Selector = LOWORD(OldTss.Link); + if (Type == FAST486_TASK_RETURN) + { + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) Selector = LOWORD(OldTss.Link); + else Selector = OldLegacyTss->Link; + } /* Make sure the entry exists in the GDT (not LDT!) */ if ((GET_SEGMENT_INDEX(Selector) == 0) @@ -611,9 +628,9 @@ NewTssLimit |= 0x00000FFF; } - if (NewTssLimit < sizeof(FAST486_TSS)) - { - /* TSS limit too small */ + if (NewTssLimit < sizeof(FAST486_TSS) && NewTssLimit != sizeof(FAST486_LEGACY_TSS)) + { + /* TSS limit invalid */ Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, Selector); return FALSE; } @@ -622,9 +639,11 @@ * The incoming task shouldn't be busy if we're executing it as a * new task, and it should be busy if we're returning to it. */ - if (((NewTssDescriptor.Signature != FAST486_TSS_SIGNATURE) + if ((((NewTssDescriptor.Signature != FAST486_TSS_SIGNATURE) + && (NewTssDescriptor.Signature != FAST486_TSS_16_SIGNATURE)) || (Type == FAST486_TASK_RETURN)) - && ((NewTssDescriptor.Signature != FAST486_BUSY_TSS_SIGNATURE) + && (((NewTssDescriptor.Signature != FAST486_BUSY_TSS_SIGNATURE) + && (NewTssDescriptor.Signature != FAST486_BUSY_TSS_16_SIGNATURE)) || (Type != FAST486_TASK_RETURN))) { Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); @@ -635,7 +654,8 @@ if (!Fast486ReadLinearMemory(State, NewTssAddress, &NewTss, - sizeof(NewTss))) + NewTssLimit >= sizeof(FAST486_TSS) + ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS))) { /* Exception occurred */ return FALSE; @@ -671,34 +691,57 @@ else { /* Store the link */ - NewTss.Link = State->TaskReg.Selector; + if (NewTssLimit >= sizeof(FAST486_TSS)) NewTss.Link = State->TaskReg.Selector; + else NewLegacyTss->Link = State->TaskReg.Selector; } /* Save the current task into the TSS */ - OldTss.Cr3 = State->ControlRegisters[FAST486_REG_CR3]; - OldTss.Eip = State->InstPtr.Long; - OldTss.Eflags = State->Flags.Long; - OldTss.Eax = State->GeneralRegs[FAST486_REG_EAX].Long; - OldTss.Ecx = State->GeneralRegs[FAST486_REG_ECX].Long; - OldTss.Edx = State->GeneralRegs[FAST486_REG_EDX].Long; - OldTss.Ebx = State->GeneralRegs[FAST486_REG_EBX].Long; - OldTss.Esp = State->GeneralRegs[FAST486_REG_ESP].Long; - OldTss.Ebp = State->GeneralRegs[FAST486_REG_EBP].Long; - OldTss.Esi = State->GeneralRegs[FAST486_REG_ESI].Long; - OldTss.Edi = State->GeneralRegs[FAST486_REG_EDI].Long; - OldTss.Es = State->SegmentRegs[FAST486_REG_ES].Selector; - OldTss.Cs = State->SegmentRegs[FAST486_REG_CS].Selector; - OldTss.Ss = State->SegmentRegs[FAST486_REG_SS].Selector; - OldTss.Ds = State->SegmentRegs[FAST486_REG_DS].Selector; - OldTss.Fs = State->SegmentRegs[FAST486_REG_FS].Selector; - OldTss.Gs = State->SegmentRegs[FAST486_REG_GS].Selector; - OldTss.Ldtr = State->Ldtr.Selector; + if (State->TaskReg.Limit >= sizeof(FAST486_TSS)) + { + OldTss.Cr3 = State->ControlRegisters[FAST486_REG_CR3]; + OldTss.Eip = State->InstPtr.Long; + OldTss.Eflags = State->Flags.Long; + OldTss.Eax = State->GeneralRegs[FAST486_REG_EAX].Long; + OldTss.Ecx = State->GeneralRegs[FAST486_REG_ECX].Long; + OldTss.Edx = State->GeneralRegs[FAST486_REG_EDX].Long; + OldTss.Ebx = State->GeneralRegs[FAST486_REG_EBX].Long; + OldTss.Esp = State->GeneralRegs[FAST486_REG_ESP].Long; + OldTss.Ebp = State->GeneralRegs[FAST486_REG_EBP].Long; + OldTss.Esi = State->GeneralRegs[FAST486_REG_ESI].Long; + OldTss.Edi = State->GeneralRegs[FAST486_REG_EDI].Long; + OldTss.Es = State->SegmentRegs[FAST486_REG_ES].Selector; + OldTss.Cs = State->SegmentRegs[FAST486_REG_CS].Selector; + OldTss.Ss = State->SegmentRegs[FAST486_REG_SS].Selector; + OldTss.Ds = State->SegmentRegs[FAST486_REG_DS].Selector; + OldTss.Fs = State->SegmentRegs[FAST486_REG_FS].Selector; + OldTss.Gs = State->SegmentRegs[FAST486_REG_GS].Selector; + OldTss.Ldtr = State->Ldtr.Selector; + } + else + { + OldLegacyTss->Ip = State->InstPtr.LowWord; + OldLegacyTss->Flags = State->Flags.LowWord; + OldLegacyTss->Ax = State->GeneralRegs[FAST486_REG_EAX].LowWord; + OldLegacyTss->Cx = State->GeneralRegs[FAST486_REG_ECX].LowWord; + OldLegacyTss->Dx = State->GeneralRegs[FAST486_REG_EDX].LowWord; + OldLegacyTss->Bx = State->GeneralRegs[FAST486_REG_EBX].LowWord; + OldLegacyTss->Sp = State->GeneralRegs[FAST486_REG_ESP].LowWord; + OldLegacyTss->Bp = State->GeneralRegs[FAST486_REG_EBP].LowWord; + OldLegacyTss->Si = State->GeneralRegs[FAST486_REG_ESI].LowWord; + OldLegacyTss->Di = State->GeneralRegs[FAST486_REG_EDI].LowWord; + OldLegacyTss->Es = State->SegmentRegs[FAST486_REG_ES].Selector; + OldLegacyTss->Cs = State->SegmentRegs[FAST486_REG_CS].Selector; + OldLegacyTss->Ss = State->SegmentRegs[FAST486_REG_SS].Selector; + OldLegacyTss->Ds = State->SegmentRegs[FAST486_REG_DS].Selector; + OldLegacyTss->Ldtr = State->Ldtr.Selector; + } /* Write back the old TSS */ if (!Fast486WriteLinearMemory(State, State->TaskReg.Base, &OldTss, - sizeof(OldTss))) + State->TaskReg.Limit >= sizeof(FAST486_TSS) + ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS))) { /* Exception occurred */ return FALSE; @@ -725,54 +768,78 @@ State->TaskReg.Base = NewTssAddress; State->TaskReg.Limit = NewTssLimit; - /* Change the page directory */ - State->ControlRegisters[FAST486_REG_CR3] = NewTss.Cr3; + if (NewTssLimit >= sizeof(FAST486_TSS)) + { + /* Change the page directory */ + State->ControlRegisters[FAST486_REG_CR3] = NewTss.Cr3; + } /* Flush the TLB */ if (State->Tlb) RtlZeroMemory(State->Tlb, NUM_TLB_ENTRIES * sizeof(ULONG)); /* Update the CPL */ - State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); + if (NewTssLimit >= sizeof(FAST486_TSS)) State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); + else State->Cpl = GET_SEGMENT_RPL(NewLegacyTss->Cs); #ifndef FAST486_NO_PREFETCH /* Context switching invalidates the prefetch */ State->PrefetchValid = FALSE; #endif - /* Update the CPL */ - State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); - /* Load the registers */ - State->InstPtr.Long = State->SavedInstPtr.Long = NewTss.Eip; - State->Flags.Long = NewTss.Eflags; - State->GeneralRegs[FAST486_REG_EAX].Long = NewTss.Eax; - State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx; - State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx; - State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx; - State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; - State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp; - State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi; - State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi; + if (NewTssLimit >= sizeof(FAST486_TSS)) + { + State->InstPtr.Long = State->SavedInstPtr.Long = NewTss.Eip; + State->Flags.Long = NewTss.Eflags; + State->GeneralRegs[FAST486_REG_EAX].Long = NewTss.Eax; + State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx; + State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx; + State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx; + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; + State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp; + State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi; + State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi; + NewEs = NewTss.Es; + NewCs = NewTss.Cs; + NewSs = NewTss.Ss; + NewDs = NewTss.Ds; + NewLdtr = NewTss.Ldtr; + } + else + { + State->InstPtr.LowWord = State->SavedInstPtr.LowWord = NewLegacyTss->Ip; + State->Flags.LowWord = NewLegacyTss->Flags; + State->GeneralRegs[FAST486_REG_EAX].LowWord = NewLegacyTss->Ax; + State->GeneralRegs[FAST486_REG_ECX].LowWord = NewLegacyTss->Cx; + State->GeneralRegs[FAST486_REG_EDX].LowWord = NewLegacyTss->Dx; + State->GeneralRegs[FAST486_REG_EBX].LowWord = NewLegacyTss->Bx; + State->GeneralRegs[FAST486_REG_ESP].LowWord = NewLegacyTss->Sp; + State->GeneralRegs[FAST486_REG_EBP].LowWord = NewLegacyTss->Bp; + State->GeneralRegs[FAST486_REG_ESI].LowWord = NewLegacyTss->Si; + State->GeneralRegs[FAST486_REG_EDI].LowWord = NewLegacyTss->Di; + NewEs = NewLegacyTss->Es; + NewCs = NewLegacyTss->Cs; + NewSs = NewLegacyTss->Ss; + NewDs = NewLegacyTss->Ds; + NewLdtr = NewLegacyTss->Ldtr; + } /* Set the NT flag if nesting */ if (Type == FAST486_TASK_CALL) State->Flags.Nt = TRUE; - if (GET_SEGMENT_INDEX(NewTss.Ldtr) != 0) + if (GET_SEGMENT_INDEX(NewLdtr) != 0) { BOOLEAN Valid; FAST486_SYSTEM_DESCRIPTOR GdtEntry; - if (NewTss.Ldtr & SEGMENT_TABLE_INDICATOR) + if (NewLdtr & SEGMENT_TABLE_INDICATOR) { /* This selector doesn't point to the GDT */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewTss.Ldtr); - return FALSE; - } - - if (!Fast486ReadDescriptorEntry(State, - NewTss.Ldtr, - &Valid, - (PFAST486_GDT_ENTRY)&GdtEntry)) + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewLdtr); + return FALSE; + } + + if (!Fast486ReadDescriptorEntry(State, NewLdtr, &Valid, (PFAST486_GDT_ENTRY)&GdtEntry)) { /* Exception occurred */ return FALSE; @@ -781,25 +848,25 @@ if (!Valid) { /* Invalid selector */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewTss.Ldtr); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewLdtr); return FALSE; } if (GdtEntry.Signature != FAST486_LDT_SIGNATURE) { /* This is not an LDT descriptor */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewTss.Ldtr); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewLdtr); return FALSE; } if (!GdtEntry.Present) { - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewTss.Ldtr); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, NewLdtr); return FALSE; } /* Update the LDTR */ - State->Ldtr.Selector = NewTss.Ldtr; + State->Ldtr.Selector = NewLdtr; State->Ldtr.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); State->Ldtr.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); @@ -816,52 +883,43 @@ } /* Load the new segments */ - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_CS, - NewTss.Cs, - FAST486_EXCEPTION_TS)) - { - return FALSE; - } - - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_SS, - NewTss.Ss, - FAST486_EXCEPTION_TS)) - { - return FALSE; - } - - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_ES, - NewTss.Es, - FAST486_EXCEPTION_TS)) - { - return FALSE; - } - - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_DS, - NewTss.Ds, - FAST486_EXCEPTION_TS)) - { - return FALSE; - } - - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_FS, - NewTss.Fs, - FAST486_EXCEPTION_TS)) - { - return FALSE; - } - - if (!Fast486LoadSegmentInternal(State, - FAST486_REG_GS, - NewTss.Gs, - FAST486_EXCEPTION_TS)) - { - return FALSE; + if (!Fast486LoadSegmentInternal(State, FAST486_REG_CS, NewCs, FAST486_EXCEPTION_TS)) + { + return FALSE; + } + + if (!Fast486LoadSegmentInternal(State, FAST486_REG_SS, NewSs, FAST486_EXCEPTION_TS)) + { + return FALSE; + } + + if (!Fast486LoadSegmentInternal(State, FAST486_REG_ES, NewEs, FAST486_EXCEPTION_TS)) + { + return FALSE; + } + + if (!Fast486LoadSegmentInternal(State, FAST486_REG_DS, NewDs, FAST486_EXCEPTION_TS)) + { + return FALSE; + } + + if (NewTssLimit >= sizeof(FAST486_TSS)) + { + if (!Fast486LoadSegmentInternal(State, + FAST486_REG_FS, + NewTss.Fs, + FAST486_EXCEPTION_TS)) + { + return FALSE; + } + + if (!Fast486LoadSegmentInternal(State, + FAST486_REG_GS, + NewTss.Gs, + FAST486_EXCEPTION_TS)) + { + return FALSE; + } } return TRUE; Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Thu May 7 03:22:18 2015 @@ -773,7 +773,10 @@ return FALSE; } + case FAST486_TSS_16_SIGNATURE: + case FAST486_BUSY_TSS_16_SIGNATURE: case FAST486_TSS_SIGNATURE: + case FAST486_BUSY_TSS_SIGNATURE: { Fast486TaskSwitch(State, Call ? FAST486_TASK_CALL : FAST486_TASK_JUMP,

1 0

[hbelusca] 67590: [NTVDM]: Update the console title only in non-standalone mode.
by hbelusca＠svn.reactos.org 07 May '15

07 May '15

Author: hbelusca Date: Thu May 7 01:44:29 2015 New Revision: 67590 URL: http://svn.reactos.org/svn/reactos?rev=67590&view=rev Log: [NTVDM]: Update the console title only in non-standalone mode. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Thu May 7 01:44:29 2015 @@ -641,9 +641,11 @@ if (Result != ERROR_SUCCESS) goto Quit; +#ifndef STANDALONE /* Update console title if we run in a separate console */ if (SessionId != 0) SetConsoleTitleA(ExecutablePath); +#endif /* Attach to the console */ ConsoleAttach();

1 0

[hbelusca] 67589: [NTVDM] - Improvement/Usability: when a DOS app is started in a separate console, print its full path as it's done in Windows. - Stubplement a LoadGlobalSettings function for NTVD...
by hbelusca＠svn.reactos.org 07 May '15

07 May '15

Author: hbelusca Date: Thu May 7 01:23:33 2015 New Revision: 67589 URL: http://svn.reactos.org/svn/reactos?rev=67589&view=rev Log: [NTVDM] - Improvement/Usability: when a DOS app is started in a separate console, print its full path as it's done in Windows. - Stubplement a LoadGlobalSettings function for NTVDM so that it will be able to grab user settings from the registry. - Move DOS-only related variables AcceptCommands, CommandThread and SessionId to where they belong. I will rework ConsoleCtrlHandler to make it more elegant in the future (DOS-agnostic). - Remove the useless ENTER-key-up hack. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Thu May 7 01:23:33 2015 @@ -274,6 +274,14 @@ } #endif +/* PUBLIC VARIABLES ***********************************************************/ + +#ifndef STANDALONE +BOOLEAN AcceptCommands = TRUE; +HANDLE CommandThread = NULL; +ULONG SessionId = 0; +#endif + /* PUBLIC FUNCTIONS ***********************************************************/ // @@ -422,6 +430,8 @@ DWORD Result; CHAR ApplicationName[MAX_PATH]; CHAR CommandLine[DOS_CMDLINE_LENGTH]; +#else + INT i; #endif DPRINT("DosStart\n"); @@ -436,6 +446,19 @@ DosMouseInitialize(); #ifndef STANDALONE + + /* Parse the command line arguments */ + for (i = 1; i < NtVdmArgc; i++) + { + if (wcsncmp(NtVdmArgv[i], L"-i", 2) == 0) + { + /* This is the session ID */ + SessionId = wcstoul(NtVdmArgv[i] + 2, NULL, 10); + + /* The VDM hasn't been started from a console, so quit when the task is done */ + AcceptCommands = FALSE; + } + } /* Create the GetNextVDMCommand thread */ CommandThread = CreateThread(NULL, 0, &CommandThreadProc, NULL, 0, NULL); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] Thu May 7 01:23:33 2015 @@ -24,6 +24,14 @@ #define BOP_START_DOS 0x2C // DOS Starting BOP. In parameter (following bytes) we take a NULL-terminated string indicating the name of the DOS kernel file. #define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) #define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) + +/* VARIABLES ******************************************************************/ + +#ifndef STANDALONE +extern BOOLEAN AcceptCommands; +extern HANDLE CommandThread; +extern ULONG SessionId; +#endif /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Thu May 7 01:23:33 2015 @@ -641,16 +641,13 @@ if (Result != ERROR_SUCCESS) goto Quit; + /* Update console title if we run in a separate console */ + if (SessionId != 0) + SetConsoleTitleA(ExecutablePath); + /* Attach to the console */ ConsoleAttach(); VidBiosAttachToConsole(); - - // HACK: Simulate a ENTER key release scancode on the PS/2 port because - // some apps expect to read a key release scancode (> 0x80) when they - // are started. - // (hbelusca 2 May 2015: I'm not sure it's really useful. See r65012) - // IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port - // IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release /* Start simulation */ SetEvent(VdmTaskEvent); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Thu May 7 01:23:33 2015 @@ -23,13 +23,6 @@ static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; - -// For DOS -#ifndef STANDALONE -BOOLEAN AcceptCommands = TRUE; -HANDLE CommandThread = NULL; -ULONG SessionId = 0; -#endif HANDLE VdmTaskEvent = NULL; @@ -258,13 +251,19 @@ WINAPI ConsoleCtrlHandler(DWORD ControlType) { +// HACK: Should be removed! +#ifndef STANDALONE +extern BOOLEAN AcceptCommands; +extern HANDLE CommandThread; +#endif + switch (ControlType) { case CTRL_LAST_CLOSE_EVENT: { if (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) { - /* Exit immediately */ + /* Nothing runs, so exit immediately */ #ifndef STANDALONE if (CommandThread) TerminateThread(CommandThread, 0); #endif @@ -273,7 +272,7 @@ #ifndef STANDALONE else { - /* Stop accepting new commands */ + /* A command is running, let it run, but stop accepting new commands */ AcceptCommands = FALSE; } #endif @@ -434,9 +433,60 @@ DPRINT1("Focus events not handled\n"); } +static BOOL +LoadGlobalSettings(VOID) +{ +// FIXME: These strings should be localized. +#define ERROR_MEMORYVDD L"Insufficient memory to load installable Virtual Device Drivers." +#define ERROR_REGVDD L"Virtual Device Driver format in the registry is invalid." +#define ERROR_LOADVDD L"An installable Virtual Device Driver failed Dll initialization." + + BOOL Success = TRUE; + LONG Error = 0; + + HKEY hNTVDMKey; + LPCWSTR NTVDMKeyName = L"SYSTEM\\CurrentControlSet\\Control\\NTVDM"; + + /* Try to open the NTVDM registry key */ + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + NTVDMKeyName, + 0, + KEY_QUERY_VALUE, + &hNTVDMKey); + if (Error == ERROR_FILE_NOT_FOUND) + { + /* If the key just doesn't exist, don't do anything else */ + return TRUE; + } + else if (Error != ERROR_SUCCESS) + { + /* The key exists but there was an access error: display an error and quit */ + DisplayMessage(ERROR_REGVDD); + return FALSE; + } + + /* + * Now we can do: + * - CPU core choice + * - Video choice + * - Sound choice + * - Mem? + * - ... + * - Standalone mode? + * - Debug settings + */ + +// Quit: + RegCloseKey(hNTVDMKey); + return Success; +} + INT wmain(INT argc, WCHAR *argv[]) { + NtVdmArgc = argc; + NtVdmArgv = argv; + #ifdef STANDALONE if (argc < 2) @@ -446,28 +496,10 @@ return 0; } -#else - - INT i; - WCHAR *endptr; - - /* Parse the command line arguments */ - for (i = 1; i < argc; i++) - { - if (wcsncmp(argv[i], L"-i", 2) == 0) - { - /* This is the session ID */ - SessionId = wcstoul(argv[i] + 2, &endptr, 10); - - /* The VDM hasn't been started from a console, so quit when the task is done */ - AcceptCommands = FALSE; - } - } - -#endif - - NtVdmArgc = argc; - NtVdmArgv = argv; +#endif + + /* Load global VDM settings */ + LoadGlobalSettings(); DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Thu May 7 01:23:33 2015 @@ -54,12 +54,6 @@ /* FUNCTIONS ******************************************************************/ -#ifndef STANDALONE -extern BOOLEAN AcceptCommands; -extern HANDLE CommandThread; -extern ULONG SessionId; -#endif - extern HANDLE VdmTaskEvent; // Command line of NTVDM Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vdds… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] Thu May 7 01:23:33 2015 @@ -234,6 +234,7 @@ static BOOL LoadInstallableVDD(VOID) { +// FIXME: These strings should be localized. #define ERROR_MEMORYVDD L"Insufficient memory to load installable Virtual Device Drivers." #define ERROR_REGVDD L"Virtual Device Driver format in the registry is invalid." #define ERROR_LOADVDD L"An installable Virtual Device Driver failed Dll initialization."

1 0

[aandrejevic] 67588: [NTVDM] Fix the previous fix.
by aandrejevic＠svn.reactos.org 07 May '15

07 May '15

Author: aandrejevic Date: Thu May 7 00:53:47 2015 New Revision: 67588 URL: http://svn.reactos.org/svn/reactos?rev=67588&view=rev Log: [NTVDM] Fix the previous fix. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Thu May 7 00:53:47 2015 @@ -409,8 +409,8 @@ Header = (PIMAGE_DOS_HEADER)Address; /* Get the base size of the file, in paragraphs (rounded up) */ - BaseSize = (((Header->e_cp - (Header->e_cblp != 0)) * 512) - + Header->e_cblp - Header->e_cparhdr + 0x0F) >> 4; + BaseSize = ((((Header->e_cp - (Header->e_cblp != 0)) * 512) + + Header->e_cblp + 0x0F) >> 4) - Header->e_cparhdr; if (LoadType != DOS_LOAD_OVERLAY) {

1 0

[aandrejevic] 67587: [NTVDM] Fix the calculation of the executable's base size.
by aandrejevic＠svn.reactos.org 07 May '15

07 May '15

Author: aandrejevic Date: Thu May 7 00:36:14 2015 New Revision: 67587 URL: http://svn.reactos.org/svn/reactos?rev=67587&view=rev Log: [NTVDM] Fix the calculation of the executable's base size. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Thu May 7 00:36:14 2015 @@ -409,7 +409,8 @@ Header = (PIMAGE_DOS_HEADER)Address; /* Get the base size of the file, in paragraphs (rounded up) */ - BaseSize = (((Header->e_cp - 1) * 512) + Header->e_cblp + 0x0F) >> 4; + BaseSize = (((Header->e_cp - (Header->e_cblp != 0)) * 512) + + Header->e_cblp - Header->e_cparhdr + 0x0F) >> 4; if (LoadType != DOS_LOAD_OVERLAY) {

1 0

[aandrejevic] 67586: [NTVDM] ... and don't forget to set AH to the error code.
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 23:13:55 2015 New Revision: 67586 URL: http://svn.reactos.org/svn/reactos?rev=67586&view=rev Log: [NTVDM] ... and don't forget to set AH to the error code. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed May 6 23:13:55 2015 @@ -374,6 +374,8 @@ HardwareInfo->ContextAreaSize = sizeof(Mapping); HardwareInfo->DmaRegisterSets = 0; HardwareInfo->DmaChannelOperation = 0; + + setAH(EMS_STATUS_OK); } else if (getAL() == 0x01) {

1 0

[aandrejevic] 67585: [NTVDM] Implement EMS function AH = 59h (Get Expanded Memory Hardware Information).
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 23:06:28 2015 New Revision: 67585 URL: http://svn.reactos.org/svn/reactos?rev=67585&view=rev Log: [NTVDM] Implement EMS function AH = 59h (Get Expanded Memory Hardware Information). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Wed May 6 23:06:28 2015 @@ -361,6 +361,36 @@ break; } + /* Get Expanded Memory Hardware Information */ + case 0x59: + { + if (getAL() == 0x00) + { + PEMS_HARDWARE_INFO HardwareInfo = (PEMS_HARDWARE_INFO)SEG_OFF_TO_PTR(getES(), getDI()); + + /* Return the hardware information */ + HardwareInfo->RawPageSize = EMS_PAGE_SIZE >> 4; + HardwareInfo->AlternateRegSets = 0; + HardwareInfo->ContextAreaSize = sizeof(Mapping); + HardwareInfo->DmaRegisterSets = 0; + HardwareInfo->DmaChannelOperation = 0; + } + else if (getAL() == 0x01) + { + /* Same as function AH = 42h */ + setAH(EMS_STATUS_OK); + setBX(RtlNumberOfClearBits(&AllocBitmap)); + setDX(EmsTotalPages); + } + else + { + DPRINT1("Invalid subfunction %02X for EMS function AH = 59h\n", getAL()); + setAH(EMS_STATUS_UNKNOWN_FUNCTION); + } + + break; + } + default: { DPRINT1("EMS function AH = %02X NOT IMPLEMENTED\n", getAH()); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Wed May 6 23:06:28 2015 @@ -58,6 +58,15 @@ USHORT DestSegment; } EMS_COPY_DATA, *PEMS_COPY_DATA; +typedef struct _EMS_HARDWARE_INFO +{ + WORD RawPageSize; + WORD AlternateRegSets; + WORD ContextAreaSize; + WORD DmaRegisterSets; + WORD DmaChannelOperation; +} EMS_HARDWARE_INFO, *PEMS_HARDWARE_INFO; + #pragma pack(pop) #endif

1 0

[aandrejevic] 67584: [NTVDM] - INT 21h AH = 0Ah: don't increment the count for a backspace. - Fix the EMS version number.
by aandrejevic＠svn.reactos.org 06 May '15

06 May '15

Author: aandrejevic Date: Wed May 6 22:41:22 2015 New Revision: 67584 URL: http://svn.reactos.org/svn/reactos?rev=67584&view=rev Log: [NTVDM] - INT 21h AH = 0Ah: don't increment the count for a backspace. - Fix the EMS version number. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Wed May 6 22:41:22 2015 @@ -402,6 +402,7 @@ } if (Character == '\r') break; + if (Character == '\b') continue; Count++; /* Carriage returns are NOT counted */ } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Wed May 6 22:41:22 2015 @@ -11,7 +11,7 @@ /* DEFINITIONS ****************************************************************/ -#define EMS_VERSION_NUM 0x04 +#define EMS_VERSION_NUM 0x40 #define EMS_INTERRUPT_NUM 0x67 #define EMS_SEGMENT 0xD000 #define EMS_MAX_HANDLES 16

1 0

[dquintana] 67583: [EXPLORER] Remove notification icons when their attached HWND is no longer valid. Patch by Joachim Henze (reactosfanboy), with some extra newlines by me. CORE-9537 #resolve
by dquintana＠svn.reactos.org 06 May '15

06 May '15

Author: dquintana Date: Wed May 6 22:13:06 2015 New Revision: 67583 URL: http://svn.reactos.org/svn/reactos?rev=67583&view=rev Log: [EXPLORER] Remove notification icons when their attached HWND is no longer valid. Patch by Joachim Henze (reactosfanboy), with some extra newlines by me. CORE-9537 #resolve Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed May 6 22:13:06 2015 @@ -256,7 +256,27 @@ NOTIFYICONDATA * notifyItem = GetItemData(wIndex); if (!::IsWindow(notifyItem->hWnd)) + { + // We detect and destroy icons with invalid handles only on mouse move over systray, same as MS does. + // Alternatively we could search for them periodically (would waste more resources). + TRACE("destroying icon with invalid handle\n"); + + HWND parentHWND = GetParent(); + parentHWND = ::GetParent(parentHWND); + + RECT windowRect; + ::GetClientRect(parentHWND, &windowRect); + + RemoveButton(notifyItem); + + SendMessage(parentHWND, + WM_SIZE, + 0, + MAKELONG(windowRect.right - windowRect.left, + windowRect.bottom - windowRect.top)); + return; + } if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) {

1 0

[hbelusca] 67582: [NTVDM]: Move the DosStartProcess dprint inside the function.
by hbelusca＠svn.reactos.org 06 May '15

06 May '15

Author: hbelusca Date: Wed May 6 22:07:16 2015 New Revision: 67582 URL: http://svn.reactos.org/svn/reactos?rev=67582&view=rev Log: [NTVDM]: Move the DosStartProcess dprint inside the function. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Wed May 6 22:07:16 2015 @@ -257,11 +257,6 @@ } /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%.*s')...\n", - AppName, - CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the command line without the terminating 0d 0a */ - : CommandInfo.CmdLen, - CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) { @@ -474,7 +469,6 @@ } /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); Result = DosStartProcess(ApplicationName, CommandLine, SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0)); if (Result != ERROR_SUCCESS) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Wed May 6 22:07:16 2015 @@ -621,6 +621,15 @@ { DWORD Result; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); + + SIZE_T CmdLen = strlen(CommandLine); + DPRINT1("Starting '%s' ('%.*s')...\n", + ExecutablePath, + /* Display the command line without the terminating 0d 0a (and skip the terminating NULL) */ + CmdLen >= 2 ? (CommandLine[CmdLen - 2] == '\r' ? CmdLen - 2 + : CmdLen) + : CmdLen, + CommandLine); Result = DosLoadExecutable(DOS_LOAD_AND_EXECUTE, ExecutablePath,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs