Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tkreuzer] 64530: [NTOSKRNL] Fix compilation with MI_TRACE_PFNS and MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 4 22:41:47 2014 New Revision: 64530 URL: http://svn.reactos.org/svn/reactos?rev=64530&view=rev Log: [NTOSKRNL] Fix compilation with MI_TRACE_PFNS and MSVC Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=645… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Oct 4 22:41:47 2014 @@ -709,10 +709,10 @@ /* Create a virtual mapping for this memory area */ MI_SET_USAGE(MI_USAGE_CACHE); #if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) { + PWCHAR pos = NULL; + ULONG len = 0; pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); len = wcslen(pos) * sizeof(WCHAR); if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Oct 4 22:41:47 2014 @@ -181,10 +181,10 @@ /* Some debug stuff */ MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); #if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; if (FileName->Buffer) { + PWCHAR pos = NULL; + ULONG len = 0; pos = wcsrchr(FileName->Buffer, '\\'); len = wcslen(pos) * sizeof(WCHAR); if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos);

9 years, 11 months

[jgardou] 64529: [USETUP] - Fix potential buffer overflow

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 4 21:24:16 2014 New Revision: 64529 URL: http://svn.reactos.org/svn/reactos?rev=64529&view=rev Log: [USETUP] - Fix potential buffer overflow Modified: trunk/reactos/base/setup/usetup/fslist.c Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sat Oct 4 21:24:16 2014 @@ -166,12 +166,12 @@ if (Item->FileSystem) { if (Item->QuickFormat) - sprintf(Buffer, MUIGetString(STRING_FORMATDISK1), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystem); else - sprintf(Buffer, MUIGetString(STRING_FORMATDISK2), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystem); } else - sprintf(Buffer, MUIGetString(STRING_KEEPFORMAT)); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); if (ListEntry == &List->Selected->ListEntry) CONSOLE_SetInvertedTextXY(List->Left,

9 years, 11 months

[tkreuzer] 64528: [NTOSKRNL] - Implement MiIncrementAvailablePages and MiDecrementAvailablePages factoring out duplicated code from a number of locations - Get rid of MiAllocatePfn. Any further com...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 4 21:17:27 2014 New Revision: 64528 URL: http://svn.reactos.org/svn/reactos?rev=64528&view=rev Log: [NTOSKRNL] - Implement MiIncrementAvailablePages and MiDecrementAvailablePages factoring out duplicated code from a number of locations - Get rid of MiAllocatePfn. Any further comment would result in excessive use of curse words. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -1973,13 +1973,6 @@ IN PMMPFN Pfn ); -PFN_NUMBER -NTAPI -MiAllocatePfn( - IN PMMPTE PointerPte, - IN ULONG Protection -); - VOID NTAPI MiInitializePfn( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -65,6 +65,59 @@ /* FUNCTIONS ******************************************************************/ +static +VOID +MiIncrementAvailablePages( + VOID) +{ + /* Increment available pages */ + MmAvailablePages++; + + /* Check if we've reached the configured low memory threshold */ + if (MmAvailablePages == MmLowMemoryThreshold) + { + /* Clear the event, because now we're ABOVE the threshold */ + KeClearEvent(MiLowMemoryEvent); + } + else if (MmAvailablePages == MmHighMemoryThreshold) + { + /* Otherwise check if we reached the high threshold and signal the event */ + KeSetEvent(MiHighMemoryEvent, 0, FALSE); + } +} + +static +VOID +MiDecrementAvailablePages( + VOID) +{ + ASSERT(MmAvailablePages > 0); + + /* See if we hit any thresholds */ + if (MmAvailablePages == MmHighMemoryThreshold) + { + /* Clear the high memory event */ + KeClearEvent(MiHighMemoryEvent); + } + else if (MmAvailablePages == MmLowMemoryThreshold) + { + /* Signal the low memory event */ + KeSetEvent(MiLowMemoryEvent, 0, FALSE); + } + + /* One less page */ + MmAvailablePages--; + if (MmAvailablePages < MmMinimumFreePages) + { + /* FIXME: Should wake up the MPW and working set manager, if we had one */ + + DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); + + /* Call RosMm and see if it can release any pages for us */ + MmRebalanceMemoryConsumers(); + } +} + VOID NTAPI MiZeroPhysicalPage(IN PFN_NUMBER PageFrameIndex) @@ -195,28 +248,8 @@ Entry->u1.Flink = Entry->u2.Blink = 0; ASSERT_LIST_INVARIANT(ListHead); - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); #if MI_TRACE_PFNS ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); @@ -253,31 +286,12 @@ /* Get the exact list */ ListHead = &MmStandbyPageListByPriority[Pfn->u4.Priority]; - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); /* Decrease transition page counter */ ASSERT(Pfn->u3.e1.PrototypePte == 1); /* Only supported ARM3 case */ MmTransitionSharedPages--; - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } } else if (ListHead == &MmModifiedPageListHead) { @@ -442,28 +456,8 @@ /* ReactOS Hack */ Pfn1->OriginalPte.u.Long = 0; - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); #if MI_TRACE_PFNS //ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); @@ -664,20 +658,8 @@ Pfn1->u4.InPageError = 0; Pfn1->u4.AweAllocation = 0; - /* Increase available pages */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; @@ -779,20 +761,8 @@ /* Move the page onto its new location */ Pfn1->u3.e1.PageLocation = StandbyPageList; - /* One more page on the system */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); } VOID @@ -919,20 +889,8 @@ /* For zero/free pages, we also have to handle the colored lists */ if (ListName <= StandbyPageList) { - /* One more page on the system */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); /* Sanity checks */ ASSERT(ListName == ZeroedPageList); @@ -1160,54 +1118,6 @@ /* Release the lock and return success */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return STATUS_SUCCESS; -} - -PFN_NUMBER -NTAPI -MiAllocatePfn(IN PMMPTE PointerPte, - IN ULONG Protection) -{ - KIRQL OldIrql; - PFN_NUMBER PageFrameIndex; - MMPTE TempPte; - - /* Sanity check that we aren't passed a valid PTE */ - ASSERT(PointerPte->u.Hard.Valid == 0); - - /* Make an empty software PTE */ - MI_MAKE_SOFTWARE_PTE(&TempPte, MM_READWRITE); - - /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Check if we're running low on pages */ - if (MmAvailablePages < 128) - { - DPRINT1("Warning, running low on memory: %lu pages left\n", MmAvailablePages); - - //MiEnsureAvailablePageOrWait(NULL, OldIrql); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } - - /* Grab a page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); - PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); - - /* Write the software PTE */ - MI_WRITE_INVALID_PTE(PointerPte, TempPte); - PointerPte->u.Soft.Protection |= Protection; - - /* Initialize its PFN entry */ - MiInitializePfn(PageFrameIndex, PointerPte, TRUE); - - /* Release the PFN lock and return the page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - return PageFrameIndex; } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -99,6 +99,8 @@ PMMPTE PointerPte, LastPte; PVOID DriverBase; MMPTE TempPte; + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; PAGED_CODE(); /* Detect session load */ @@ -173,30 +175,45 @@ *ImageBase = DriverBase; DPRINT1("Loading: %wZ at %p with %lx pages\n", FileName, DriverBase, PteCount); + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Some debug stuff */ + MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); +#if MI_TRACE_PFNS + PWCHAR pos = NULL; + ULONG len = 0; + if (FileName->Buffer) + { + pos = wcsrchr(FileName->Buffer, '\\'); + len = wcslen(pos) * sizeof(WCHAR); + if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); + } +#endif + /* Loop the new driver PTEs */ TempPte = ValidKernelPte; while (PointerPte < LastPte) { - /* Allocate a page */ - MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); -#if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; - if (FileName->Buffer) - { - pos = wcsrchr(FileName->Buffer, '\\'); - len = wcslen(pos) * sizeof(WCHAR); - if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); - } -#endif - TempPte.u.Hard.PageFrameNumber = MiAllocatePfn(PointerPte, MM_EXECUTE); - - /* Write it */ + /* Make sure the PTE is not valid for whatever reason */ + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Grab a page */ + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); + + /* Initialize its PFN entry */ + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + + /* Write the PTE */ + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Move on */ PointerPte++; } + + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); /* Copy the image */ RtlCopyMemory(DriverBase, Base, PteCount << PAGE_SHIFT);

9 years, 11 months

