Revert "boot fixes"

This reverts commit 7773056.

Author: DistroHopper39B

boot/bootdata/hybridcd.ini

@@ -7,13 +7,31 @@ TitleText=ReactOS Hybrid-CD
 MinimalUI=Yes
 
 [Operating Systems]
+Setup="Setup"
+Setup_Debug="Setup (Debug)"
+Setup_Screen="Setup (Screen)"
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
 LiveCD_Screen="LiveCD (Screen)"
+LiveCD_LogFile="LiveCD (Log file)"
 LiveCD_RamDisk="LiveCD in RAM"
 LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)"
 LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
 
+[Setup]
+BootType=ReactOSSetup
+SystemPath=\bootcd
+
+[Setup_Debug]
+BootType=ReactOSSetup
+SystemPath=\bootcd
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE
+
+[Setup_Screen]
+BootType=ReactOSSetup
+SystemPath=\bootcd
+Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE
+
 [LiveCD]
 BootType=Windows2003
 SystemPath=\livecd\reactos
@@ -29,6 +47,11 @@ BootType=Windows2003
 SystemPath=\livecd\reactos
 Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
 
+[LiveCD_LogFile]
+BootType=Windows2003
+SystemPath=\livecd\reactos
+Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT
+
 [LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos

boot/freeldr/freeldr/arch/uefi/uefivid.c

@@ -43,7 +43,7 @@ UefiInitializeVideo(VOID)
     }
 
     /* We don't need high resolutions for freeldr */
-   // gop->SetMode(gop, LOWEST_SUPPORTED_RES);
+    gop->SetMode(gop, LOWEST_SUPPORTED_RES);
 
     framebufferData.BaseAddress        = (ULONG_PTR)gop->Mode->FrameBufferBase;
     framebufferData.BufferSize         = gop->Mode->FrameBufferSize;

hal/halx86/generic/bios.c

@@ -61,7 +61,14 @@ BOOLEAN
 FASTCALL
 HalpOpcodeInvalid(IN PHAL_BIOS_FRAME BiosFrame)
 {
-
+    PUCHAR Inst = (PUCHAR)(BiosFrame->CsBase + BiosFrame->Eip);
+
+    /* Print error message */
+    DPRINT("HAL: An invalid V86 opcode was encountered at address %X:%X\n"
+            "Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
+            BiosFrame->SegCs, BiosFrame->Eip,
+            Inst[0], Inst[1], Inst[2], Inst[3], Inst[4],
+            Inst[5], Inst[6], Inst[7], Inst[8], Inst[9]);
 
     /* Break */
    // DbgBreakPoint();

modules/CMakeLists.txt

@@ -50,7 +50,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/)
     endforeach(item)
 endif()
 
-
 # Add font file DroidSansFallback.ttf for LiveCD
 # See also boot/bootdata/packages/reactos.dff.in
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/optional/DroidSansFallback.ttf)

modules/drivers/vgapnp.sys

@@ -12,6 +12,6 @@ target_link_libraries(vgapnp libcntpr)
 
 # pc98vid takes place of vga service on PC-98 platform
 if(NOT SARCH STREQUAL "pc98")
-    #add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all)
+    add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all)
     add_registry_inf(vbemp_reg.inf)
 endif()

win32ss/drivers/miniport/vbe/CMakeLists.txt

@@ -8,5 +8,5 @@ add_library(vga MODULE ${SOURCE} vgamp.rc)
 set_module_type(vga kernelmodedriver)
 add_importlibs(vga videoprt)
 add_pch(vga vgamp.h SOURCE)
-#add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
+add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
 add_registry_inf(vga_reg.inf)