Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67611: [NTVDM] - Implement XMS function 0x0E (Get Handle Information). - Fix INT 15h, AX = E820h - setCF can't be used inside an int32 callback for changing the return carry flag, bec...
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 00:55:38 2015 New Revision: 67611 URL: http://svn.reactos.org/svn/reactos?rev=67611&view=rev Log: [NTVDM] - Implement XMS function 0x0E (Get Handle Information). - Fix INT 15h, AX = E820h - setCF can't be used inside an int32 callback for changing the return carry flag, because it has a different meaning there (it means that the BOP should be repeated). Instead, we must modify the CF that was pushed on the stack. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun May 10 00:55:38 2015 @@ -318,7 +318,7 @@ PBIOS_MEMORY_MAP Map = (PBIOS_MEMORY_MAP)SEG_OFF_TO_PTR(getES(), getDI()); /* Assume the buffer won't be large enough */ - setCF(0); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; while (BytesWritten < getECX() && (ULONG_PTR)Map < (MAX_ADDRESS - sizeof(BIOS_MEMORY_MAP))) { @@ -326,7 +326,7 @@ if (!MemQueryMemoryZone(Offset, &Length, &Hooked)) { /* No more memory blocks */ - setCF(1); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; break; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sun May 10 00:55:38 2015 @@ -513,6 +513,35 @@ break; } + /* Get Handle Information */ + case 0x0E: + { + PXMS_HANDLE Entry = GetHandleRecord(getDX()); + + if (Entry) + { + INT i; + UCHAR Handles = 0; + + for (i = 0; i < XMS_MAX_HANDLES; i++) + { + if (HandleTable[i].Handle == 0) Handles++; + } + + setAX(1); + setBH(Entry->LockCount); + setBL(Handles); + setDX(Entry->Size); + } + else + { + setAX(0); + setBL(XMS_STATUS_INVALID_HANDLE); + } + + break; + } + default: { DPRINT1("XMS command AH = 0x%02X NOT IMPLEMENTED\n", getAH());

1 0

[aandrejevic] 67610: [NTVDM] Correct the byte order of the magic value: 'PAMS' -> 'SMAP'.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 23:56:38 2015 New Revision: 67610 URL: http://svn.reactos.org/svn/reactos?rev=67610&view=rev Log: [NTVDM] Correct the byte order of the magic value: 'PAMS' -> 'SMAP'. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat May 9 23:56:38 2015 @@ -309,7 +309,7 @@ setCX(Above1M); setDX(Above16M); } - else if (getAL() == 0x20 && getEDX() == 'PAMS') + else if (getAL() == 0x20 && getEDX() == 'SMAP') { ULONG Offset = getEBX(); ULONG Length; @@ -340,7 +340,7 @@ BytesWritten += sizeof(BIOS_MEMORY_MAP); } - setEAX('PAMS'); + setEAX('SMAP'); setEBX(Offset); setECX(BytesWritten); }

1 0