[jgardou] 64527: [GCC/CMAKE] - Add a way to conditionally use the GCC stack protector. Just add -DSTACK_PROTECTOR:BOOL=TRUE as argument to configure.cmd/sh

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 4 20:26:14 2014 New Revision: 64527 URL: http://svn.reactos.org/svn/reactos?rev=64527&view=rev Log: [GCC/CMAKE] - Add a way to conditionally use the GCC stack protector. Just add -DSTACK_PROTECTOR:BOOL=TRUE as argument to configure.cmd/sh Added: trunk/reactos/lib/gcc_ssp/ trunk/reactos/lib/gcc_ssp/CMakeLists.txt (with props) trunk/reactos/lib/gcc_ssp/gcc_ssp.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -210,6 +210,11 @@ target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) +if (STACK_PROTECTOR) + target_link_libraries(freeldr_pe gcc_ssp) + target_link_libraries(freeldr_pe_dbg gcc_ssp) +endif() + add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) @@ -266,6 +271,11 @@ target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) +if (STACK_PROTECTOR) + target_link_libraries(setupldr_pe gcc_ssp) + target_link_libraries(setupldr_pe_dbg gcc_ssp) +endif() + add_dependencies(setupldr_pe asm) add_dependencies(setupldr_pe_dbg asm) Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=645… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -75,6 +75,9 @@ "Whether to enable PREFAST while compiling.") set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") +else() +set(STACK_PROTECTOR FALSE CACHE BOOL +"Whether to enbable the GCC stack checker while compiling") endif() set(USE_DUMMY_PSEH FALSE CACHE BOOL Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64527&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -28,6 +28,10 @@ if(USE_DUMMY_PSEH) add_definitions(-D_USE_DUMMY_PSEH=1) +endif() + +if(STACK_PROTECTOR) + add_compile_flags(${MODULE} "-fstack-protector-all") endif() # Compiler Core @@ -281,6 +285,10 @@ add_target_link_flags(${MODULE} "-Wl,--wdmdriver") endif() endif() + + if(STACK_PROTECTOR) + target_link_libraries(${MODULE} gcc_ssp) + endif() endfunction() function(add_delay_importlibs _module) Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=645… ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -13,6 +13,9 @@ add_subdirectory(epsapi) add_subdirectory(fast486) add_subdirectory(fslib) +if (STACK_PROTECTOR) + add_subdirectory(gcc_ssp) +endif() add_subdirectory(lsalib) add_subdirectory(ppcmmu) add_subdirectory(pseh) Added: trunk/reactos/lib/gcc_ssp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/gcc_ssp/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/gcc_ssp/CMakeLists.txt (added) +++ trunk/reactos/lib/gcc_ssp/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -0,0 +1,2 @@ + +add_library(gcc_ssp STATIC gcc_ssp.c) Propchange: trunk/reactos/lib/gcc_ssp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/gcc_ssp/gcc_ssp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/gcc_ssp/gcc_ssp.c?rev=… ============================================================================== --- trunk/reactos/lib/gcc_ssp/gcc_ssp.c (added) +++ trunk/reactos/lib/gcc_ssp/gcc_ssp.c [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -0,0 +1,23 @@ + +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 + +/* Should be random :-/ */ +void * __stack_chk_guard = (void*)0xf00df00d; + +#if 0 +void __stack_chk_guard_setup() +{ + unsigned char * p; + p = (unsigned char *)&__stack_chk_guard; // *** Notice that this takes the address of __stack_chk_guard *** + + /* If you have the ability to generate random numbers in your kernel then use them, + otherwise for 32-bit code: */ + *p = 0x00000aff; // *** p is &__stack_chk_guard so *p writes to __stack_chk_guard rather than *__stack_chk_guard *** +} +#endif + +void __stack_chk_fail() +{ + /* Like __fastfail */ + __asm__("int $0x29" : : "c"(FAST_FAIL_STACK_COOKIE_CHECK_FAILURE) : "memory"); +} Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -85,4 +85,8 @@ target_link_libraries(msvcrtex oldnames) endif() +if(STACK_PROTECTOR) + target_link_libraries(msvcrtex gcc_ssp) +endif() + add_dependencies(msvcrtex psdk asm) Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -44,6 +44,10 @@ wdmguid ioevent) +if(STACK_PROTECTOR) + target_link_libraries(ntoskrnl gcc_ssp) +endif() + add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTOSKRNL_SOURCE) add_dependencies(ntoskrnl psdk bugcodes asm) Modified: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -30,6 +30,10 @@ set_image_base(ntkrnlmp 0x80800000) endif() +if(STACK_PROTECTOR) + target_link_libraries(ntkrnlmp gcc_ssp) +endif() + target_link_libraries(ntkrnlmp cportlib csq

9 years, 11 months

[jgardou] 64526: [CMAKE] - Introduce the kerneldll module type (like kernelmodedriver, but ending with .dll) and use it in various places - vfatx.dll whould in fact be a native DLL

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 4 20:25:57 2014 New Revision: 64526 URL: http://svn.reactos.org/svn/reactos?rev=64526&view=rev Log: [CMAKE] - Introduce the kerneldll module type (like kernelmodedriver, but ending with .dll) and use it in various places - vfatx.dll whould in fact be a native DLL Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -518,7 +518,8 @@ # Set subsystem. Also take this as an occasion # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) + OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set(__subsystem native) elseif(${TYPE} STREQUAL win32cui) set(__subsystem console) @@ -617,14 +618,16 @@ else() message(STATUS "${MODULE} has no base address") endif() - elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) set_image_base(${MODULE} 0x00010000) endif() # Now do some stuff which is specific to each type - if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) add_dependencies(${MODULE} bugcodes) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + endif() endif() if(${TYPE} STREQUAL win32ocx) Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -7,9 +7,9 @@ add_library(ufatx SHARED ${SOURCE}) -set_module_type(ufatx win32dll ENTRYPOINT 0 ) +target_link_libraries(ufatx vfatxlib) +set_module_type(ufatx nativedll ENTRYPOINT 0 ) -target_link_libraries(ufatx vfatxlib) add_importlibs(ufatx ntdll) add_dependencies(ufatx psdk) Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… ============================================================================== --- trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -19,12 +19,10 @@ bootvid.rc ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) -set_entrypoint(bootvid 0) -set_subsystem(bootvid native) -set_image_base(bootvid 0x00010000) +set_module_type(bootvid kerneldll ENTRYPOINT 0) add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid precomp.h SOURCE) -add_dependencies(bootvid psdk bugcodes) +add_dependencies(bootvid psdk) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdrosdbg/CMak… ============================================================================== --- trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -8,12 +8,10 @@ add_library(kdcom SHARED ${SOURCE}) -set_entrypoint(kdcom 0) -set_subsystem(kdcom native) -set_image_base(kdcom 0x00010000) +set_module_type(kdcom kerneldll ENTRYPOINT 0) add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) -add_dependencies(kdcom psdk bugcodes) +add_dependencies(kdcom psdk) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -13,12 +13,8 @@ hidclass.rc ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) -set_entrypoint(hidclass 0) -set_subsystem(hidclass native) -set_target_properties(hidclass PROPERTIES SUFFIX ".sys") - +set_module_type(hidclass kernelmodedriver ENTRYPOINT 0) add_importlibs(hidclass ntoskrnl hidparse hal) -add_dependencies(hidclass bugcodes) add_pch(hidclass precomp.h SOURCE) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -40,15 +40,11 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def) -set_target_properties(ks PROPERTIES SUFFIX ".sys") - -set_entrypoint(ks 0) -set_subsystem(ks native) -set_image_base(ks 0x00010000) +set_module_type(ks kernelmodedriver ENTRYPOINT 0) target_link_libraries(ks ${PSEH_LIB}) add_pch(ks precomp.h SOURCE) add_importlibs(ks ntoskrnl hal) -add_dependencies(ks psdk bugcodes) +add_dependencies(ks psdk) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -34,10 +34,8 @@ target_link_libraries(${_halname} libcntpr) add_importlibs(${_halname} ntoskrnl) #add_pch(${_halname} include/hal.h) - add_dependencies(${_halname} psdk bugcodes asm) - set_entrypoint(${_halname} HalInitSystem 8) - set_subsystem(${_halname} native) - set_image_base(${_halname} 0x00010000) + add_dependencies(${_halname} psdk asm) + set_module_type(${_halname} kerneldll ENTRYPOINT HalInitSystem 8) add_cd_file(TARGET ${_halname} DESTINATION reactos/system32 NO_CAB FOR all) if(MSVC) add_target_link_flags(${_halname} "/ignore:4216 /ignore:4078") Modified: trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -14,11 +14,10 @@ framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) +set_module_type(framebuf kerneldll ENTRYPOINT DrvEnableDriver 12) + add_pch(framebuf framebuf.h SOURCE) -set_entrypoint(framebuf DrvEnableDriver 12) -set_subsystem(framebuf native) -set_image_base(framebuf 0x00010000) target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) -add_dependencies(framebuf psdk bugcodes) +add_dependencies(framebuf psdk) add_cd_file(TARGET framebuf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -19,11 +19,10 @@ vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) -set_entrypoint(vgaddi DrvEnableDriver 12) -set_subsystem(vgaddi native) -set_image_base(vgaddi 0x00010000) +set_module_type(vgaddi kerneldll ENTRYPOINT DrvEnableDriver 12) + add_pch(vgaddi vgaddi.h SOURCE) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) -add_dependencies(vgaddi psdk bugcodes) +add_dependencies(vgaddi psdk) add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -16,9 +16,7 @@ freetype.rc ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) -set_entrypoint(ftfd FtfdEnableDriver 12) -set_subsystem(ftfd native) -set_image_base(ftfd 0x00010000) +set_module_type(ftfd kerneldll ENTRYPOINT FtfdEnableDriver 12) target_link_libraries(ftfd freetype

9 years, 11 months

[jgardou] 64525: [KERNEL32] - Always allocate a guard page at the bottom of the stack. It doesn't depend on it being reserved or committed, it just has to be here.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 4 20:25:35 2014 New Revision: 64525 URL: http://svn.reactos.org/svn/reactos?rev=64525&view=rev Log: [KERNEL32] - Always allocate a guard page at the bottom of the stack. It doesn't depend on it being reserved or committed, it just has to be here. Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat Oct 4 20:25:35 2014 @@ -358,7 +358,6 @@ NTSTATUS Status; PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack; - BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", @@ -426,18 +425,6 @@ /* Update the Stack Position */ Stack += StackReserve - StackCommit; - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) - { - Stack -= PageSize; - StackCommit += PageSize; - UseGuard = TRUE; - } - else - { - UseGuard = FALSE; - } - /* Allocate memory for the stack */ Status = NtAllocateVirtualMemory(hProcess, (PVOID*)&Stack, @@ -457,25 +444,21 @@ InitialTeb->StackLimit = (PVOID)Stack; /* Create a guard page */ - if (UseGuard) - { - /* Set the guard page */ - GuardPageSize = PAGE_SIZE; - Status = NtProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure to set guard page\n"); - return Status; - } - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + - GuardPageSize); - } + GuardPageSize = PageSize; + Status = NtProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to set guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + + GuardPageSize); /* We are done! */ return STATUS_SUCCESS;

9 years, 11 months

[pschweitzer] 64524: [MSPAINT] - Check for correct allocation - Don't leak in case of file opening failure

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 4 15:41:38 2014 New Revision: 64524 URL: http://svn.reactos.org/svn/reactos?rev=64524&view=rev Log: [MSPAINT] - Check for correct allocation - Don't leak in case of file opening failure Modified: trunk/reactos/base/applications/mspaint/dib.c Modified: trunk/reactos/base/applications/mspaint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] Sat Oct 4 15:41:38 2014 @@ -72,11 +72,17 @@ bi.biYPelsPerMeter = vRes; buffer = HeapAlloc(GetProcessHeap(), 0, imgDataSize); + if (!buffer) + return; + GetDIBits(hDC, hBitmap, 0, bm.bmHeight, buffer, (LPBITMAPINFO) & bi, DIB_RGB_COLORS); hFile = CreateFile(FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, buffer); return; + } WriteFile(hFile, &bf, sizeof(BITMAPFILEHEADER), &dwBytesWritten, NULL); WriteFile(hFile, &bi, sizeof(BITMAPINFOHEADER), &dwBytesWritten, NULL);

9 years, 11 months