[aandrejevic] 67609: [NTVDM] Implement BIOS INT 15h functions AX = E820 (Get Memory Map) and AX = E801 (Get Memory Size for >64M Configurations).
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 23:48:09 2015 New Revision: 67609 URL: http://svn.reactos.org/svn/reactos?rev=67609&view=rev Log: [NTVDM] Implement BIOS INT 15h functions AX = E820 (Get Memory Map) and AX = E801 (Get Memory Size for >64M Configurations). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat May 9 23:48:09 2015 @@ -27,6 +27,7 @@ #include "vidbios32.h" #include "moubios32.h" +#include "memory.h" #include "io.h" #include "hardware/cmos.h" #include "hardware/pic.h" @@ -291,6 +292,68 @@ break; } + /* Get System Memory Map */ + case 0xE8: + { + if (getAL() == 0x01) + { + /* The amount of memory between 1M and 16M, in kilobytes */ + ULONG Above1M = (min(MAX_ADDRESS, 0x01000000) - 0x00100000) >> 10; + + /* The amount of memory above 16M, in 64K blocks */ + ULONG Above16M = (MAX_ADDRESS > 0x01000000) ? (MAX_ADDRESS - 0x01000000) >> 16: 0; + + setCF(0); + setAX(Above1M); + setBX(Above16M); + setCX(Above1M); + setDX(Above16M); + } + else if (getAL() == 0x20 && getEDX() == 'PAMS') + { + ULONG Offset = getEBX(); + ULONG Length; + ULONG BytesWritten = 0; + BOOLEAN Hooked; + PBIOS_MEMORY_MAP Map = (PBIOS_MEMORY_MAP)SEG_OFF_TO_PTR(getES(), getDI()); + + /* Assume the buffer won't be large enough */ + setCF(0); + + while (BytesWritten < getECX() && (ULONG_PTR)Map < (MAX_ADDRESS - sizeof(BIOS_MEMORY_MAP))) + { + /* Let's ask our memory controller */ + if (!MemQueryMemoryZone(Offset, &Length, &Hooked)) + { + /* No more memory blocks */ + setCF(1); + break; + } + + Map->BaseAddress = (ULONGLONG)Offset; + Map->Length = (ULONGLONG)Length; + Map->Type = Hooked ? BIOS_MEMORY_RESERVED : BIOS_MEMORY_AVAILABLE; + + /* Go to the next record */ + Map++; + Offset += Length; + BytesWritten += sizeof(BIOS_MEMORY_MAP); + } + + setEAX('PAMS'); + setEBX(Offset); + setECX(BytesWritten); + } + else + { + DPRINT1("BIOS Function INT 15h, AH = 0xE8 - unexpected AL = %02X, EDX = %08X\n", + getAL(), + getEDX()); + } + + break; + } + default: { DPRINT1("BIOS Function INT 15h, AH = 0x%02X NOT IMPLEMENTED\n", Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sat May 9 23:48:09 2015 @@ -15,6 +15,21 @@ /* DEFINES ********************************************************************/ +enum +{ + BIOS_MEMORY_AVAILABLE = 1, + BIOS_MEMORY_RESERVED = 2, + BIOS_MEMORY_ACPI_RECLAIMABLE = 3, + BIOS_MEMORY_ACPI_NVS = 4 +}; + +typedef struct +{ + ULONGLONG BaseAddress; + ULONGLONG Length; + ULONG Type; +} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; + // #define BIOS_EQUIPMENT_INTERRUPT 0x11 // #define BIOS_MEMORY_SIZE 0x12 // #define BIOS_MISC_INTERRUPT 0x15 Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Sat May 9 23:48:09 2015 @@ -283,7 +283,23 @@ return TRUE; } - +BOOLEAN +MemQueryMemoryZone(ULONG StartAddress, PULONG Length, PBOOLEAN Hooked) +{ + ULONG Page = StartAddress >> 12; + if (Page >= TOTAL_PAGES) return FALSE; + + *Length = 0; + *Hooked = PageTable[Page] != NULL; + + while (Page < TOTAL_PAGES && (PageTable[Page] != NULL) == *Hooked) + { + *Length += PAGE_SIZE; + Page++; + } + + return TRUE; +} PBYTE WINAPI Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Sat May 9 23:48:09 2015 @@ -67,6 +67,14 @@ ULONG Size ); +BOOLEAN +MemQueryMemoryZone +( + ULONG StartAddress, + PULONG Length, + PBOOLEAN Hooked +); + #endif // _MEMORY_H_ /* EOF */

1 0

[tfaber] 67608: [DDK] - Include <suppress.h> from wdm.h to satisfy __WARNING_MEMORY_NOT_ACQUIRED. Patch by Mark Jansen. CORE-9657 #resolve
by tfaber＠svn.reactos.org 09 May '15

09 May '15

Author: tfaber Date: Sat May 9 22:49:37 2015 New Revision: 67608 URL: http://svn.reactos.org/svn/reactos?rev=67608&view=rev Log: [DDK] - Include <suppress.h> from wdm.h to satisfy __WARNING_MEMORY_NOT_ACQUIRED. Patch by Mark Jansen. CORE-9657 #resolve Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6760… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat May 9 22:49:37 2015 @@ -43,6 +43,7 @@ #include <ntstatus.h> #include <kernelspecs.h> #include <ntiologc.h> +#include <suppress.h> #ifndef GUID_DEFINED #include <guiddef.h> Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sat May 9 22:49:37 2015 @@ -43,6 +43,7 @@ #include <ntstatus.h> #include <kernelspecs.h> #include <ntiologc.h> +#include <suppress.h> #ifndef GUID_DEFINED #include <guiddef.h>

1 0

[tfaber] 67607: [CMAKE] - Enable C4189 (local variable initialized but not referenced) on MSVC builds and make it an error. CORE-9676 #resolve
by tfaber＠svn.reactos.org 09 May '15

09 May '15