[hbelusca] 64523: [NTVDM] - Move registers code into cpu/ - Implement getIntelRegistersPointer.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 4 15:41:29 2014 New Revision: 64523 URL: http://svn.reactos.org/svn/reactos?rev=64523&view=rev Log: [NTVDM] - Move registers code into cpu/ - Implement getIntelRegistersPointer. Added: trunk/reactos/subsystems/ntvdm/cpu/registers.c - copied, changed from r64477, trunk/reactos/subsystems/ntvdm/registers.c trunk/reactos/subsystems/ntvdm/cpu/registers.h - copied, changed from r64477, trunk/reactos/subsystems/ntvdm/registers.h trunk/reactos/subsystems/ntvdm/cpu/x86context.h (with props) Removed: trunk/reactos/subsystems/ntvdm/registers.c trunk/reactos/subsystems/ntvdm/registers.h Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -17,6 +17,7 @@ cpu/bop.c cpu/callback.c cpu/cpu.c + cpu/registers.c hardware/cmos.c hardware/keyboard.c hardware/mouse.c @@ -34,7 +35,6 @@ emulator.c int32.c io.c - registers.c utils.c vddsup.c ntvdm.c Copied: trunk/reactos/subsystems/ntvdm/cpu/registers.c (from r64477, trunk/reactos/subsystems/ntvdm/registers.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -11,23 +11,83 @@ #define NDEBUG #include "emulator.h" -#include "cpu/cpu.h" +#include "cpu.h" +#include "x86context.h" + +/* PRIVATE VARIABLES **********************************************************/ + +// This structure must by synced with our CPU context +X86CONTEXT IntelRegPtr; /* PUBLIC FUNCTIONS ***********************************************************/ -VOID EmulatorSetStack(WORD Segment, DWORD Offset) -{ - Fast486SetStack(&EmulatorContext, Segment, Offset); -} - - - PVOID WINAPI getIntelRegistersPointer(VOID) { - UNIMPLEMENTED; - return NULL; + /* + * Sync the Intel Registers x86 Context with our CPU context + */ + + if (IntelRegPtr.ContextFlags & CONTEXT_DEBUG_REGISTERS) + { + IntelRegPtr.Dr0 = EmulatorContext.DebugRegisters[FAST486_REG_DR0]; + IntelRegPtr.Dr1 = EmulatorContext.DebugRegisters[FAST486_REG_DR1]; + IntelRegPtr.Dr2 = EmulatorContext.DebugRegisters[FAST486_REG_DR2]; + IntelRegPtr.Dr3 = EmulatorContext.DebugRegisters[FAST486_REG_DR3]; + IntelRegPtr.Dr6 = EmulatorContext.DebugRegisters[FAST486_REG_DR6]; + IntelRegPtr.Dr7 = EmulatorContext.DebugRegisters[FAST486_REG_DR7]; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_FLOATING_POINT) + { + // IntelRegPtr.FloatSave = ; + IntelRegPtr.FloatSave.ControlWord = EmulatorContext.FpuControl.Value; + IntelRegPtr.FloatSave.StatusWord = EmulatorContext.FpuStatus.Value; + // IntelRegPtr.FloatSave.TagWord = ; + // IntelRegPtr.FloatSave.ErrorOffset = ; + // IntelRegPtr.FloatSave.ErrorSelector = ; + // IntelRegPtr.FloatSave.DataOffset = ; + // IntelRegPtr.FloatSave.DataSelector = ; + // IntelRegPtr.FloatSave.RegisterArea = ; // This is a region of size SIZE_OF_80387_REGISTERS == 80 bytes + // IntelRegPtr.FloatSave.Cr0NpxState = ; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_SEGMENTS) + { + IntelRegPtr.SegGs = EmulatorContext.SegmentRegs[FAST486_REG_GS].Selector; + IntelRegPtr.SegFs = EmulatorContext.SegmentRegs[FAST486_REG_FS].Selector; + IntelRegPtr.SegEs = EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; + IntelRegPtr.SegDs = EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_INTEGER) + { + IntelRegPtr.Edi = EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; + IntelRegPtr.Esi = EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; + IntelRegPtr.Ebx = EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; + IntelRegPtr.Edx = EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; + IntelRegPtr.Ecx = EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; + IntelRegPtr.Eax = EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_CONTROL) + { + IntelRegPtr.Ebp = EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long; + IntelRegPtr.Eip = EmulatorContext.InstPtr.Long; + IntelRegPtr.SegCs = EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector; + IntelRegPtr.EFlags = EmulatorContext.Flags.Long; + IntelRegPtr.Esp = EmulatorContext.GeneralRegs[FAST486_REG_ESP].Long; + IntelRegPtr.SegSs = EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector; + } + + if (IntelRegPtr.ContextFlags & CONTEXT_EXTENDED_REGISTERS) + { + // IntelRegPtr.ExtendedRegisters = ; + } + + /* Return the address of the Intel Registers x86 Context */ + return &IntelRegPtr; } ULONG @@ -271,7 +331,7 @@ WINAPI setESP(ULONG Value) { - EmulatorSetStack(getSS(), Value); + Fast486SetStack(&EmulatorContext, getSS(), Value); } USHORT @@ -285,7 +345,7 @@ WINAPI setSP(USHORT Value) { - EmulatorSetStack(getSS(), Value); + Fast486SetStack(&EmulatorContext, getSS(), Value); } Copied: trunk/reactos/subsystems/ntvdm/cpu/registers.h (from r64477, trunk/reactos/subsystems/ntvdm/registers.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.h [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -10,8 +10,6 @@ #define _REGISTERS_H_ /* INCLUDES *******************************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset); #if 0 // Those function prototypes are already included via ddk/vddsvc.h Added: trunk/reactos/subsystems/ntvdm/cpu/x86context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/x86co… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/x86context.h (added) +++ trunk/reactos/subsystems/ntvdm/cpu/x86context.h [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -0,0 +1,139 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: x86context.h + * PURPOSE: x86 CPU Context Frame definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * + * NOTE: Taken from the PSDK. + */ + +#ifndef __X86CONTEXT_H__ +#define __X86CONTEXT_H__ + +#pragma once + +/* Clean everything that may have been defined before */ +#undef SIZE_OF_80387_REGISTERS +#undef MAXIMUM_SUPPORTED_EXTENSION +#undef CONTEXT_i386 +#undef CONTEXT_i486 +#undef CONTEXT_CONTROL +#undef CONTEXT_INTEGER +#undef CONTEXT_SEGMENTS +#undef CONTEXT_FLOATING_POINT +#undef CONTEXT_DEBUG_REGISTERS +#undef CONTEXT_EXTENDED_REGISTERS +#undef CONTEXT_FULL +#undef CONTEXT_ALL +#undef CONTEXT_DEBUGGER +#undef CONTEXT_XSTATE + + + +#define SIZE_OF_80387_REGISTERS 80 +#define MAXIMUM_SUPPORTED_EXTENSION 512 + +#define CONTEXT_i386 0x00010000 +#define CONTEXT_i486 0x00010000 + +#define CONTEXT_CONTROL (CONTEXT_i386|0x00000001L) // SS:SP, CS:IP, FLAGS, BP +#define CONTEXT_INTEGER (CONTEXT_i386|0x00000002L) // AX, BX, CX, DX, SI, DI +#define CONTEXT_SEGMENTS (CONTEXT_i386|0x00000004L) // DS, ES, FS, GS +#define CONTEXT_FLOATING_POINT (CONTEXT_i386|0x00000008L) // 387 state +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386|0x00000010L) // DB 0-3,6,7 +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L) // CPU-specific extensions + +#define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ + CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | \ + CONTEXT_EXTENDED_REGISTERS) + +#define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) +#define CONTEXT_XSTATE (CONTEXT_i386 | 0x00000040L) + + +typedef struct _X87FLOATING_SAVE_AREA +{ + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[SIZE_OF_80387_REGISTERS]; + ULONG Cr0NpxState; +} X87FLOATING_SAVE_AREA, *PX87FLOATING_SAVE_AREA; + +#include "pshpack4.h" +/* + * x86 CPU Context Frame + */ +typedef struct _X86CONTEXT +{ + /* + * The flags values within this flag control the contents of + * a CONTEXT record. + */ + ULONG ContextFlags; + + /* + * Section specified/returned if CONTEXT_DEBUG_REGISTERS + * is set in ContextFlags. + */ + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + + /* + * Section specified/returned if CONTEXT_FLOATING_POINT + * is set in ContextFlags. + */ + X87FLOATING_SAVE_AREA FloatSave; + + /* + * Section specified/returned if CONTEXT_SEGMENTS + * is set in ContextFlags. + */ + ULONG SegGs; + ULONG SegFs; + ULONG SegEs; + ULONG SegDs; + + /* + * Section specified/returned if CONTEXT_INTEGER + * is set in ContextFlags. + */ + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + + /* + * Section specified/returned if CONTEXT_CONTROL + * is set in ContextFlags. + */ + ULONG Ebp; + ULONG Eip; + ULONG SegCs; + ULONG EFlags; + ULONG Esp; + ULONG SegSs; + + /* + * Section specified/returned if CONTEXT_EXTENDED_REGISTERS + * is set in ContextFlags. The format and contexts are processor specific. + */ + UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; +} X86CONTEXT; +#include "poppack.h" + +#endif // __X86CONTEXT_H__ + +/* EOF */ Propchange: trunk/reactos/subsystems/ntvdm/cpu/x86context.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Oct 4 15:41:29 2014 @@ -19,7 +19,6 @@ #include "dos/dem.h" #include "bios/bios.h" -#include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -1057,8 +1056,8 @@ setES(Segment); /* Set the stack to the location from the header */ - EmulatorSetStack(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss, - Header->e_sp); + setSS(Segment + (sizeof(DOS_PSP) >> 4) + Header->e_ss); + setSP(Header->e_sp); /* Execute */ CurrentPsp = Segment; @@ -1111,7 +1110,8 @@ setES(Segment); /* Set the stack to the last word of the segment */ - EmulatorSetStack(Segment, 0xFFFE); + setSS(Segment); + setSP(0xFFFE); /* * Set the value on the stack to 0, so that a near return Removed: trunk/reactos/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/registers… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/registers.c (removed) @@ -1,645 +0,0 @@ -/* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: registers.c - * PURPOSE: Exported functions for manipulating registers - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -/* INCLUDES *******************************************************************/ - -#define NDEBUG - -#include "emulator.h" -#include "cpu/cpu.h" - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset) -{ - Fast486SetStack(&EmulatorContext, Segment, Offset); -} - - - -PVOID -WINAPI -getIntelRegistersPointer(VOID) -{ - UNIMPLEMENTED; - return NULL; -} - -ULONG -WINAPI -getEAX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; -} - -VOID -WINAPI -setEAX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Value; -} - -USHORT -WINAPI -getAX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord; -} - -VOID -WINAPI -setAX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowWord = Value; -} - -UCHAR -WINAPI -getAH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte; -} - -VOID -WINAPI -setAH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].HighByte = Value; -} - -UCHAR -WINAPI -getAL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte; -} - -VOID -WINAPI -setAL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EAX].LowByte = Value; -} - -ULONG -WINAPI -getEBX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; -} - -VOID -WINAPI -setEBX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Value; -} - -USHORT -WINAPI -getBX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord; -} - -VOID -WINAPI -setBX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowWord = Value; -} - -UCHAR -WINAPI -getBH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte; -} - -VOID -WINAPI -setBH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].HighByte = Value; -} - -UCHAR -WINAPI -getBL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte; -} - -VOID -WINAPI -setBL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBX].LowByte = Value; -} - - - -ULONG -WINAPI -getECX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; -} - -VOID -WINAPI -setECX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Value; -} - -USHORT -WINAPI -getCX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord; -} - -VOID -WINAPI -setCX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowWord = Value; -} - -UCHAR -WINAPI -getCH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte; -} - -VOID -WINAPI -setCH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].HighByte = Value; -} - -UCHAR -WINAPI -getCL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte; -} - -VOID -WINAPI -setCL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ECX].LowByte = Value; -} - - - -ULONG -WINAPI -getEDX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; -} - -VOID -WINAPI -setEDX(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Value; -} - -USHORT -WINAPI -getDX(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord; -} - -VOID -WINAPI -setDX(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowWord = Value; -} - -UCHAR -WINAPI -getDH(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte; -} - -VOID -WINAPI -setDH(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].HighByte = Value; -} - -UCHAR -WINAPI -getDL(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte; -} - -VOID -WINAPI -setDL(UCHAR Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDX].LowByte = Value; -} - - - -ULONG -WINAPI -getESP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESP].Long; -} - -VOID -WINAPI -setESP(ULONG Value) -{ - EmulatorSetStack(getSS(), Value); -} - -USHORT -WINAPI -getSP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESP].LowWord; -} - -VOID -WINAPI -setSP(USHORT Value) -{ - EmulatorSetStack(getSS(), Value); -} - - - -ULONG -WINAPI -getEBP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long; -} - -VOID -WINAPI -setEBP(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBP].Long = Value; -} - -USHORT -WINAPI -getBP(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord; -} - -VOID -WINAPI -setBP(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EBP].LowWord = Value; -} - - - -ULONG -WINAPI -getESI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; -} - -VOID -WINAPI -setESI(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Value; -} - -USHORT -WINAPI -getSI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord; -} - -VOID -WINAPI -setSI(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_ESI].LowWord = Value; -} - - - -ULONG -WINAPI -getEDI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; -} - -VOID -WINAPI -setEDI(ULONG Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Value; -} - -USHORT -WINAPI -getDI(VOID) -{ - return EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord; -} - -VOID -WINAPI -setDI(USHORT Value) -{ - EmulatorContext.GeneralRegs[FAST486_REG_EDI].LowWord = Value; -} - - - -ULONG -WINAPI -getEIP(VOID) -{ - return EmulatorContext.InstPtr.Long; -} - -VOID -WINAPI -setEIP(ULONG Value) -{ - CpuExecute(getCS(), Value); -} - -USHORT -WINAPI -getIP(VOID) -{ - return EmulatorContext.InstPtr.LowWord; -} - -VOID -WINAPI -setIP(USHORT Value) -{ - CpuExecute(getCS(), Value); -} - - - -USHORT -WINAPI -getCS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector; -} - -VOID -WINAPI -setCS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_CS, Value); -} - -USHORT -WINAPI -getSS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector; -} - -VOID -WINAPI -setSS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_SS, Value); -} - -USHORT -WINAPI -getDS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; -} - -VOID -WINAPI -setDS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_DS, Value); -} - -USHORT -WINAPI -getES(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; -} - -VOID -WINAPI -setES(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_ES, Value); -} - -USHORT -WINAPI -getFS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_FS].Selector; -} - -VOID -WINAPI -setFS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_FS, Value); -} - -USHORT -WINAPI -getGS(VOID) -{ - return EmulatorContext.SegmentRegs[FAST486_REG_GS].Selector; -} - -VOID -WINAPI -setGS(USHORT Value) -{ - Fast486SetSegment(&EmulatorContext, FAST486_REG_GS, Value); -} - - - -ULONG -WINAPI -getCF(VOID) -{ - return EmulatorContext.Flags.Cf; -} - -VOID -WINAPI -setCF(ULONG Flag) -{ - EmulatorContext.Flags.Cf = !!(Flag & 1); -} - -ULONG -WINAPI -getPF(VOID) -{ - return EmulatorContext.Flags.Pf; -} - -VOID -WINAPI -setPF(ULONG Flag) -{ - EmulatorContext.Flags.Pf = !!(Flag & 1); -} - -ULONG -WINAPI -getAF(VOID) -{ - return EmulatorContext.Flags.Af; -} - -VOID -WINAPI -setAF(ULONG Flag) -{ - EmulatorContext.Flags.Af = !!(Flag & 1); -} - -ULONG -WINAPI -getZF(VOID) -{ - return EmulatorContext.Flags.Zf; -} - -VOID -WINAPI -setZF(ULONG Flag) -{ - EmulatorContext.Flags.Zf = !!(Flag & 1); -} - -ULONG -WINAPI -getSF(VOID) -{ - return EmulatorContext.Flags.Sf; -} - -VOID -WINAPI -setSF(ULONG Flag) -{ - EmulatorContext.Flags.Sf = !!(Flag & 1); -} - -ULONG -WINAPI -getIF(VOID) -{ - return EmulatorContext.Flags.If; -} - -VOID -WINAPI -setIF(ULONG Flag) -{ - EmulatorContext.Flags.If = !!(Flag & 1); -} - -ULONG -WINAPI -getDF(VOID) -{ - return EmulatorContext.Flags.Df; -} - -VOID -WINAPI -setDF(ULONG Flag) -{ - EmulatorContext.Flags.Df = !!(Flag & 1); -} - -ULONG -WINAPI -getOF(VOID) -{ - return EmulatorContext.Flags.Of; -} - -VOID -WINAPI -setOF(ULONG Flag) -{ - EmulatorContext.Flags.Of = !!(Flag & 1); -} - - - -ULONG -WINAPI -getEFLAGS(VOID) -{ - return EmulatorContext.Flags.Long; -} - -VOID -WINAPI -setEFLAGS(ULONG Flags) -{ - EmulatorContext.Flags.Long = Flags; -} - - - -USHORT -WINAPI -getMSW(VOID) -{ - return LOWORD(EmulatorContext.ControlRegisters[FAST486_REG_CR0]); -} - -VOID -WINAPI -setMSW(USHORT Value) -{ - /* Set the lower 16 bits (Machine Status Word) of CR0 */ - EmulatorContext.ControlRegisters[FAST486_REG_CR0] &= 0xFFFF0000; - EmulatorContext.ControlRegisters[FAST486_REG_CR0] |= Value & 0xFFFF; -} - -/* EOF */ Removed: trunk/reactos/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/registers… ============================================================================== --- trunk/reactos/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/registers.h (removed) @@ -1,123 +0,0 @@ -/* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: registers.c - * PURPOSE: Exported functions for manipulating registers - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -#ifndef _REGISTERS_H_ -#define _REGISTERS_H_ - -/* INCLUDES *******************************************************************/ - -VOID EmulatorSetStack(WORD Segment, DWORD Offset); - -#if 0 // Those function prototypes are already included via ddk/vddsvc.h - -PVOID WINAPI getIntelRegistersPointer(VOID); - -ULONG WINAPI getEAX(VOID); -VOID WINAPI setEAX(ULONG); -USHORT WINAPI getAX(VOID); -VOID WINAPI setAX(USHORT); -UCHAR WINAPI getAH(VOID); -VOID WINAPI setAH(UCHAR); -UCHAR WINAPI getAL(VOID); -VOID WINAPI setAL(UCHAR); - -ULONG WINAPI getEBX(VOID); -VOID WINAPI setEBX(ULONG); -USHORT WINAPI getBX(VOID); -VOID WINAPI setBX(USHORT); -UCHAR WINAPI getBH(VOID); -VOID WINAPI setBH(UCHAR); -UCHAR WINAPI getBL(VOID); -VOID WINAPI setBL(UCHAR); - -ULONG WINAPI getECX(VOID); -VOID WINAPI setECX(ULONG); -USHORT WINAPI getCX(VOID); -VOID WINAPI setCX(USHORT); -UCHAR WINAPI getCH(VOID); -VOID WINAPI setCH(UCHAR); -UCHAR WINAPI getCL(VOID); -VOID WINAPI setCL(UCHAR); - -ULONG WINAPI getEDX(VOID); -VOID WINAPI setEDX(ULONG); -USHORT WINAPI getDX(VOID); -VOID WINAPI setDX(USHORT); -UCHAR WINAPI getDH(VOID); -VOID WINAPI setDH(UCHAR); -UCHAR WINAPI getDL(VOID); -VOID WINAPI setDL(UCHAR); - - - -ULONG WINAPI getESP(VOID); -VOID WINAPI setESP(ULONG); -USHORT WINAPI getSP(VOID); -VOID WINAPI setSP(USHORT); - -ULONG WINAPI getEBP(VOID); -VOID WINAPI setEBP(ULONG); -USHORT WINAPI getBP(VOID); -VOID WINAPI setBP(USHORT); - -ULONG WINAPI getESI(VOID); -VOID WINAPI setESI(ULONG); -USHORT WINAPI getSI(VOID); -VOID WINAPI setSI(USHORT); - -ULONG WINAPI getEDI(VOID); -VOID WINAPI setEDI(ULONG); -USHORT WINAPI getDI(VOID); -VOID WINAPI setDI(USHORT); - -ULONG WINAPI getEIP(VOID); -VOID WINAPI setEIP(ULONG); -USHORT WINAPI getIP(VOID); -VOID WINAPI setIP(USHORT); - -USHORT WINAPI getCS(VOID); -VOID WINAPI setCS(USHORT); -USHORT WINAPI getSS(VOID); -VOID WINAPI setSS(USHORT); -USHORT WINAPI getDS(VOID); -VOID WINAPI setDS(USHORT); -USHORT WINAPI getES(VOID); -VOID WINAPI setES(USHORT); -USHORT WINAPI getFS(VOID); -VOID WINAPI setFS(USHORT); -USHORT WINAPI getGS(VOID); -VOID WINAPI setGS(USHORT); - -ULONG WINAPI getCF(VOID); -VOID WINAPI setCF(ULONG); -ULONG WINAPI getPF(VOID); -VOID WINAPI setPF(ULONG); -ULONG WINAPI getAF(VOID); -VOID WINAPI setAF(ULONG); -ULONG WINAPI getZF(VOID); -VOID WINAPI setZF(ULONG); -ULONG WINAPI getSF(VOID); -VOID WINAPI setSF(ULONG); -ULONG WINAPI getIF(VOID); -VOID WINAPI setIF(ULONG); -ULONG WINAPI getDF(VOID); -VOID WINAPI setDF(ULONG); -ULONG WINAPI getOF(VOID); -VOID WINAPI setOF(ULONG); - -ULONG WINAPI getEFLAGS(VOID); -VOID WINAPI setEFLAGS(ULONG); - -USHORT WINAPI getMSW(VOID); -VOID WINAPI setMSW(USHORT); - -#endif - -#endif // _REGISTERS_H_ - -/* EOF */

9 years, 11 months

[hbelusca] 64522: [PSDK/XDK]: Don't hardcode "80" in the CONTEXT structure, but use the correct define.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 4 14:40:59 2014 New Revision: 64522 URL: http://svn.reactos.org/svn/reactos?rev=64522&view=rev Log: [PSDK/XDK]: Don't hardcode "80" in the CONTEXT structure, but use the correct define. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 4 14:40:59 2014 @@ -2974,7 +2974,7 @@ DWORD ErrorSelector; DWORD DataOffset; DWORD DataSelector; - BYTE RegisterArea[80]; + BYTE RegisterArea[SIZE_OF_80387_REGISTERS]; DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat Oct 4 14:40:59 2014 @@ -1623,7 +1623,7 @@ DWORD ErrorSelector; DWORD DataOffset; DWORD DataSelector; - BYTE RegisterArea[80]; + BYTE RegisterArea[SIZE_OF_80387_REGISTERS]; DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;

9 years, 11 months

[hbelusca] 64521: [NTVDM] - Move almost all the DOS command launch thread into dem.c, - Rework the code so that now, when we want to either load our BIOS32 or a custom one, we start their execution...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 4 13:36:17 2014 New Revision: 64521 URL: http://svn.reactos.org/svn/reactos?rev=64521&view=rev Log: [NTVDM] - Move almost all the DOS command launch thread into dem.c, - Rework the code so that now, when we want to either load our BIOS32 or a custom one, we start their execution at F000:FFF0 as it should be, - For modularity purposes (ie. to be able one day to load real OSes in our ntvdm), implement INT 19h (bootstrap loader) so that it calls a (temporary) dos bootsector loader that writes some bootstrap code at 0000:7c00, then the INT 19h runs this code, that has as an effect to load our DOS32 (for a real OS, the MBR code goes to 0000:7c00 and is then run). Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/dos/dem.h trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -25,7 +25,7 @@ /* DEFINES ********************************************************************/ /* BOP Identifiers */ -#define BOP_BIOSINIT 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 +#define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 // to let the virtual machine initialize itself // the IVT and its hardware. #define BOP_EQUIPLIST 0x11 @@ -35,83 +35,10 @@ static BOOLEAN Bios32Loaded = FALSE; -static CALLBACK16 __BiosContext; PBIOS_DATA_AREA Bda; PBIOS_CONFIG_TABLE Bct; /* PRIVATE FUNCTIONS **********************************************************/ - -static VOID WINAPI BiosInitBop(LPWORD Stack) -{ - BOOLEAN Success; - - /* Load the second part of the Windows NTVDM BIOS image */ - LPCSTR BiosFileName = "bios1.rom"; - PVOID BiosLocation = (PVOID)TO_LINEAR(BIOS_SEGMENT, 0x0000); - DWORD BiosSize = 0; - - /* Disable interrupts */ - setIF(0); - - DisplayMessage(L"You are loading Windows NTVDM BIOS!\n"); - - /* Initialize a private callback context */ - InitializeContext(&__BiosContext, BIOS_SEGMENT, 0x0000); - - Success = LoadRom(BiosFileName, BiosLocation, &BiosSize); - DPRINT1("BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - if (Success == FALSE) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - - // DisplayMessage(L"First bytes at 0x%p: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" - // L"3 last bytes at 0x%p: 0x%02x 0x%02x 0x%02x", - // BiosLocation, - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 0), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 1), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 3), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 4), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 5), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 6), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 7), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 8), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + 9), - - // (PVOID)((ULONG_PTR)BiosLocation + BiosSize - 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 2), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 1), - // *(PCHAR)((ULONG_PTR)REAL_TO_PHYS(BiosLocation) + BiosSize - 0)); - - /* Initialize IVT and hardware */ - - /* Initialize the Keyboard and Video BIOS */ - if (!KbdBiosInitialize() || !VidBiosInitialize()) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - - /* Load VGA BIOS */ - // Success = LoadRom("v7vga.rom", (PVOID)0xC0000, &BiosSize); - // DPRINT1("VGA BIOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - /* Enable interrupts */ - setIF(1); - - ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// - - /* Load some ROMs */ - // Success = LoadRom("boot.bin", (PVOID)0xE0000, &BiosSize); - // DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - SearchAndInitRoms(&__BiosContext); -} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -140,12 +67,14 @@ // The BCT is found at F000:E6F5 for 100% compatible BIOSes. Bct = (PBIOS_CONFIG_TABLE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0xE6F5); - /* Register the BIOS support BOPs */ - RegisterBop(BOP_BIOSINIT , BiosInitBop); - RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); - RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); + /**** HACK! HACK! for Windows NTVDM BIOS ****/ + // WinNtVdmBiosSupportInitialize(); - if (BiosFileName) + // /* Register the BIOS support BOPs */ + // RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); + // RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); + + if (BiosFileName && BiosFileName[0] != '\0') { PVOID BiosLocation = NULL; DWORD BiosSize = 0; @@ -199,8 +128,8 @@ Success = Bios32Loaded = Bios32Initialize(); } - /* Enable interrupts */ - setIF(1); + // /* Enable interrupts */ + // setIF(1); return Success; } Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -16,6 +16,16 @@ #include "vidbios.h" /* DEFINES ********************************************************************/ + +/* BOP Identifiers */ +#define BOP_RESET 0x00 // Windows NTVDM (SoftPC) BIOS calls BOP 0x00 + // to let the virtual machine initialize itself + // the IVT and its hardware. +#define BOP_EQUIPLIST 0x11 +#define BOP_GETMEMSIZE 0x12 + + + #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -15,8 +15,8 @@ #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF +#include "cpu/bop.h" #include "int32.h" -// #include "bop.h" #include "../bios.h" #include "../rom.h" @@ -129,7 +129,8 @@ */ static BYTE PostCode[] = { - 0xCD, 0x19, // int 0x19, the bootstrap loader interrupt + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET, // Call BIOS POST + 0xCD, 0x19, // INT 0x19, the bootstrap loader interrupt // LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; @@ -278,16 +279,25 @@ return; } + +VOID DosBootsectorInitialize(VOID); + static VOID WINAPI BiosBootstrapLoader(LPWORD Stack) { /* - * In real bioses one loads the bootsector read from a diskette - * or from a disk, to 0000:7C00 and then one runs it. + * In real BIOSes one loads the bootsector read from a diskette + * or from a disk, copy it to 0000:7C00 and then boot it. * Since we are 32-bit VM and we hardcode our DOS at the moment, * just call the DOS 32-bit initialization code. */ DPRINT1("BiosBootstrapLoader -->\n"); + + /* Load DOS */ + DosBootsectorInitialize(); + /* Position CPU to 0000:7C00 to boot the OS */ + setCS(0x0000); + setIP(0x7C00); DPRINT1("<-- BiosBootstrapLoader\n"); } @@ -510,6 +520,25 @@ ((PULONG)BaseAddress)[0x49] = (ULONG)NULL; } +static VOID InitializeBiosData(VOID) +{ + UCHAR Low, High; + + /* Initialize the BDA contents */ + RtlZeroMemory(Bda, sizeof(*Bda)); + Bda->EquipmentList = BIOS_EQUIPMENT_LIST; + + /* + * Retrieve the conventional memory size + * in kB from CMOS, typically 640 kB. + */ + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW); + Low = IOReadB(CMOS_DATA_PORT); + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); + High = IOReadB(CMOS_DATA_PORT); + Bda->MemorySize = MAKEWORD(Low, High); +} + static VOID InitializeBiosInfo(VOID) { RtlZeroMemory(Bct, sizeof(*Bct)); @@ -525,45 +554,17 @@ Bct->Feature[4] = 0x00; } -static VOID InitializeBiosData(VOID) -{ - UCHAR Low, High; - - /* System BIOS Copyright */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); - - /* System BIOS Version */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); // FIXME: or E061, or E100 ?? - - /* System BIOS Date */ - RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); - - /* System BIOS Model (same as Bct->Model) */ - *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; - - /* Initialize the BDA contents */ - RtlZeroMemory(Bda, sizeof(*Bda)); - Bda->EquipmentList = BIOS_EQUIPMENT_LIST; - - /* - * Retrieve the conventional memory size - * in kB from CMOS, typically 640 kB. - */ - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_LOW); - Low = IOReadB(CMOS_DATA_PORT); - IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_BASE_MEMORY_HIGH); - High = IOReadB(CMOS_DATA_PORT); - Bda->MemorySize = MAKEWORD(Low, High); -} - -/* PUBLIC FUNCTIONS ***********************************************************/ + /* * The BIOS POST (Power On-Self Test) */ -BOOLEAN Bios32Initialize(VOID) +VOID +Bios32Post(VOID) { BOOLEAN Success; + + DPRINT1("Bios32Post\n"); /* Initialize the stack */ // That's what says IBM... (stack at 30:00FF going downwards) @@ -587,7 +588,13 @@ /* Initialize the Keyboard, Video and Mouse BIOS */ if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) - return FALSE; + { + // return FALSE; + + /* Stop the VDM */ + EmulatorTerminate(); + return; + } ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// @@ -597,10 +604,70 @@ SearchAndInitRoms(&BiosContext); + /* + * End of the 32-bit POST portion. We then fall back into 16-bit where + * the rest of the POST code is executed, typically calling INT 19h + * to boot up the OS. + */ +} + +static VOID WINAPI Bios32ResetBop(LPWORD Stack) +{ + DPRINT1("Bios32ResetBop\n"); + + /* Disable interrupts */ + setIF(0); + + // FIXME: Check the word at 0040h:0072h and do one of the following actions: + // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); + // - if the word is 0000h, perform a cold reboot (aka. Reset). + + /* Initialize IVT and hardware */ + + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBiosInitialize() || !VidBiosInitialize()) + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } + + /* Do the POST */ + Bios32Post(); + + /* Enable interrupts */ + setIF(1); +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN Bios32Initialize(VOID) +{ + /* + * Initialize BIOS32 static data + */ + /* Bootstrap code */ RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE05B), PostCode , sizeof(PostCode )); RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF0), Bootstrap, sizeof(Bootstrap)); + /* System BIOS Copyright */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); + + /* System BIOS Version */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); + // FIXME: or E061, or E100 ?? + + /* System BIOS Date */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); + + /* System BIOS Model (same as Bct->Model) */ + *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; + + /* Redefine our POST function */ + RegisterBop(BOP_RESET, Bios32ResetBop); + /* We are done */ return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -33,8 +33,10 @@ /* DEFINES ********************************************************************/ /* BOP Identifiers */ -#define BOP_DOS 0x50 // DOS System BOP (for NTIO.SYS and NTDOS.SYS) -#define BOP_CMD 0x54 // DOS Command Interpreter BOP (for COMMAND.COM) +#define BOP_LOAD_DOS 0x2B // DOS Loading and Initializing BOP. In parameter (following bytes) we take a NULL-terminated string indicating the name of the DOS kernel file. +#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) /* PRIVATE FUNCTIONS **********************************************************/ @@ -185,17 +187,157 @@ } } +#ifndef STANDALONE +static DWORD +WINAPI +CommandThreadProc(LPVOID Parameter) +{ + BOOLEAN First = TRUE; + DWORD Result; + VDM_COMMAND_INFO CommandInfo; + CHAR CmdLine[MAX_PATH]; + CHAR AppName[MAX_PATH]; + CHAR PifFile[MAX_PATH]; + CHAR Desktop[MAX_PATH]; + CHAR Title[MAX_PATH]; + ULONG EnvSize = 256; + PVOID Env = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + + UNREFERENCED_PARAMETER(Parameter); + ASSERT(Env != NULL); + + do + { + /* Clear the structure */ + ZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Initialize the structure members */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_FLAG_DOS; + CommandInfo.CmdLine = CmdLine; + CommandInfo.CmdLen = sizeof(CmdLine); + CommandInfo.AppName = AppName; + CommandInfo.AppLen = sizeof(AppName); + CommandInfo.PifFile = PifFile; + CommandInfo.PifLen = sizeof(PifFile); + CommandInfo.Desktop = Desktop; + CommandInfo.DesktopLen = sizeof(Desktop); + CommandInfo.Title = Title; + CommandInfo.TitleLen = sizeof(Title); + CommandInfo.Env = Env; + CommandInfo.EnvLen = EnvSize; + + if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; + +Command: + if (!GetNextVDMCommand(&CommandInfo)) + { + if (CommandInfo.EnvLen > EnvSize) + { + /* Expand the environment size */ + EnvSize = CommandInfo.EnvLen; + Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); + + /* Repeat the request */ + goto Command; + } + + break; + } + + /* Start the process from the command line */ + DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); + Result = DosStartProcess(AppName, CmdLine, Env); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); + // break; + continue; + } + + First = FALSE; + } + while (AcceptCommands); + + HeapFree(GetProcessHeap(), 0, Env); + return 0; +} +#endif + /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN DosInitialize(IN LPCSTR DosKernelFileName) -{ +// +// This function (equivalent of the DOS bootsector) is called by the bootstrap +// loader *BEFORE* jumping at 0000:7C00. What we should do is to write at 0000:7C00 +// a BOP call that calls DosInitialize back. Then the bootstrap loader jumps at +// 0000:7C00, our BOP gets called and then we can initialize the 32-bit part of the DOS. +// + +/* 16-bit bootstrap code at 0000:7C00 */ +/* Of course, this is not in real bootsector format, because we don't care */ +static BYTE Bootsector1[] = +{ + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_LOAD_DOS, // Call DOS Loading +}; +/* This portion of code is run if we failed to load the DOS */ +static BYTE Bootsector2[] = +{ + 0xEA, // jmp far ptr + 0x5B, 0xE0, 0x00, 0xF0, // F000:E05B /** HACK! What to do instead?? **/ +}; + +static VOID WINAPI DosInitialize(LPWORD Stack); + +VOID DosBootsectorInitialize(VOID) +{ + /* We write the bootsector at 0000:7C00 */ + ULONG_PTR Address = (ULONG_PTR)SEG_OFF_TO_PTR(0x0000, 0x7C00); + CHAR DosKernelFileName[] = ""; // No DOS file name, therefore we'll load DOS32 + + DPRINT1("DosBootsectorInitialize\n"); + + /* Write the "bootsector" */ + RtlCopyMemory((PVOID)Address, Bootsector1, sizeof(Bootsector1)); + Address += sizeof(Bootsector1); + RtlCopyMemory((PVOID)Address, DosKernelFileName, sizeof(DosKernelFileName)); + Address += sizeof(DosKernelFileName); + RtlCopyMemory((PVOID)Address, Bootsector2, sizeof(Bootsector2)); + + /* Register the DOS Loading BOP */ + RegisterBop(BOP_LOAD_DOS, DosInitialize); +} + + +// +// This function is called by the DOS bootsector. We finish to load +// the DOS, then we jump to 0070:0000. +// + +/* 16-bit startup code at 0070:0000 */ +static BYTE Startup[] = +{ + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_START_DOS, // Call DOS Start +}; + +static VOID WINAPI DosStart(LPWORD Stack); + +static VOID WINAPI DosInitialize(LPWORD Stack) +{ + BOOLEAN Success = FALSE; + + /* Get the DOS kernel file name (NULL-terminated) */ + // FIXME: Isn't it possible to use some DS:SI instead?? + LPCSTR DosKernelFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); + setIP(getIP() + strlen(DosKernelFileName) + 1); // Skip it + + DPRINT1("DosInitialize('%s')\n", DosKernelFileName); + /* Register the DOS BOPs */ RegisterBop(BOP_DOS, DosSystemBop ); RegisterBop(BOP_CMD, DosCmdInterpreterBop); - if (DosKernelFileName) - { - BOOLEAN Success; + if (DosKernelFileName && DosKernelFileName[0] != '\0') + { HANDLE hDosBios; ULONG ulDosBiosSize = 0; @@ -203,7 +345,7 @@ hDosBios = FileOpen(DosKernelFileName, &ulDosBiosSize); /* If we failed, bail out */ - if (hDosBios == NULL) return FALSE; + if (hDosBios == NULL) goto QuitCustom; /* Attempt to load the DOS BIOS into memory */ Success = FileLoadByHandle(hDosBios, @@ -220,26 +362,121 @@ /* Close the DOS BIOS file */ FileClose(hDosBios); - if (Success) - { - /* Position execution pointers and return */ - setCS(0x0070); - setIP(0x0000); - } - - return Success; + if (!Success) goto QuitCustom; + + /* Position execution pointers and return */ + setCS(0x0070); + setIP(0x0000); + + /* Return control */ +QuitCustom: + if (!Success) + DisplayMessage(L"Custom DOS '%S' loading failed, what to do??", DosKernelFileName); } else { - BOOLEAN Result; - - Result = DosBIOSInitialize(); - DosMouseInitialize(); // FIXME: Should be done by the DOS BIOS - // Result &= DosKRNLInitialize(); - - return Result; - } -} + Success = DosBIOSInitialize(); + // Success &= DosKRNLInitialize(); + + if (!Success) goto Quit32; + + /* Write the "bootsector" */ + RtlCopyMemory(SEG_OFF_TO_PTR(0x0070, 0x0000), Startup, sizeof(Startup)); + + /* Register the DOS Starting BOP */ + RegisterBop(BOP_START_DOS, DosStart); + + /* Position execution pointers and return */ + setCS(0x0070); + setIP(0x0000); + + /* Return control */ +Quit32: + if (!Success) + DisplayMessage(L"DOS32 loading failed, what to do??"); + } + + if (Success) + { + /* + * We succeeded, deregister the DOS Loading BOP + * so that no app will be able to call us back. + */ + RegisterBop(BOP_LOAD_DOS, NULL); + } +} + +static VOID WINAPI DosStart(LPWORD Stack) +{ +#ifdef STANDALONE + DWORD Result; + CHAR ApplicationName[MAX_PATH]; + CHAR CommandLine[DOS_CMDLINE_LENGTH]; +#endif + + DPRINT1("DosStart\n"); + + /* + * We succeeded, deregister the DOS Starting BOP + * so that no app will be able to call us back. + */ + RegisterBop(BOP_START_DOS, NULL); + + /* Load the mouse driver */ + DosMouseInitialize(); + +#ifndef STANDALONE + + /* Create the GetNextVDMCommand thread */ + CommandThread = CreateThread(NULL, 0, &CommandThreadProc, NULL, 0, NULL); + if (CommandThread == NULL) + { + wprintf(L"FATAL: Failed to create the command processing thread: %d\n", GetLastError()); + goto Quit; + } + + /* Wait for the command thread to exit */ + WaitForSingleObject(CommandThread, INFINITE); + + /* Close the thread handle */ + CloseHandle(CommandThread); + +#else + + if (NtVdmArgc >= 2) + { + WideCharToMultiByte(CP_ACP, 0, NtVdmArgv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); + + if (NtVdmArgc >= 3) + WideCharToMultiByte(CP_ACP, 0, NtVdmArgv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); + else + strcpy(CommandLine, ""); + } + else + { + DisplayMessage(L"Invalid DOS command line\n"); + goto Quit; + } + + /* Start the process from the command line */ + DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); + Result = DosStartProcess(ApplicationName, + CommandLine, + GetEnvironmentStrings()); + if (Result != ERROR_SUCCESS) + { + DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); + goto Quit; + } + +#endif + +Quit: + /* Stop the VDM */ + EmulatorTerminate(); +} + + /* PUBLIC EXPORTED APIS *******************************************************/ Modified: trunk/reactos/subsystems/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.h… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.h [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -19,8 +19,6 @@ #include "dos32krnl/dos.h" /* FUNCTIONS ******************************************************************/ - -BOOLEAN DosInitialize(IN LPCSTR DosKernelFileNames); DWORD WINAPI Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -12,6 +12,7 @@ #include "ntvdm.h" #include "emulator.h" +#include "cpu/cpu.h" #include "clock.h" #include "hardware/ps2.h" @@ -26,18 +27,24 @@ static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; -static BOOLEAN AcceptCommands = TRUE; -static HANDLE CommandThread = NULL; + +// For DOS +#ifndef STANDALONE +BOOLEAN AcceptCommands = TRUE; +HANDLE CommandThread = NULL; +ULONG SessionId = 0; +#endif + +HANDLE VdmTaskEvent = NULL; + +// Command line of NTVDM +INT NtVdmArgc; +WCHAR** NtVdmArgv; + static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; static BOOLEAN ShowPointer = FALSE; - -#ifndef STANDALONE -ULONG SessionId = 0; -#endif - -HANDLE VdmTaskEvent = NULL; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -198,6 +205,7 @@ case CTRL_BREAK_EVENT: { /* Call INT 23h */ + DPRINT1("Ctrl-C/Break: Call INT 23h\n"); EmulatorInterrupt(0x23); break; } @@ -206,14 +214,18 @@ if (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) { /* Exit immediately */ +#ifndef STANDALONE if (CommandThread) TerminateThread(CommandThread, 0); +#endif EmulatorTerminate(); } +#ifndef STANDALONE else { /* Stop accepting new commands */ AcceptCommands = FALSE; } +#endif break; } @@ -361,100 +373,12 @@ DPRINT1("Focus events not handled\n"); } -#ifndef STANDALONE -static DWORD -WINAPI -CommandThreadProc(LPVOID Parameter) -{ - BOOLEAN First = TRUE; - DWORD Result; - VDM_COMMAND_INFO CommandInfo; - CHAR CmdLine[MAX_PATH]; - CHAR AppName[MAX_PATH]; - CHAR PifFile[MAX_PATH]; - CHAR Desktop[MAX_PATH]; - CHAR Title[MAX_PATH]; - ULONG EnvSize = 256; - PVOID Env = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); - - UNREFERENCED_PARAMETER(Parameter); - ASSERT(Env != NULL); - - do - { - /* Clear the structure */ - ZeroMemory(&CommandInfo, sizeof(CommandInfo)); - - /* Initialize the structure members */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_FLAG_DOS; - CommandInfo.CmdLine = CmdLine; - CommandInfo.CmdLen = sizeof(CmdLine); - CommandInfo.AppName = AppName; - CommandInfo.AppLen = sizeof(AppName); - CommandInfo.PifFile = PifFile; - CommandInfo.PifLen = sizeof(PifFile); - CommandInfo.Desktop = Desktop; - CommandInfo.DesktopLen = sizeof(Desktop); - CommandInfo.Title = Title; - CommandInfo.TitleLen = sizeof(Title); - CommandInfo.Env = Env; - CommandInfo.EnvLen = EnvSize; - - if (First) CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; - -Command: - if (!GetNextVDMCommand(&CommandInfo)) - { - if (CommandInfo.EnvLen > EnvSize) - { - /* Expand the environment size */ - EnvSize = CommandInfo.EnvLen; - Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); - - /* Repeat the request */ - goto Command; - } - - break; - } - - /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); - Result = DosStartProcess(AppName, CmdLine, Env); - if (Result != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'. Error: %u", AppName, Result); - // break; - continue; - } - - First = FALSE; - } - while (AcceptCommands); - - HeapFree(GetProcessHeap(), 0, Env); - return 0; -} -#endif - INT wmain(INT argc, WCHAR *argv[]) { #ifdef STANDALONE - DWORD Result; - CHAR ApplicationName[MAX_PATH]; - CHAR CommandLine[DOS_CMDLINE_LENGTH]; - - if (argc >= 2) - { - WideCharToMultiByte(CP_ACP, 0, argv[1], -1, ApplicationName, sizeof(ApplicationName), NULL, NULL); - - if (argc >= 3) WideCharToMultiByte(CP_ACP, 0, argv[2], -1, CommandLine, sizeof(CommandLine), NULL, NULL); - else strcpy(CommandLine, ""); - } - else + if (argc < 2) { wprintf(L"\nReactOS Virtual DOS Machine\n\n" L"Usage: NTVDM <executable> [<parameters>]\n"); @@ -481,6 +405,9 @@ #endif + NtVdmArgc = argc; + NtVdmArgv = argv; + DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); /* Create the task event */ @@ -508,43 +435,8 @@ goto Cleanup; } - /* Initialize the VDM DOS kernel */ - if (!DosInitialize(NULL)) - { - wprintf(L"FATAL: Failed to initialize the VDM DOS kernel.\n"); - goto Cleanup; - } - -#ifndef STANDALONE - - /* Create the GetNextVDMCommand thread */ - CommandThread = CreateThread(NULL, 0, &CommandThreadProc, NULL, 0, NULL); - if (CommandThread == NULL) - { - wprintf(L"FATAL: Failed to create the command processing thread: %d\n", GetLastError()); - goto Cleanup; - } - - /* Wait for the command thread to exit */ - WaitForSingleObject(CommandThread, INFINITE); - - /* Close the thread handle */ - CloseHandle(CommandThread); - -#else - - /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); - Result = DosStartProcess(ApplicationName, - CommandLine, - GetEnvironmentStrings()); - if (Result != ERROR_SUCCESS) - { - DisplayMessage(L"Could not start '%S'. Error: %u", ApplicationName, Result); - goto Cleanup; - } - -#endif + /* Let's go! Start simulation */ + CpuSimulate(); Cleanup: BiosCleanup(); Modified: trunk/reactos/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.h?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 4 13:36:17 2014 @@ -41,10 +41,17 @@ /* FUNCTIONS ******************************************************************/ #ifndef STANDALONE +extern BOOLEAN AcceptCommands; +extern HANDLE CommandThread; extern ULONG SessionId; #endif extern HANDLE VdmTaskEvent; + +// Command line of NTVDM +extern INT NtVdmArgc; +extern WCHAR** NtVdmArgv; + /* * Interface functions

9 years, 11 months

← Newer
1
...
61
62
63
64
65
66
67
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014