Author: tfaber Date: Sat May 9 22:44:52 2015 New Revision: 67607 URL: http://svn.reactos.org/svn/reactos?rev=67607&view=rev Log: [CMAKE] - Enable C4189 (local variable initialized but not referenced) on MSVC builds and make it an error. CORE-9676 #resolve Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67607… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat May 9 22:44:52 2015 @@ -59,11 +59,12 @@ # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types # - C4163: 'identifier': not available as an intrinsic function +# - C4189: local variable initialized but not referenced # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage # - C4603: macro is not defined or definition is different after precompiled header use # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4189 /we4229 /we4700 /we4603 /we4716") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Sat May 9 22:44:52 2015 @@ -30,6 +30,8 @@ add_library(mesa_swrast STATIC ${SOURCE}) add_pch(mesa_swrast precomp.h SOURCE) -if(NOT MSVC) +if(MSVC) + add_target_compile_flags(mesa_swrast "/wd4189") +else() add_target_compile_flags(mesa_swrast "-Wno-unused-variable") endif() Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Sat May 9 22:44:52 2015 @@ -67,6 +67,8 @@ add_pch(libxml2 libxml.h SOURCE) add_dependencies(libxml2 psdk) -if(NOT MSVC) +if(MSVC) + add_target_compile_flags(libxml2 "/wd4189") +else() add_target_compile_flags(libxml2 "-w") endif()

1 0

[aandrejevic] 67606: [FAST486] If the executable bit of a segment descriptor is set, it's never a grow-down segment.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 21:56:40 2015 New Revision: 67606 URL: http://svn.reactos.org/svn/reactos?rev=67606&view=rev Log: [FAST486] If the executable bit of a segment descriptor is set, it's never a grow-down segment. Modified: trunk/reactos/lib/fast486/common.c 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] Sat May 9 21:56:40 2015 @@ -47,7 +47,7 @@ /* Get the cached descriptor */ CachedDescriptor = &State->SegmentRegs[SegmentReg]; - if (InstFetch || !CachedDescriptor->DirConf) + if (InstFetch || CachedDescriptor->Executable || !CachedDescriptor->DirConf) { if ((Offset + Size - 1) > CachedDescriptor->Limit) { @@ -169,7 +169,7 @@ /* Get the cached descriptor */ CachedDescriptor = &State->SegmentRegs[SegmentReg]; - if (!CachedDescriptor->DirConf) + if (CachedDescriptor->Executable || !CachedDescriptor->DirConf) { if ((Offset + Size - 1) > CachedDescriptor->Limit) {

1 0

[aandrejevic] 67605: [NTVDM] Remove an accidentally committed temporary DPRINT1.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 03:15:11 2015 New Revision: 67605 URL: http://svn.reactos.org/svn/reactos?rev=67605&view=rev Log: [NTVDM] Remove an accidentally committed temporary DPRINT1. 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] Sat May 9 03:15:11 2015 @@ -934,8 +934,6 @@ setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); - DPRINT1("Terminate returning to %08X\n", PspBlock->TerminateAddress); - /* Are we returning to DOS code? */ if (HIWORD(PspBlock->TerminateAddress) == DOS_CODE_SEGMENT) {

1 0

[hbelusca] 67604: [NTVDM]: hardcoded_values--;
by hbelusca＠svn.reactos.org 08 May '15

08 May '15

Author: hbelusca Date: Fri May 8 23:47:33 2015 New Revision: 67604 URL: http://svn.reactos.org/svn/reactos?rev=67604&view=rev Log: [NTVDM]: hardcoded_values--; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Fri May 8 23:47:33 2015 @@ -358,7 +358,7 @@ } /* Create a driver header for this device */ - Segment = DosAllocateMemory(sizeof(DOS_DRIVER) + 10 + PrivateDataSize, NULL); + Segment = DosAllocateMemory(sizeof(DOS_DRIVER) + DEVICE_CODE_SIZE + PrivateDataSize, NULL); if (Segment == 0) return NULL; /* Fill the header with data */

1 0

[aandrejevic] 67603: [NTVDM] DosTerminateProcess shouldn't blindly attempt to restore the old state, (for example if the process was started manually by a debugger).
by aandrejevic＠svn.reactos.org 08 May '15

08 May '15

Author: aandrejevic Date: Fri May 8 23:26:15 2015 New Revision: 67603 URL: http://svn.reactos.org/svn/reactos?rev=67603&view=rev Log: [NTVDM] DosTerminateProcess shouldn't blindly attempt to restore the old state, (for example if the process was started manually by a debugger). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.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] Fri May 8 23:26:15 2015 @@ -1342,7 +1342,6 @@ BYTE OrgAL = getAL(); LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); - DWORD ReturnAddress = MAKELONG(Stack[STACK_IP], Stack[STACK_CS]); WORD ErrorCode; if (OrgAL <= DOS_LOAD_OVERLAY) @@ -1353,9 +1352,7 @@ if (LoadType == DOS_LOAD_AND_EXECUTE) { /* Create a new process */ - ErrorCode = DosCreateProcess(ProgramName, - ParamBlock, - ReturnAddress); + ErrorCode = DosCreateProcess(ProgramName, ParamBlock); } else #endif @@ -1365,8 +1362,7 @@ ProgramName, ParamBlock, NULL, - NULL, - ReturnAddress); + NULL); } } else if (OrgAL == 0x05) @@ -2003,7 +1999,7 @@ #endif /* Initialize the callback context */ - InitializeContext(&DosContext, 0x0070, 0x0000); + InitializeContext(&DosContext, DOS_CODE_SEGMENT, 0x0000); /* Register the DOS 32-bit Interrupts */ RegisterDosInt32(0x20, DosInt20h ); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Fri May 8 23:26:15 2015 @@ -30,6 +30,7 @@ #define USER_MEMORY_SIZE (0x9FFE - FIRST_MCB_SEGMENT) #define SYSTEM_PSP 0x08 #define SYSTEM_ENV_BLOCK 0x800 +#define DOS_CODE_SEGMENT 0x70 #define DOS_DATA_SEGMENT 0xA0 #define MASTER_SFT_OFFSET 0x100 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] Fri May 8 23:26:15 2015 @@ -54,6 +54,7 @@ /* Allocate stack space for the registers */ StackPointer -= sizeof(DOS_REGISTER_STATE); State = SEG_OFF_TO_PTR(getSS(), StackPointer); + setSP(StackPointer); /* Save */ State->EAX = getEAX(); @@ -74,12 +75,10 @@ static inline VOID DosRestoreState(VOID) { PDOS_REGISTER_STATE State; - WORD StackPointer = getSP(); - - /* SS:SP points to the stack on the last entry to INT 21h */ - StackPointer -= (STACK_FLAGS + 1) * 2; /* Interrupt parameters */ - StackPointer -= sizeof(DOS_REGISTER_STATE); /* Pushed state structure */ - State = SEG_OFF_TO_PTR(getSS(), StackPointer); + + /* Pop the state structure from the stack */ + State = SEG_OFF_TO_PTR(getSS(), getSP()); + setSP(getSP() + sizeof(DOS_REGISTER_STATE)); /* Restore */ setEAX(State->EAX); @@ -244,8 +243,7 @@ IN LPCSTR ExecutablePath, IN PDOS_EXEC_PARAM_BLOCK Parameters, IN LPCSTR CommandLine OPTIONAL, - IN LPCSTR Environment OPTIONAL, - IN DWORD ReturnAddress OPTIONAL) + IN LPCSTR Environment OPTIONAL) { DWORD Result = ERROR_SUCCESS; HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; @@ -264,8 +262,7 @@ DPRINT1("DosLoadExecutable(%d, %s, 0x%08X, 0x%08X)\n", LoadType, ExecutablePath, - Parameters, - ReturnAddress); + Parameters); /* Try to get the full path to the executable */ if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) @@ -454,8 +451,8 @@ DosChangeMemoryOwner(Segment, Segment); DosChangeMemoryOwner(EnvBlock, Segment); - /* Set INT 22h to the return address */ - ((PULONG)BaseAddress)[0x22] = ReturnAddress; + /* Set INT 22h to the current CS:IP */ + ((PULONG)BaseAddress)[0x22] = MAKELONG(getIP(), getCS()); /* Create the PSP */ DosCreatePsp(Segment, (WORD)TotalSize); @@ -497,7 +494,14 @@ if (LoadType == DOS_LOAD_AND_EXECUTE) { /* Save the program state */ - if (CurrentPsp != SYSTEM_PSP) DosSaveState(); + if (CurrentPsp != SYSTEM_PSP) + { + /* Push the task state */ + DosSaveState(); + + /* Update the last stack in the PSP */ + SEGMENT_TO_PSP(CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); + } /* Set the initial segment registers */ setDS(Segment); @@ -546,8 +550,8 @@ DosChangeMemoryOwner(Segment, Segment); DosChangeMemoryOwner(EnvBlock, Segment); - /* Set INT 22h to the return address */ - ((PULONG)BaseAddress)[0x22] = ReturnAddress; + /* Set INT 22h to the current CS:IP */ + ((PULONG)BaseAddress)[0x22] = MAKELONG(getIP(), getCS()); /* Create the PSP */ DosCreatePsp(Segment, MaxAllocSize); @@ -570,6 +574,16 @@ if (LoadType == DOS_LOAD_AND_EXECUTE) { + /* Save the program state */ + if (CurrentPsp != SYSTEM_PSP) + { + /* Push the task state */ + DosSaveState(); + + /* Update the last stack in the PSP */ + SEGMENT_TO_PSP(CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); + } + /* Set the initial segment registers */ setDS(Segment); setES(Segment); @@ -621,7 +635,6 @@ IN LPCSTR Environment OPTIONAL) { DWORD Result; - LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); SIZE_T CmdLen = strlen(CommandLine); DPRINT1("Starting '%s' ('%.*s')...\n", @@ -636,8 +649,7 @@ ExecutablePath, NULL, CommandLine, - Environment, - IntVecTable[0x20]); + Environment); if (Result != ERROR_SUCCESS) goto Quit; @@ -665,8 +677,7 @@ #ifndef STANDALONE WORD DosCreateProcess(LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters, - DWORD ReturnAddress) + PDOS_EXEC_PARAM_BLOCK Parameters) { DWORD Result; DWORD BinaryType; @@ -784,8 +795,7 @@ AppName, Parameters, CmdLine, - Env, - ReturnAddress); + Env); if (Result == ERROR_SUCCESS) { /* Increment the re-entry count */ @@ -924,8 +934,14 @@ setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); - /* Restore the program state */ - DosRestoreState(); + DPRINT1("Terminate returning to %08X\n", PspBlock->TerminateAddress); + + /* Are we returning to DOS code? */ + if (HIWORD(PspBlock->TerminateAddress) == DOS_CODE_SEGMENT) + { + /* Pop the task state */ + DosRestoreState(); + } /* Return control to the parent process */ CpuExecute(HIWORD(PspBlock->TerminateAddress), Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Fri May 8 23:26:15 2015 @@ -97,8 +97,7 @@ IN LPCSTR ExecutablePath, IN PDOS_EXEC_PARAM_BLOCK Parameters, IN LPCSTR CommandLine OPTIONAL, - IN LPCSTR Environment OPTIONAL, - IN DWORD ReturnAddress OPTIONAL + IN LPCSTR Environment OPTIONAL ); DWORD DosStartProcess( @@ -110,8 +109,7 @@ WORD DosCreateProcess ( LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters, - DWORD ReturnAddress + PDOS_EXEC_PARAM_BLOCK Parameters ); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode, WORD KeepResident);

1 0

[hbelusca] 67602: [NTVDM]: Merge Bios32 ResetBop with POST function.
by hbelusca＠svn.reactos.org 08 May '15

08 May '15

Author: hbelusca Date: Fri May 8 19:43:12 2015 New Revision: 67602 URL: http://svn.reactos.org/svn/reactos?rev=67602&view=rev Log: [NTVDM]: Merge Bios32 ResetBop with POST function. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Fri May 8 19:43:12 2015 @@ -635,8 +635,9 @@ /* * The BIOS POST (Power On-Self Test) */ -VOID -Bios32Post(VOID) +static VOID +WINAPI +Bios32Post(LPWORD Stack) { #if 0 BOOLEAN Success; @@ -644,6 +645,9 @@ BYTE ShutdownStatus; DPRINT("Bios32Post\n"); + + /* Disable interrupts */ + setIF(0); /* Initialize the stack */ // That's what says IBM... (stack at 30:00FF going downwards) @@ -686,7 +690,7 @@ case 0x04: { DPRINT1("Fast restart to Bootstrap Loader...\n"); - return; + goto Quit; // Reenable interrupts and exit. } /* Flush keyboard, issue an EOI... */ @@ -711,7 +715,7 @@ HIWORD(Bda->ResumeEntryPoint), LOWORD(Bda->ResumeEntryPoint)); - /* Position execution pointers to Bda->ResumeEntryPoint and return */ + /* Position execution pointers and return with interrupts disabled */ setCS(HIWORD(Bda->ResumeEntryPoint)); setIP(LOWORD(Bda->ResumeEntryPoint)); return; @@ -764,8 +768,6 @@ /* Initialize the Keyboard, Video and Mouse BIOS */ if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) { - // return FALSE; - /* Stop the VDM */ EmulatorTerminate(); return; @@ -796,18 +798,8 @@ * the rest of the POST code is executed, typically calling INT 19h * to boot up the OS. */ -} - -static VOID WINAPI Bios32ResetBop(LPWORD Stack) -{ - DPRINT("Bios32ResetBop\n"); - - /* Disable interrupts */ - setIF(0); - - /* Do the POST */ - Bios32Post(); - + +Quit: /* Enable interrupts */ setIF(1); } @@ -839,7 +831,7 @@ *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; /* Redefine our POST function */ - RegisterBop(BOP_RESET, Bios32ResetBop); + RegisterBop(BOP_RESET, Bios32Post); /* We are done */ return TRUE;

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