Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 01/01: [XBOXVMP] Fix broken pixels and general refactoring (#1896)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3301df570948549b9c4c… commit b3301df570948549b9c4cca2c969384c59a69209 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 8 18:08:44 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 17:08:44 2019 +0200 [XBOXVMP] Fix broken pixels and general refactoring (#1896) - Remove old hacky code based on MmHighestPhysicalPage. - Split I2C SMBus code into a separate source file. CORE-16216 CORE-16357 --- win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 10 +- win32ss/drivers/miniport/xboxvmp/xboxi2c.c | 123 +++++++++++++ win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 233 +++++++----------------- win32ss/drivers/miniport/xboxvmp/xboxvmp.h | 36 +--- 4 files changed, 203 insertions(+), 199 deletions(-) diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt index d5f9f1332af..59941c74349 100644 --- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt +++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt @@ -1,5 +1,13 @@ -add_library(xboxvmp MODULE xboxvmp.c xboxvmp.rc) +list(APPEND SOURCE + xboxi2c.c + xboxvmp.c + xboxvmp.h) + +add_library(xboxvmp MODULE + ${SOURCE} + xboxvmp.rc) + set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxi2c.c b/win32ss/drivers/miniport/xboxvmp/xboxi2c.c new file mode 100644 index 00000000000..fc283af7e98 --- /dev/null +++ b/win32ss/drivers/miniport/xboxvmp/xboxi2c.c @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS Xbox miniport video driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: I2C SMBus routines + * COPYRIGHT: Copyright 2004 Gé van Geldorp + * Copyright 2004 Filip Navara + * Copyright 2019 Stanislav Motylkov (x86corez(a)gmail.com) + */ + +/* INCLUDES *******************************************************************/ + +#include "xboxvmp.h" + +#include <debug.h> +#include <dpfilter.h> + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +static +BOOLEAN +ReadfromSMBus( + UCHAR Address, + UCHAR bRegister, + UCHAR Size, + ULONG *Data_to_smbus) +{ + int nRetriesToLive = 50; + + while ((VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800) != 0) + { + ; /* Franz's spin while bus busy with any master traffic */ + } + + while (nRetriesToLive-- != 0) + { + UCHAR b; + int temp; + + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 8), bRegister); + + temp = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)); + VideoPortWritePortUshort((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ + + switch (Size) + { + case 4: + { + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ + break; + } + + case 2: + { + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ + break; + } + + default: + { + VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0a); /* BYTE */ + } + } + + b = 0; + + while ((b & 0x36) == 0) + { + b = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 0)); + } + + if ((b & 0x24) != 0) + { + ERR_(IHVVIDEO, "I2CTransmitByteGetReturn error %x\n", b); + } + + if ((b & 0x10) == 0) + { + ERR_(IHVVIDEO, "I2CTransmitByteGetReturn no complete, retry\n"); + } + else + { + switch (Size) + { + case 4: + { + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); + break; + } + + case 2: + { + *Data_to_smbus = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 6)); + break; + } + + default: + { + *Data_to_smbus = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); + } + } + + return TRUE; + } + } + + return FALSE; +} + +BOOLEAN +I2CTransmitByteGetReturn( + UCHAR bPicAddressI2cFormat, + UCHAR bDataToWrite, + ULONG *Return) +{ + return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); +} + +/* EOF */ diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c index ee6c7fd2e25..5d6fc275dac 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c @@ -389,28 +389,22 @@ XboxVmpMapVideoMemory( { PHYSICAL_ADDRESS FrameBuffer; ULONG inIoSpace = VIDEO_MEMORY_SPACE_MEMORY; - SYSTEM_BASIC_INFORMATION BasicInfo; - ULONG Length; - /* FIXME: this should probably be done differently, without native API */ StatusBlock->Information = sizeof(VIDEO_MEMORY_INFORMATION); - FrameBuffer.u.HighPart = 0; - if (ZwQuerySystemInformation(SystemBasicInformation, - (PVOID)&BasicInfo, - sizeof(SYSTEM_BASIC_INFORMATION), - &Length) == NO_ERROR) - { - FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE; - } - else + /* Reuse framebuffer that was set up by firmware */ + FrameBuffer.QuadPart = *((PULONG)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)); + if (FrameBuffer.QuadPart != 0x3C00000 && FrameBuffer.QuadPart != 0x7C00000) { - ERR_(IHVVIDEO, "ZwQueryBasicInformation failed, assuming 64MB total memory\n"); - FrameBuffer.u.LowPart = 60 * 1024 * 1024; + /* Check framebuffer address (high 4 MB of either 64 or 128 MB RAM) */ + WARN_(IHVVIDEO, "Non-standard framebuffer address 0x%p\n", FrameBuffer.QuadPart); } + /* Verify that framebuffer address is page-aligned */ + ASSERT(FrameBuffer.QuadPart % PAGE_SIZE == 0); FrameBuffer.QuadPart += DeviceExtension->PhysFrameBufferStart.QuadPart; MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; + /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ MapInformation->VideoRamLength = 4 * 1024 * 1024; VideoPortMapMemory( @@ -424,7 +418,7 @@ XboxVmpMapVideoMemory( MapInformation->FrameBufferLength = MapInformation->VideoRamLength; /* Tell the nVidia controller about the framebuffer */ - *((PULONG)((char *)DeviceExtension->VirtControlStart + NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)) = FrameBuffer.u.LowPart; + *((PULONG)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET)) = FrameBuffer.u.LowPart; INFO_(IHVVIDEO, "Mapped 0x%x bytes of phys mem at 0x%lx to virt addr 0x%p\n", MapInformation->VideoRamLength, FrameBuffer.u.LowPart, MapInformation->VideoRamBase); @@ -475,112 +469,6 @@ XboxVmpQueryNumAvailModes( return TRUE; } -static -BOOLEAN -ReadfromSMBus( - UCHAR Address, - UCHAR bRegister, - UCHAR Size, - ULONG *Data_to_smbus) -{ - int nRetriesToLive = 50; - - while ((VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800) != 0) - { - ; /* Franz's spin while bus busy with any master traffic */ - } - - while (nRetriesToLive-- != 0) - { - UCHAR b; - int temp; - - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 8), bRegister); - - temp = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)); - VideoPortWritePortUshort((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ - - switch (Size) - { - case 4: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ - break; - } - - case 2: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ - break; - } - - default: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0a); /* BYTE */ - } - } - - b = 0; - - while ((b & 0x36) == 0) - { - b = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 0)); - } - - if ((b & 0x24) != 0) - { - ERR_(IHVVIDEO, "I2CTransmitByteGetReturn error %x\n", b); - } - - if ((b & 0x10) == 0) - { - ERR_(IHVVIDEO, "I2CTransmitByteGetReturn no complete, retry\n"); - } - else - { - switch (Size) - { - case 4: - { - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - break; - } - - case 2: - { - *Data_to_smbus = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 6)); - break; - } - - default: - { - *Data_to_smbus = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); - } - } - - return TRUE; - } - } - - return FALSE; -} - - -static -BOOLEAN -I2CTransmitByteGetReturn( - UCHAR bPicAddressI2cFormat, - UCHAR bDataToWrite, - ULONG *Return) -{ - return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); -} - /* * XboxVmpQueryAvailModes * @@ -610,57 +498,58 @@ XboxVmpQueryCurrentMode( PVIDEO_MODE_INFORMATION VideoMode, PSTATUS_BLOCK StatusBlock) { - ULONG AvMode = 0; - - VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); - VideoMode->ModeIndex = 0; - - if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode)) - { - if (AvMode == 1) /* HDTV */ - { - VideoMode->VisScreenWidth = 720; - } - else - { - /* FIXME Other possible values of AvMode: - * 0 - AV_SCART_RGB - * 2 - AV_VGA_SOG - * 4 - AV_SVIDEO - * 6 - AV_COMPOSITE - * 7 - AV_VGA - * other AV_COMPOSITE - */ - VideoMode->VisScreenWidth = 640; - } - } - else - { - VideoMode->VisScreenWidth = 640; - } - - VideoMode->VisScreenHeight = 480; - VideoMode->ScreenStride = VideoMode->VisScreenWidth * 4; - VideoMode->NumberOfPlanes = 1; - VideoMode->BitsPerPlane = 32; - VideoMode->Frequency = 1; - VideoMode->XMillimeter = 0; /* FIXME */ - VideoMode->YMillimeter = 0; /* FIXME */ - VideoMode->NumberRedBits = 8; - VideoMode->NumberGreenBits = 8; - VideoMode->NumberBlueBits = 8; - VideoMode->RedMask = 0xFF0000; - VideoMode->GreenMask = 0x00FF00; - VideoMode->BlueMask = 0x0000FF; - VideoMode->VideoMemoryBitmapWidth = VideoMode->VisScreenWidth; - VideoMode->VideoMemoryBitmapHeight = VideoMode->VisScreenHeight; - VideoMode->AttributeFlags = VIDEO_MODE_GRAPHICS | VIDEO_MODE_COLOR | - VIDEO_MODE_NO_OFF_SCREEN; - VideoMode->DriverSpecificAttributeFlags = 0; - - StatusBlock->Information = sizeof(VIDEO_MODE_INFORMATION); - - return TRUE; + ULONG AvMode = 0; + + VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); + VideoMode->ModeIndex = 0; + + /* FIXME: don't use SMBus, obtain current video resolution directly from NV2A */ + if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode)) + { + if (AvMode == 1) /* HDTV */ + { + VideoMode->VisScreenWidth = 720; + } + else + { + /* FIXME Other possible values of AvMode: + * 0 - AV_SCART_RGB + * 2 - AV_VGA_SOG + * 4 - AV_SVIDEO + * 6 - AV_COMPOSITE + * 7 - AV_VGA + * other AV_COMPOSITE + */ + VideoMode->VisScreenWidth = 640; + } + } + else + { + VideoMode->VisScreenWidth = 640; + } + + VideoMode->VisScreenHeight = 480; + VideoMode->ScreenStride = VideoMode->VisScreenWidth * 4; + VideoMode->NumberOfPlanes = 1; + VideoMode->BitsPerPlane = 32; + VideoMode->Frequency = 1; + VideoMode->XMillimeter = 0; /* FIXME */ + VideoMode->YMillimeter = 0; /* FIXME */ + VideoMode->NumberRedBits = 8; + VideoMode->NumberGreenBits = 8; + VideoMode->NumberBlueBits = 8; + VideoMode->RedMask = 0xFF0000; + VideoMode->GreenMask = 0x00FF00; + VideoMode->BlueMask = 0x0000FF; + VideoMode->VideoMemoryBitmapWidth = VideoMode->VisScreenWidth; + VideoMode->VideoMemoryBitmapHeight = VideoMode->VisScreenHeight; + VideoMode->AttributeFlags = VIDEO_MODE_GRAPHICS | VIDEO_MODE_COLOR | + VIDEO_MODE_NO_OFF_SCREEN; + VideoMode->DriverSpecificAttributeFlags = 0; + + StatusBlock->Information = sizeof(VIDEO_MODE_INFORMATION); + + return TRUE; } /* EOF */ diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.h b/win32ss/drivers/miniport/xboxvmp/xboxvmp.h index f7014cc1166..5742cef3e29 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.h +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.h @@ -11,6 +11,10 @@ /* INCLUDES *******************************************************************/ +/* + * FIXME: specify headers properly in the triangle brackets and rearrange them + * in a way so it would be simpler to add NDK and other headers for debugging. + */ #include "ntdef.h" #define PAGE_SIZE 4096 #include "dderror.h" @@ -18,35 +22,15 @@ #include "miniport.h" #include "video.h" -/* FIXME: NDK not compatible with miniport drivers */ -#define SystemBasicInformation 0 -typedef struct _SYSTEM_BASIC_INFORMATION -{ - ULONG Reserved; - ULONG TimerResolution; - ULONG PageSize; - ULONG NumberOfPhysicalPages; - ULONG LowestPhysicalPageNumber; - ULONG HighestPhysicalPageNumber; - ULONG AllocationGranularity; - ULONG MinimumUserModeAddress; - ULONG MaximumUserModeAddress; - KAFFINITY ActiveProcessorsAffinityMask; - CCHAR NumberOfProcessors; -} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; - -LONG -__stdcall -ZwQuerySystemInformation( - IN ULONG SystemInformationClass, - OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ResultLength -); - #define I2C_IO_BASE 0xC000 #define NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800 +BOOLEAN +I2CTransmitByteGetReturn( + UCHAR bPicAddressI2cFormat, + UCHAR bDataToWrite, + ULONG *Return); + typedef struct { PHYSICAL_ADDRESS PhysControlStart;

4 years, 11 months

[reactos] 01/01: [CMDUTILS] Add italian translation for 'comp' utility. (#1931)

by Carlo Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3377b901b2604863527fd… commit 3377b901b2604863527fdff291eb133d7ded4a1f Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Tue Oct 8 16:52:30 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 16:52:30 2019 +0200 [CMDUTILS] Add italian translation for 'comp' utility. (#1931) --- base/applications/cmdutils/comp/comp.rc | 3 +++ base/applications/cmdutils/comp/lang/it-IT.rc | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/base/applications/cmdutils/comp/comp.rc b/base/applications/cmdutils/comp/comp.rc index d440990dee7..9e564212ef9 100644 --- a/base/applications/cmdutils/comp/comp.rc +++ b/base/applications/cmdutils/comp/comp.rc @@ -21,6 +21,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/cmdutils/comp/lang/it-IT.rc b/base/applications/cmdutils/comp/lang/it-IT.rc new file mode 100644 index 00000000000..c7cd95ffb51 --- /dev/null +++ b/base/applications/cmdutils/comp/lang/it-IT.rc @@ -0,0 +1,23 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_HELP "Confronta il contenuto di due file o gruppi di file.\n\n\ +COMP [/L] [/A] [file1] [file2]\n\n\ + file1 Specifica la posizione ed il nome del primo file da confrontare.\n\ + file2 Specifica la posizione ed il nome del secondo file da confrontare.\n\ + /A Visualizza le differenze con caratteri ASCII (predefinito: esadecimale).\n\ + /L Visualizza i numeri delle linee differenti.\n" + IDS_INVALIDSWITCH "Parametro non valido - /%c\n" + IDS_BADSYNTAX "Errore di sintassi sulla linea di comando\n" + IDS_FILEERROR "Impossibile aprire/trovare il file: %s\n" + IDS_COMPARING "Confronto %s con %s...\n" + IDS_FILESIZEERROR "Impossibile determinare la dimensione del file: %s\n" + IDS_SIZEDIFFERS "I file hanno dimensione differente.\n" + IDS_READERROR "Errore di lettura dei file.\n" + IDS_MISMATCHLINE "Errore di confronto alla LINEA %d\n" + IDS_MISMATCHOFFSET "Errore di confronto all'OFFSET 0x%X\n" + IDS_ASCIIDIFF "file%d = %c\n" + IDS_HEXADECIMALDIFF "file%d = %X\n" + IDS_MATCH "Confronto dei file OK\n" +END

4 years, 11 months

[reactos] 01/01: [FREELDR] Handle Btrfs sparse extents (#1959)

by maharmstone

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90ac794bf284f4c2b78b5… commit 90ac794bf284f4c2b78b532dc02fcf9275783209 Author: maharmstone <mark(a)harmstone.com> AuthorDate: Tue Oct 8 15:50:58 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 16:50:57 2019 +0200 [FREELDR] Handle Btrfs sparse extents (#1959) --- boot/freeldr/freeldr/lib/fs/btrfs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index aa12d0e066c..16a861427c4 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -687,6 +687,13 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte if (size > dlen - offset) size = dlen - offset; + /* Handle sparse extent */ + if (extent->disk_bytenr == 0 && extent->disk_num_bytes == 0) + { + RtlZeroMemory(out, size); + return size; + } + physical = logical_physical(extent->disk_bytenr); if (physical == INVALID_ADDRESS) {

4 years, 11 months

[reactos] 05/05: [FREELDR] Add support for loading Linux in x64 FreeLdr. Part 2/2: C code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63e22b82877ec5cca928c… commit 63e22b82877ec5cca928c1c16101df4c3209c01c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 6 19:22:18 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 01:30:25 2019 +0200 [FREELDR] Add support for loading Linux in x64 FreeLdr. Part 2/2: C code. - Re-enable custom and Linux boot menu entries. - Fix compilation and add address limit checks for x64 build of linux loader. --- boot/freeldr/freeldr/bootmgr.c | 5 +++-- boot/freeldr/freeldr/custom.c | 14 ++++++------- boot/freeldr/freeldr/include/custom.h | 4 ++-- boot/freeldr/freeldr/include/linux.h | 4 ++-- boot/freeldr/freeldr/include/miscboot.h | 4 ++-- boot/freeldr/freeldr/linuxboot.c | 36 +++++++++++++++++---------------- boot/freeldr/freeldr/miscboot.c | 4 ++-- 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 4a1923dff19..9830c2ec74f 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -54,12 +54,13 @@ static const struct { {"ReactOSSetup", EditCustomBootReactOSSetup, LoadReactOSSetup}, -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) {"Drive" , EditCustomBootDisk , LoadAndBootDevice}, {"Partition" , EditCustomBootPartition , LoadAndBootDevice}, {"BootSector" , EditCustomBootSectorFile, LoadAndBootDevice}, - {"Linux" , EditCustomBootLinux, LoadAndBootLinux }, +#endif +#ifdef _M_IX86 {"WindowsNT40" , EditCustomBootNTOS , LoadAndBootWindows}, #endif {"Windows" , EditCustomBootNTOS , LoadAndBootWindows}, diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 604d7ac9629..7cfd38c8d40 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -23,14 +23,14 @@ /* GLOBALS ********************************************************************/ -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */ const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; @@ -46,7 +46,7 @@ const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; VOID OptionMenuCustomBoot(VOID) { PCSTR CustomBootMenuList[] = { -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) "Disk", "Partition", "Boot Sector File", @@ -75,7 +75,7 @@ VOID OptionMenuCustomBoot(VOID) OperatingSystem.SectionId = 0; switch (SelectedMenuItem) { -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) case 0: // Disk EditCustomBootDisk(&OperatingSystem); break; @@ -101,7 +101,7 @@ VOID OptionMenuCustomBoot(VOID) case 1: // ReactOS Setup EditCustomBootReactOS(&OperatingSystem, TRUE); break; -#endif +#endif /* _M_IX86 || _M_AMD64 */ } /* And boot it */ @@ -114,7 +114,7 @@ VOID OptionMenuCustomBoot(VOID) #endif // HAS_OPTION_MENU_CUSTOM_BOOT -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) VOID EditCustomBootDisk( @@ -612,7 +612,7 @@ EditCustomBootLinux( OperatingSystem->LoadIdentifier = "Custom Linux Setup"; } -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */ VOID EditCustomBootReactOS( diff --git a/boot/freeldr/freeldr/include/custom.h b/boot/freeldr/freeldr/include/custom.h index 57164b84c8e..8fb4f7bdae3 100644 --- a/boot/freeldr/freeldr/include/custom.h +++ b/boot/freeldr/freeldr/include/custom.h @@ -27,7 +27,7 @@ VOID OptionMenuCustomBoot(VOID); #endif -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) VOID EditCustomBootDisk( @@ -45,7 +45,7 @@ VOID EditCustomBootLinux( IN OUT OperatingSystemItem* OperatingSystem); -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */ VOID EditCustomBootReactOS( diff --git a/boot/freeldr/freeldr/include/linux.h b/boot/freeldr/freeldr/include/linux.h index c51f70dab9f..6bb92d946c7 100644 --- a/boot/freeldr/freeldr/include/linux.h +++ b/boot/freeldr/freeldr/include/linux.h @@ -23,7 +23,7 @@ #ifndef __LINUX_H #define __LINUX_H -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) #define LINUX_LOADER_TYPE_LILO 0x01 #define LINUX_LOADER_TYPE_LOADLIN 0x11 @@ -142,6 +142,6 @@ LoadAndBootLinux( IN PCHAR Argv[], IN PCHAR Envp[]); -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */ #endif // defined __LINUX_H diff --git a/boot/freeldr/freeldr/include/miscboot.h b/boot/freeldr/freeldr/include/miscboot.h index 9ba1cb8448d..0f05fd1ce03 100644 --- a/boot/freeldr/freeldr/include/miscboot.h +++ b/boot/freeldr/freeldr/include/miscboot.h @@ -19,7 +19,7 @@ #pragma once -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) ARC_STATUS LoadAndBootDevice( @@ -27,4 +27,4 @@ LoadAndBootDevice( IN PCHAR Argv[], IN PCHAR Envp[]); -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */ diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index fa9ad60d442..fae1f8da6a2 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -22,9 +22,7 @@ * https://www.kernel.org/doc/Documentation/x86/boot.txt */ -#ifndef _M_ARM - -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) /* INCLUDES *******************************************************************/ @@ -439,7 +437,7 @@ static BOOLEAN LinuxReadKernel(ULONG LinuxKernelFile) Position.QuadPart = 512 + SetupSectorSize; if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS) return FALSE; - for (BytesLoaded=0; BytesLoaded<LinuxKernelSize; ) + for (BytesLoaded = 0; BytesLoaded < LinuxKernelSize; ) { if (ArcRead(LinuxKernelFile, LoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS) return FALSE; @@ -492,31 +490,37 @@ static BOOLEAN LinuxCheckKernelVersion(VOID) static BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile) { - ULONG BytesLoaded; - CHAR StatusText[260]; + ULONG BytesLoaded; + CHAR StatusText[260]; RtlStringCbPrintfA(StatusText, sizeof(StatusText), "Loading %s", LinuxInitrdName); UiDrawStatusText(StatusText); - // Allocate memory for the ramdisk - //LinuxInitrdLoadAddress = MmAllocateMemory(LinuxInitrdSize); - // Try to align it at the next MB boundary after the kernel - //LinuxInitrdLoadAddress = MmAllocateMemoryAtAddress(LinuxInitrdSize, (PVOID)ROUND_UP((LINUX_KERNEL_LOAD_ADDRESS + LinuxKernelSize), 0x100000)); + /* Allocate memory for the ramdisk, below 4GB */ + // LinuxInitrdLoadAddress = MmAllocateMemory(LinuxInitrdSize); + /* Try to align it at the next MB boundary after the kernel */ + // LinuxInitrdLoadAddress = MmAllocateMemoryAtAddress(LinuxInitrdSize, (PVOID)ROUND_UP((LINUX_KERNEL_LOAD_ADDRESS + LinuxKernelSize), 0x100000)); if (LinuxSetupSector->Version <= 0x0202) { +#ifdef _M_AMD64 + C_ASSERT(LINUX_MAX_INITRD_ADDRESS < 0x100000000); +#endif LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, (PVOID)LINUX_MAX_INITRD_ADDRESS, LoaderSystemCode); } else { - LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, (PVOID)LinuxSetupSector->InitrdAddressMax, LoaderSystemCode); + LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, UlongToPtr(LinuxSetupSector->InitrdAddressMax), LoaderSystemCode); } if (LinuxInitrdLoadAddress == NULL) { return FALSE; } +#ifdef _M_AMD64 + ASSERT((ULONG_PTR)LinuxInitrdLoadAddress < 0x100000000); +#endif /* Set the information in the setup struct */ - LinuxSetupSector->RamdiskAddress = (ULONG)LinuxInitrdLoadAddress; + LinuxSetupSector->RamdiskAddress = PtrToUlong(LinuxInitrdLoadAddress); LinuxSetupSector->RamdiskSize = LinuxInitrdSize; TRACE("RamdiskAddress: 0x%x\n", LinuxSetupSector->RamdiskAddress); @@ -528,9 +532,9 @@ static BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile) } /* Load the ramdisk */ - for (BytesLoaded=0; BytesLoaded<LinuxInitrdSize; ) + for (BytesLoaded = 0; BytesLoaded < LinuxInitrdSize; ) { - if (ArcRead(LinuxInitrdFile, (PVOID)LinuxInitrdLoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS) + if (ArcRead(LinuxInitrdFile, LinuxInitrdLoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS) return FALSE; BytesLoaded += LINUX_READ_CHUNK_SIZE; @@ -542,6 +546,4 @@ static BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile) return TRUE; } -#endif // _M_IX86 - -#endif +#endif /* _M_IX86 || _M_AMD64 */ diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 6ea56631654..a00072d3efd 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) /* INCLUDES *******************************************************************/ @@ -331,4 +331,4 @@ LoadAndBootDevice( return ESUCCESS; } -#endif // _M_IX86 +#endif /* _M_IX86 || _M_AMD64 */

4 years, 11 months

[reactos] 04/05: [FREELDR] Fix an inconsistency bug when switching the CPU state back to 16-bit real mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d6631c2da3eb593623af… commit 0d6631c2da3eb593623af9cff8fef86530aecd55 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 2 03:20:10 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 8 01:30:15 2019 +0200 [FREELDR] Fix an inconsistency bug when switching the CPU state back to 16-bit real mode. Basically it appeared that without this fix, the CPU was somehow residing in an inconsistent state, that made it crash when a full 16-bit real-mode to 32-bit protected mode transition occurred. (Encountered when trying to load Linux, see problem description below.) In that situation, Bochs reports that the CPU is in "compatibility mode". The fix is based from information from Fig.1-6 "Operating Modes of the AMD64 Architecture" (page 12) and Chapter 14 (pages 429-446) of the "AMD64 Architecture Programmer’s Manual Volume 2: System Programming" https://www.amd.com/system/files/TechDocs/24593.pdf *** THE PROBLEM *** When booting Linux using x86 FreeLdr everything goes well. When trying to do the same using x64 FreeLdr, the Linux code (both the boot sector, the setup sector and the main kernel contents) is all correctly loaded and relocated in memory as in the x86 case. We then pass control to the decompressing code that appears to succeed. However, once it has finished and "Parsing ELF file..." step has been run, the next step "Booting the kernel..." crashes with a CPU Triple-Fault. This problem **DOES NOT HAPPEN** when booting from GRUB. Log excerpt from Bochs: <snip> 00089459736i[BIOS ] Booting from 07c0:0000 00089782775i[SER ] com1: FIFO enabled 00095994535i[BIOS ] int13_harddisk: function 41, unmapped device for ELDL=81 00095998517i[BIOS ] int13_harddisk: function 08, unmapped device for ELDL=81 00397139785i[BIOS ] KBD: unsupported int 16h function 03 00397143625i[BIOS ] *** int 15h function AX=e980, BX=0000 not yet supported! 00523008104e[CPU0 ] interrupt(long mode): vector must be within IDT table limits, IDT.limit = 0x0 00523008104e[CPU0 ] interrupt(long mode): vector must be within IDT table limits, IDT.limit = 0x0 00523008104i[CPU0 ] CPU is in compatibility mode (active) 00523008104i[CPU0 ] CS.mode = 32 bit 00523008104i[CPU0 ] SS.mode = 32 bit 00523008104i[CPU0 ] EFER = 0x00000500 00523008104i[CPU0 ] | RAX=00000000e0000011 RBX=0000000000000000 00523008104i[CPU0 ] | RCX=0000000000000000 RDX=0000000000000000 00523008104i[CPU0 ] | RSP=00000000004f8000 RBP=000000000082e003 00523008104i[CPU0 ] | RSI=0000000000099800 RDI=00000000c0611000 00523008104i[CPU0 ] | R8=0000000000109000 R9=0000000000009020 00523008104i[CPU0 ] | R10=00000000000007e3 R11=000000000000e958 00523008104i[CPU0 ] | R12=0000000000000000 R13=0000000000000000 00523008104i[CPU0 ] | R14=0000000000000000 R15=0000000000000000 00523008104i[CPU0 ] | IOPL=0 id vip vif ac vm RF nt of df if tf SF zf af PF cf 00523008104i[CPU0 ] | SEG sltr(index|ti|rpl) base limit G D 00523008104i[CPU0 ] | CS:0010( 0002| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | DS:0018( 0003| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | SS:0018( 0003| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | ES:0018( 0003| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | FS:0018( 0003| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | GS:0018( 0003| 0| 0) 00000000 ffffffff 1 1 00523008104i[CPU0 ] | MSR_FS_BASE:0000000000000000 00523008104i[CPU0 ] | MSR_GS_BASE:0000000000000000 00523008104i[CPU0 ] | RIP=0000000000409327 (0000000000409327) 00523008104i[CPU0 ] | CR0=0xe0000011 CR2=0x0000000000409327 00523008104i[CPU0 ] | CR3=0x005b5000 CR4=0x000000a0 00523008104i[CPU0 ] 0x0000000000409327: (instruction unavailable) page not present 00523008104p[CPU0 ] >>PANIC<< exception(): 3rd (13) exception with no resolution <snip> --- boot/freeldr/freeldr/arch/realmode/amd64.S | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index 0a97afd402d..ea1494f6b80 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -160,6 +160,12 @@ CheckFor64BitSupport: .ascii "PAE or PGE not set.", CR, LF, NUL .CheckForLongMode: + /* Check whether extended functions are supported */ + mov eax, HEX(80000000) + cpuid + cmp eax, HEX(80000000) // Any function > 0x80000000 ? + jbe .NoLongMode // If not, no long mode. + /* Check whether the CPU supports Long Mode */ xor edx, edx mov eax, HEX(80000001) cpuid @@ -167,6 +173,7 @@ CheckFor64BitSupport: test edx, edx jnz .Success +.NoLongMode: mov si, offset .Msg_NoLongMode call writestr popad @@ -240,6 +247,18 @@ BuildPageTables: /* This is the entry point from long mode */ RealModeEntryPoint: + + /* Disable long mode */ + mov ecx, MSR_EFER + rdmsr + and eax, HEX(0FFFFFEFF) // ~0100 + wrmsr + + /* Mask PAE and PGE out */ + mov eax, cr4 + and eax, HEX(0FFFFFF5F) // ~00A0 + mov cr4, eax + /* Disable Protected Mode */ mov eax, cr0 and eax, HEX(0FFFFFFFE) // ~0x00000001 @@ -295,6 +314,8 @@ ExitToLongMode: mov word ptr ds:[stack16], sp /* Set PAE and PGE: 10100000b */ + // mov eax, cr4 + // or eax, HEX(00A0) mov eax, HEX(00A0) mov cr4, eax

4 years, 11 months

[reactos] 03/05: [FREELDR] Add support for loading Linux in x64 FreeLdr. Part 1/2: ASM code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25badcfbbdc4f6f58546f… commit 25badcfbbdc4f6f58546ff3b1920bbe6d9d3498e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 1 03:50:29 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 02:57:48 2019 +0200 [FREELDR] Add support for loading Linux in x64 FreeLdr. Part 1/2: ASM code. Add also ASM implementation for intrinsics that may not be always present on MSVC (e.g. MSVC 2010). --- boot/freeldr/freeldr/CMakeLists.txt | 3 +- boot/freeldr/freeldr/arch/amd64/entry.S | 108 +++++++++++++------- boot/freeldr/freeldr/arch/amd64/int386.S | 7 +- boot/freeldr/freeldr/arch/amd64/linux.S | 159 +++++++++++++++++++++++++++++ boot/freeldr/freeldr/arch/realmode/amd64.S | 41 ++++---- 5 files changed, 256 insertions(+), 62 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 53eaca33b74..d4086a7893b 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -143,7 +143,8 @@ elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/amd64/entry.S arch/amd64/int386.S - arch/amd64/pnpbios.S) + arch/amd64/pnpbios.S + arch/amd64/linux.S) list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/amd64/winldr.c) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index 31c6411ee00..24ecc07291d 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -1,6 +1,7 @@ #include <asm.inc> #include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> EXTERN BootMain:PROC // EXTERN cmdline:DWORD @@ -75,50 +76,71 @@ Reboot: /* Stop the floppy drive motor */ call DiskStopFloppyMotor - /* Set the function ID */ + /* Set the function ID and switch to real mode (we don't return) */ mov bx, FNID_Reboot - - /* Switch to real mode (we don't return) */ jmp SwitchToReal /* - * VOID __cdecl ChainLoadBiosBootSectorCode( - * IN UCHAR BootDrive OPTIONAL, - * IN ULONG BootPartition OPTIONAL); + * VOID __cdecl Relocator16Boot( + * IN REGS* In<rcx>, + * IN USHORT StackSegment<dx>, + * IN USHORT StackPointer<r8w>, + * IN USHORT CodeSegment<r9w>, + * IN USHORT CodePointer<rsp+40>); + * + * RETURNS: Nothing. * - * RETURNS: Nothing + * NOTE: The implementation of this function is similar to that of Int386(), + * with the proviso that no attempt is done to save the original values of + * the registers since we will not need them anyway, as we do not return back + * to the caller but instead place the machine in a permanent new CPU state. */ -PUBLIC ChainLoadBiosBootSectorCode -ChainLoadBiosBootSectorCode: - /* Set the boot drive */ - mov dl, [esp + 4] - test dl, dl - jnz set_part - mov dl, byte ptr [FrldrBootDrive] - - /* Set the boot partition */ -set_part: - mov eax, [esp + 8] - test eax, eax - jnz continue - mov eax, dword ptr [FrldrBootPartition] -continue: - /* Store the 1-byte truncated partition number in DH */ - mov dh, al +PUBLIC Relocator16Boot +Relocator16Boot: + + /* Save home registers */ + mov qword ptr [rsp + 8], rcx + mov word ptr [rsp + 16], dx + mov word ptr [rsp + 24], r8w + mov word ptr [rsp + 32], r9w + +#if 0 + /* Save non-volatile registers */ + push rbx + push rsi + push rdi +#endif - /* - * Don't stop the floppy drive motor when we are just booting a bootsector, - * a drive, or a partition. If we were to stop the floppy motor, the BIOS - * wouldn't be informed and if the next read is to a floppy then the BIOS - * will still think the motor is on and this will result in a read error. - */ - // call DiskStopFloppyMotor + /* Copy input registers */ + mov rsi, qword ptr [rsp + 8] + mov rdi, BSS_RegisterSet + mov rcx, REGS_SIZE / 4 + rep movsd - /* Set the function ID */ - mov bx, FNID_ChainLoadBiosBootSectorCode + /* Set the stack segment/offset */ + // Since BSS_CallbackReturn contains a ULONG, store in its high word + // the stack segment and in its low word the stack offset. + mov ax, word ptr [rsp + 16] + shl eax, 16 + mov ax, word ptr [rsp + 24] + mov dword ptr [BSS_CallbackReturn], eax - /* Switch to real mode (we don't return) */ + /* + * Set the code segment/offset (Copy entry point) + * NOTE: We permanently *ERASE* the contents of ds:[BSS_RealModeEntry] + * but it is not a problem since we are going to place the machine in + * a permanent new CPU state. + */ + // Since BSS_RealModeEntry contains a ULONG, store in its high word + // the code segment and in its low word the code offset. + mov ax, word ptr [rsp + 32] + shl eax, 16 + mov ax, word ptr [rsp + 40] + mov dword ptr [BSS_RealModeEntry], eax + + /* Set the function ID and switch to real mode (we don't return) */ + mov bx, FNID_Relocator16Boot jmp SwitchToReal @@ -166,7 +188,7 @@ jumpvector: .word CMODE_CS SwitchToRealCompSegment: - /* Note: In fact the CPU is in 32 bit mode here. But it will interprete + /* Note: In fact the CPU is in 32 bit mode here. But it will interpret the generated instructions accordingly. rax will become eax */ /* Step 2 - deactivate long mode, by disabling paging */ @@ -191,18 +213,30 @@ CallRealMode_return: ///////////////////////////////////////// -//void __lgdt(void *Source); +// void __fastfail(unsigned int Code<rcx>); +PUBLIC __fastfail +__fastfail: + // mov ecx, [rsp + 4] + int HEX(29) + +// void __lgdt(void *Source<rcx>); PUBLIC __lgdt __lgdt: lgdt fword ptr [rcx] ret -//void __ltr(unsigned short Source); +// void __ltr(unsigned short Source<rcx>); PUBLIC __ltr __ltr: ltr cx ret +// void _sgdt(void *Destination<rcx>); +PUBLIC __sgdt +__sgdt: + sgdt fword ptr [rcx] + ret + /* 64-bit stack pointer */ stack64: diff --git a/boot/freeldr/freeldr/arch/amd64/int386.S b/boot/freeldr/freeldr/arch/amd64/int386.S index dc486ee7b18..f3bd65a4da7 100644 --- a/boot/freeldr/freeldr/arch/amd64/int386.S +++ b/boot/freeldr/freeldr/arch/amd64/int386.S @@ -20,6 +20,7 @@ #include <asm.inc> #include <arch/pc/x86common.h> #include <arch/pc/pcbios.h> + .code64 EXTERN CallRealMode:PROC @@ -40,7 +41,7 @@ Int386: push rsi push rdi - /* Alloc stack space for home registers */ + /* Alloc stack space for home registers (+ alignment) */ sub rsp, 40 //.ENDPROLOG @@ -68,11 +69,11 @@ int386_2: /* Copy output registers */ mov rsi, BSS_RegisterSet - mov rdi, [r11 + 24] + mov rdi, qword ptr [r11 + 24] mov rcx, REGS_SIZE / 4 rep movsd - /* cleanup and return */ + /* Cleanup and return */ add rsp, 40 pop rdi pop rsi diff --git a/boot/freeldr/freeldr/arch/amd64/linux.S b/boot/freeldr/freeldr/arch/amd64/linux.S new file mode 100644 index 00000000000..383111ae66c --- /dev/null +++ b/boot/freeldr/freeldr/arch/amd64/linux.S @@ -0,0 +1,159 @@ +/* + * FreeLoader + * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <asm.inc> +#include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> + +EXTERN DiskStopFloppyMotor:PROC +EXTERN Relocator16Boot:PROC +EXTERN FrldrBootDrive:BYTE +EXTERN FrldrBootPartition:DWORD + +.code64 + +Regs: + .space REGS_SIZE + +/* + * VOID __cdecl BootLinuxKernel( + * IN ULONG KernelSize<ecx>, + * IN PVOID KernelCurrentLoadAddress<rdx>, + * IN PVOID KernelTargetLoadAddress<r8>, + * IN UCHAR DriveNumber<r9b>, + * IN ULONG PartitionNumber<rsp+40>); + */ +PUBLIC BootLinuxKernel +BootLinuxKernel: + + /* Save home registers */ + mov r11, rsp + mov dword ptr [r11 + 8], ecx + mov qword ptr [r11 + 16], rdx + mov qword ptr [r11 + 24], r8 + mov byte ptr [r11 + 32], r9b + + /* Save non-volatile registers */ + push rsi + push rdi + + /* Allocate stack space for home registers (+ alignment) */ + sub rsp, (8*4 + 8) + //.ENDPROLOG + + /* Stop the floppy drive motor */ + call DiskStopFloppyMotor + + /* Set all segment registers to 0x9000 */ + mov ax, HEX(9000) + mov word ptr [Regs + REGS_DS], ax + mov word ptr [Regs + REGS_ES], ax + mov word ptr [Regs + REGS_FS], ax + mov word ptr [Regs + REGS_GS], ax + + /* Set the boot drive */ + xor edx, edx + mov dl, byte ptr [r11 + 32] + test dl, dl + jnz set_part + mov dl, byte ptr /*ds:*/[FrldrBootDrive] + + /* Set the boot partition */ +set_part: + mov eax, dword ptr [r11 + 40] + test eax, eax + jnz continue + mov eax, dword ptr /*ds:*/[FrldrBootPartition] +continue: + /* Store the 1-byte truncated partition number in DH */ + mov dh, al + + mov dword ptr [Regs + REGS_EDX], edx + + /* + * Relocate the kernel image to its final destination (can be as low as 0x10000). + * The reason we can overwrite low memory is because this code executes + * between 0000:8000 and 0000:FFFF. That leaves space for 32k of code + * before we start interfering with Linux kernel address space. + */ + + /* Get KernelSize in ECX */ + xor rcx, rcx // Put the 64..32 higher bits to zero + mov ecx, dword ptr [r11 + 8] + test rcx, rcx // If size is zero, do not perform relocations + jz after_reloc + + /* Load the source and target addresses */ + mov rsi, qword ptr [r11 + 16] // HEX(100000) // LINUX_KERNEL_LOAD_ADDRESS + mov rdi, qword ptr [r11 + 24] // HEX(10000) + +// +// FIXME: Support relocating *upwards*, overlapping regions, aligned addresses, +// etc... !! See memmove code. +// + /* Check how we should perform relocation */ + cmp rdi, rsi + je after_reloc // target == source: do not perform relocations + ja reloc_up // target > source: relocate up +// jb reloc_down // target < source: relocate down (default) + +reloc_down: + /* Move the kernel down - Start with low addresses and increment them */ + cld +#if 0 + rep movsb +#else + mov rdx, rcx // Copy the total number of bytes in EDX + and rdx, HEX(0FFFFFFFC) // Number of bytes we copy using DWORDs + xor rdx, rcx // Number of remaining bytes to copy after the DWORDs + shr rcx, 2 // Count number of DWORDs + rep movsd // Move DWORDs + mov rcx, rdx // Count number of remaining bytes + rep movsb // Move bytes +#endif + jmp after_reloc + +reloc_up: + /* Move the kernel up - Start with high addresses and decrement them */ + std + add rsi, rcx + add rdi, rcx + dec rsi + dec rdi + rep movsb + // jmp after_reloc + +after_reloc: + + mov word ptr [rsp-8 + 40], HEX(0000) // CodePointer + mov r9w, HEX(9020) // CodeSegment + mov r8w, HEX(9000) // StackPointer + mov dx, HEX(9000) // StackSegment + mov rcx, offset Regs + call Relocator16Boot + + /* Cleanup and return */ + add rsp, (8*4 + 8) + pop rdi + pop rsi + + /* We must never get there */ + int 3 + +END diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index d6bf02c639b..0a97afd402d 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -8,7 +8,7 @@ .code16 -/* fat helper code */ +/* FAT helper code */ #include "fathelp.inc" .org 512 @@ -107,20 +107,20 @@ Msg_SwitchToLongMode: gdt: .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 00: NULL descriptor */ .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 08: */ - .word HEX(0000), HEX(0000), HEX(9800), HEX(0020) /* 10: long mode cs */ - .word HEX(ffff), HEX(0000), HEX(f300), HEX(00cf) /* 18: long mode ds */ + .word HEX(0000), HEX(0000), HEX(9800), HEX(0020) /* 10: long mode CS */ + .word HEX(FFFF), HEX(0000), HEX(F300), HEX(00CF) /* 18: long mode DS */ .word HEX(FFFF), HEX(0000), HEX(9E00), HEX(0000) /* 20: 16-bit real mode CS */ .word HEX(FFFF), HEX(0000), HEX(9200), HEX(0000) /* 28: 16-bit real mode DS */ - .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(00CF) /* 30: compat mode cs */ + .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(00CF) /* 30: compat mode CS */ /* GDT table pointer */ gdtptr: - .word HEX(37) /* Limit */ - .long offset gdt /* Base Address */ + .word HEX(37) /* Limit */ + .long offset gdt /* Base Address */ CheckFor64BitSupport: - /* Check if CPU supports CPUID */ + /* Check whether the CPU supports CPUID */ pushad pushfd pop eax @@ -130,7 +130,7 @@ CheckFor64BitSupport: popfd pushfd pop eax - cmp eax,ebx + cmp eax, ebx jnz .CheckForPAE mov si, offset .Msg_NoCpuidSupport @@ -144,10 +144,10 @@ CheckFor64BitSupport: .CheckForPAE: /* CPUID support detected - getting the PAE/PGE */ - mov eax,1 // Fn0000_0001 - PAE in EDX[6] + mov eax, 1 // Fn0000_0001 - PAE in EDX[6] cpuid - and edx, HEX(00a0) - cmp edx, HEX(00a0) + and edx, HEX(00A0) + cmp edx, HEX(00A0) je .CheckForLongMode mov si, offset .Msg_NoPAE @@ -164,7 +164,7 @@ CheckFor64BitSupport: mov eax, HEX(80000001) cpuid and edx, HEX(20000000) - test edx,edx + test edx, edx jnz .Success mov si, offset .Msg_NoLongMode @@ -195,7 +195,7 @@ BuildPageTables: /* One entry in the PML4 pointing to PDP */ mov eax, PDP_ADDRESS - or eax, HEX(0f) + or eax, HEX(0F) stosd /* clear rest */ @@ -205,7 +205,7 @@ BuildPageTables: /* One entry in the PDP pointing to PD */ mov eax, PD_ADDRESS - or eax, HEX(0f) + or eax, HEX(0F) stosd /* clear rest */ @@ -218,8 +218,8 @@ BuildPageTables: mov eax, HEX(008f) .Bpt2: - mov es: [di], eax - mov dword ptr es: [di + 4], 0 + mov es:[di], eax + mov dword ptr es:[di + 4], 0 add eax, 512 * 4096 // add 512 4k pages add di, 8 @@ -242,7 +242,7 @@ BuildPageTables: RealModeEntryPoint: /* Disable Protected Mode */ mov eax, cr0 - and eax, HEX(0fffffffe) // ~0x00000001 + and eax, HEX(0FFFFFFFE) // ~0x00000001 mov cr0, eax /* Clear prefetch queue & correct CS */ @@ -295,7 +295,7 @@ ExitToLongMode: mov word ptr ds:[stack16], sp /* Set PAE and PGE: 10100000b */ - mov eax, HEX(00a0) + mov eax, HEX(00A0) mov cr4, eax /* Point cr3 at the PML4 */ @@ -322,7 +322,7 @@ InLongMode: //DB 66h, 66h, 0C7h, 04h, 25h, 00h, 80h, 0Bh, 00h, 31h, 0Eh //mov word ptr [HEX(b8000)], HEX(0e00) + '1' - .byte HEX(0ff), HEX(25) // opcode of 64bit indirect jump + .byte HEX(0FF), HEX(25) // opcode of 64bit indirect jump .long 1 // relative address of LongModeEntryPoint nop LongModeEntryPoint: @@ -334,11 +334,10 @@ LongModeEntryPoint: CallbackTable: .word Int386 .word Reboot - .word ChainLoadBiosBootSectorCode + .word Relocator16Boot .word PxeCallApi .word PnpBiosGetDeviceNodeCount .word PnpBiosGetDeviceNode - .word 0 // BootLinuxKernel /* 16-bit stack pointer */ stack16:

4 years, 11 months

[reactos] 02/05: [FREELDR] Several changes regarding chainloading and Linux boot.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21c51eed0517ccca05ccf… commit 21c51eed0517ccca05ccf5a0724e0c9ce2a5e058 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 29 19:20:15 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 02:54:07 2019 +0200 [FREELDR] Several changes regarding chainloading and Linux boot. - Introduce "Relocator16Boot()". So far its aim is just to correctly set the CPU state (segments, registers, flags) to what is expected by a given boot image before running it. This function can be seen as the embryonic state of a future boot relocator (see e.g. GRUB or SYSLINUX) that would also relocate the boot image at the correct places. (Such feature is needed when boot images have to be loaded in memory areas that cover where the boot loader is in memory.) - Implement ChainLoadBiosBootSectorCode() around it. - Replace BootOldLinuxKernel() and BootNewLinuxKernel() by a new BootLinuxKernel() function (in assembly) that relocates the kernel to a given position and then boot it, using Relocator16Boot(). Ideally the relocation should be done by a future boot relocator... Implementation notes for Relocator16Boot(): =========================================== For setting the CPU state the function is based on a similar code as the Int386() helper, namely it takes a pointer to REGS structure and pass this information through the 32->16 bits call before setting the CPU state in accordance. New stack segment/pointer and code segment/pointer are also specified. For passing these values through the 32->16 bits call the 16-bit BSS memory offsets "BSS_CallbackReturn" and "BSS_RealModeEntry" (respectively) are reused. --- boot/freeldr/freeldr/arch/i386/entry.S | 74 ++++++++------ boot/freeldr/freeldr/arch/i386/i386rtl.c | 27 +++++ boot/freeldr/freeldr/arch/i386/linux.S | 125 +++++++++++++++++++---- boot/freeldr/freeldr/arch/powerpc/mach.c | 12 ++- boot/freeldr/freeldr/arch/realmode/helpers.inc | 54 ++++++++-- boot/freeldr/freeldr/arch/realmode/i386.S | 9 +- boot/freeldr/freeldr/arch/realmode/int386.inc | 4 - boot/freeldr/freeldr/arch/realmode/linux.inc | 15 --- boot/freeldr/freeldr/include/arch/pc/pcbios.h | 19 +++- boot/freeldr/freeldr/include/arch/pc/x86common.h | 7 +- boot/freeldr/freeldr/include/linux.h | 9 +- boot/freeldr/freeldr/linuxboot.c | 33 ++++-- 12 files changed, 281 insertions(+), 107 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/entry.S b/boot/freeldr/freeldr/arch/i386/entry.S index 4c95e64e605..9e7090f0f12 100644 --- a/boot/freeldr/freeldr/arch/i386/entry.S +++ b/boot/freeldr/freeldr/arch/i386/entry.S @@ -106,50 +106,58 @@ _Reboot: /* Stop the floppy drive motor */ call _DiskStopFloppyMotor - /* Set the function ID */ + /* Set the function ID and switch to real mode (we don't return) */ mov bx, FNID_Reboot - - /* Switch to real mode (we don't return) */ jmp SwitchToReal /* - * VOID __cdecl ChainLoadBiosBootSectorCode( - * IN UCHAR BootDrive OPTIONAL, - * IN ULONG BootPartition OPTIONAL); + * VOID __cdecl Relocator16Boot( + * IN REGS* In, + * IN USHORT StackSegment, + * IN USHORT StackPointer, + * IN USHORT CodeSegment, + * IN USHORT CodePointer); + * + * RETURNS: Nothing. * - * RETURNS: Nothing + * NOTE: The implementation of this function is similar to that of Int386(), + * with the proviso that no attempt is done to save the original values of + * the registers since we will not need them anyway, as we do not return back + * to the caller but instead place the machine in a permanent new CPU state. */ -PUBLIC _ChainLoadBiosBootSectorCode -_ChainLoadBiosBootSectorCode: - /* Set the boot drive */ - mov dl, [esp + 4] - test dl, dl - jnz set_part - mov dl, byte ptr ds:[_FrldrBootDrive] - - /* Set the boot partition */ -set_part: - mov eax, [esp + 8] - test eax, eax - jnz continue - mov eax, dword ptr ds:[_FrldrBootPartition] -continue: - /* Store the 1-byte truncated partition number in DH */ - mov dh, al +PUBLIC _Relocator16Boot +_Relocator16Boot: + + /* Copy input registers */ + mov esi, dword ptr [esp + 4] + mov edi, BSS_RegisterSet + mov ecx, REGS_SIZE / 4 + rep movsd + + /* Set the stack segment/offset */ + // Since BSS_CallbackReturn contains a ULONG, store in its high word + // the stack segment and in its low word the stack offset. + mov ax, word ptr [esp + 8] + shl eax, 16 + mov ax, word ptr [esp + 12] + mov dword ptr ds:[BSS_CallbackReturn], eax /* - * Don't stop the floppy drive motor when we are just booting a bootsector, - * a drive, or a partition. If we were to stop the floppy motor, the BIOS - * wouldn't be informed and if the next read is to a floppy then the BIOS - * will still think the motor is on and this will result in a read error. + * Set the code segment/offset (Copy entry point) + * NOTE: We permanently *ERASE* the contents of ds:[BSS_RealModeEntry] + * but it is not a problem since we are going to place the machine in + * a permanent new CPU state. */ - // call _DiskStopFloppyMotor - - /* Set the function ID */ - mov bx, FNID_ChainLoadBiosBootSectorCode + // Since BSS_RealModeEntry contains a ULONG, store in its high word + // the code segment and in its low word the code offset. + mov ax, word ptr [esp + 16] + shl eax, 16 + mov ax, word ptr [esp + 20] + mov dword ptr ds:[BSS_RealModeEntry], eax - /* Switch to real mode (we don't return) */ + /* Set the function ID and switch to real mode (we don't return) */ + mov bx, FNID_Relocator16Boot jmp SwitchToReal diff --git a/boot/freeldr/freeldr/arch/i386/i386rtl.c b/boot/freeldr/freeldr/arch/i386/i386rtl.c index 90da33db91c..e4ef701da52 100644 --- a/boot/freeldr/freeldr/arch/i386/i386rtl.c +++ b/boot/freeldr/freeldr/arch/i386/i386rtl.c @@ -88,3 +88,30 @@ void sound(int freq) WRITE_PORT_UCHAR((PUCHAR)0x42, scale >> 8); WRITE_PORT_UCHAR((PUCHAR)0x61, READ_PORT_UCHAR((PUCHAR)0x61) | 3); } + +VOID __cdecl ChainLoadBiosBootSectorCode( + IN UCHAR BootDrive OPTIONAL, + IN ULONG BootPartition OPTIONAL) +{ + REGS Regs; + + RtlZeroMemory(&Regs, sizeof(Regs)); + + /* Set the boot drive and the boot partition */ + Regs.b.dl = (UCHAR)(BootDrive ? BootDrive : FrldrBootDrive); + Regs.b.dh = (UCHAR)(BootPartition ? BootPartition : FrldrBootPartition); + + /* + * Don't stop the floppy drive motor when we are just booting a bootsector, + * a drive, or a partition. If we were to stop the floppy motor, the BIOS + * wouldn't be informed and if the next read is to a floppy then the BIOS + * will still think the motor is on and this will result in a read error. + */ + // DiskStopFloppyMotor(); + + Relocator16Boot(&Regs, + /* Stack segment:pointer */ + 0x0000, 0x7C00, + /* Code segment:pointer */ + 0x0000, 0x7C00); +} diff --git a/boot/freeldr/freeldr/arch/i386/linux.S b/boot/freeldr/freeldr/arch/i386/linux.S index d2b187cbf30..cc18346a17e 100644 --- a/boot/freeldr/freeldr/arch/i386/linux.S +++ b/boot/freeldr/freeldr/arch/i386/linux.S @@ -19,40 +19,121 @@ #include <asm.inc> #include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> EXTERN _DiskStopFloppyMotor:PROC -EXTERN i386CallRealMode:PROC +EXTERN _Relocator16Boot:PROC +EXTERN _FrldrBootDrive:BYTE +EXTERN _FrldrBootPartition:DWORD .code32 +Regs: + .space REGS_SIZE + /* - * VOID BootOldLinuxKernel(ULONG KernelSize); + * VOID __cdecl BootLinuxKernel( + * IN ULONG KernelSize, + * IN PVOID KernelCurrentLoadAddress, + * IN PVOID KernelTargetLoadAddress, + * IN UCHAR DriveNumber, + * IN ULONG PartitionNumber); */ -PUBLIC _BootOldLinuxKernel -_BootOldLinuxKernel: - - /* First we have to copy the kernel down from 0x100000 to 0x10000 */ - /* The reason we can overwrite low memory is because this code */ - /* executes between 0000:8000 and 0000:FFFF. That leaves space for */ - /* 32k of code before we start interfering with Linux kernel address space. */ - - /* Get KernelSize in ECX and move the kernel down */ - mov ecx, [esp + 4] - mov esi, HEX(100000) - mov edi, HEX(10000) - rep movsb +PUBLIC _BootLinuxKernel +_BootLinuxKernel: - /* Fall through */ - -PUBLIC _BootNewLinuxKernel -_BootNewLinuxKernel: /* Stop the floppy drive motor */ call _DiskStopFloppyMotor - mov bx, FNID_BootLinuxKernel - call i386CallRealMode + /* Set all segment registers to 0x9000 */ + mov ax, HEX(9000) + mov word ptr [Regs + REGS_DS], ax + mov word ptr [Regs + REGS_ES], ax + mov word ptr [Regs + REGS_FS], ax + mov word ptr [Regs + REGS_GS], ax + + /* Set the boot drive */ + xor edx, edx + mov dl, byte ptr [esp + 16] + test dl, dl + jnz set_part + mov dl, byte ptr ds:[_FrldrBootDrive] + + /* Set the boot partition */ +set_part: + mov eax, dword ptr [esp + 20] + test eax, eax + jnz continue + mov eax, dword ptr ds:[_FrldrBootPartition] +continue: + /* Store the 1-byte truncated partition number in DH */ + mov dh, al + + mov dword ptr [Regs + REGS_EDX], edx + + /* + * Relocate the kernel image to its final destination (can be as low as 0x10000). + * The reason we can overwrite low memory is because this code executes + * between 0000:8000 and 0000:FFFF. That leaves space for 32k of code + * before we start interfering with Linux kernel address space. + */ + + /* Get KernelSize in ECX */ + mov ecx, dword ptr [esp + 4] + test ecx, ecx // If size is zero, do not perform relocations + jz after_reloc + + /* Load the source and target addresses */ + mov esi, dword ptr [esp + 8] // HEX(100000) // LINUX_KERNEL_LOAD_ADDRESS + mov edi, dword ptr [esp + 12] // HEX(10000) + +// +// FIXME: Support relocating *upwards*, overlapping regions, aligned addresses, +// etc... !! See memmove code. +// + /* Check how we should perform relocation */ + cmp edi, esi + je after_reloc // target == source: do not perform relocations + ja reloc_up // target > source: relocate up +// jb reloc_down // target < source: relocate down (default) + +reloc_down: + /* Move the kernel down - Start with low addresses and increment them */ + cld +#if 0 + rep movsb +#else + mov edx, ecx // Copy the total number of bytes in EDX + and edx, HEX(0FFFFFFFC) // Number of bytes we copy using DWORDs + xor edx, ecx // Number of remaining bytes to copy after the DWORDs + shr ecx, 2 // Count number of DWORDs + rep movsd // Move DWORDs + mov ecx, edx // Count number of remaining bytes + rep movsb // Move bytes +#endif + jmp after_reloc + +reloc_up: + /* Move the kernel up - Start with high addresses and decrement them */ + std + add esi, ecx + add edi, ecx + dec esi + dec edi + rep movsb + // jmp after_reloc + +after_reloc: + + push HEX(0000) // CodePointer + push HEX(9020) // CodeSegment + push HEX(9000) // StackPointer + push HEX(9000) // StackSegment + mov eax, offset Regs + push eax + call _Relocator16Boot - /* We should never get here */ + /* We must never get there */ int 3 END diff --git a/boot/freeldr/freeldr/arch/powerpc/mach.c b/boot/freeldr/freeldr/arch/powerpc/mach.c index 840cbfa5657..e5a93d9403d 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mach.c +++ b/boot/freeldr/freeldr/arch/powerpc/mach.c @@ -533,11 +533,13 @@ void WRITE_PORT_UCHAR(PUCHAR Address, UCHAR Value) { SetPhysByte(((ULONG)Address)+0x80000000, Value); } -void BootOldLinuxKernel( unsigned long size ) { - ofw_exit(); -} - -void BootNewLinuxKernel() { +VOID __cdecl BootLinuxKernel( + IN ULONG KernelSize, + IN PVOID KernelCurrentLoadAddress, + IN PVOID KernelTargetLoadAddress, + IN UCHAR DriveNumber, + IN ULONG PartitionNumber) +{ ofw_exit(); } diff --git a/boot/freeldr/freeldr/arch/realmode/helpers.inc b/boot/freeldr/freeldr/arch/realmode/helpers.inc index 9fbe7366ebc..922cb8dfbd6 100644 --- a/boot/freeldr/freeldr/arch/realmode/helpers.inc +++ b/boot/freeldr/freeldr/arch/realmode/helpers.inc @@ -128,7 +128,7 @@ Reboot: ljmp16 HEX(0F000), HEX(0FFF0) -ChainLoadBiosBootSectorCode: +Relocator16Boot: cli /* Disable A20 address line */ @@ -138,14 +138,54 @@ ChainLoadBiosBootSectorCode: mov ax, HEX(0003) int HEX(10) - /* Load segment registers */ - xor ax, ax + /* Get current EFLAGS and mask CF, ZF and SF */ + pushf + pop cx + and cx, not (EFLAGS_CF or EFLAGS_ZF or EFLAGS_SF) + + /* Get flags CF, ZF and SF from the REGS structure */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_EFLAGS] + and ax, (EFLAGS_CF or EFLAGS_ZF or EFLAGS_SF) + + /* Combine flags and set them */ + or ax, cx + push ax + popf + + /* Setup the segment registers */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_DS] mov ds, ax + mov ax, word ptr cs:[BSS_RegisterSet + REGS_ES] mov es, ax + mov ax, word ptr cs:[BSS_RegisterSet + REGS_FS] mov fs, ax + mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] mov gs, ax - mov ss, ax - mov esp, HEX(7C00) - /* Jump to the bootsector code */ - ljmp16 HEX(0000), HEX(7C00) + /* Patch the jump address (segment:offset) */ + mov eax, dword ptr cs:[BSS_RealModeEntry] + mov dword ptr cs:[Relocator16Address], eax + + /* Switch the stack (segment:offset) */ + mov eax, dword ptr cs:[BSS_CallbackReturn] + shr eax, 16 + mov ss, ax + mov eax, dword ptr cs:[BSS_CallbackReturn] + and eax, HEX(0FFFF) + mov esp, eax + + /* Setup the registers */ + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] + mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] + mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] + mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] + mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] + mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] + // Don't setup ebp, we only use it as output! <-- FIXME! + + /* Jump to the new CS:IP (e.g. jump to bootsector code...) */ + .byte HEX(0EA) // ljmp16 segment:offset +Relocator16Address: + .word HEX(7C00) // Default offset + .word HEX(0000) // Default segment + nop diff --git a/boot/freeldr/freeldr/arch/realmode/i386.S b/boot/freeldr/freeldr/arch/realmode/i386.S index aaa261fdb70..f76a38ae464 100644 --- a/boot/freeldr/freeldr/arch/realmode/i386.S +++ b/boot/freeldr/freeldr/arch/realmode/i386.S @@ -8,7 +8,7 @@ .code16 -/* fat helper code */ +/* FAT helper code */ #include "fathelp.inc" .org 512 @@ -143,11 +143,10 @@ pm_entrypoint: CallbackTable: .word Int386 .word Reboot - .word ChainLoadBiosBootSectorCode + .word Relocator16Boot .word PxeCallApi .word PnpBiosGetDeviceNodeCount .word PnpBiosGetDeviceNode - .word BootLinuxKernel /* 16-bit stack pointer */ @@ -194,16 +193,16 @@ gdtptr: /* Real-mode IDT pointer */ rmode_idtptr: - .word HEX(3ff) /* Limit */ + .word HEX(3FF) /* Limit */ .long 0 /* Base Address */ #include "int386.inc" #include "helpers.inc" #include "pxe.inc" #include "pnp.inc" -#include "linux.inc" .org (FREELDR_PE_BASE - FREELDR_BASE - 1) .byte 0 .endcode16 + END diff --git a/boot/freeldr/freeldr/arch/realmode/int386.inc b/boot/freeldr/freeldr/arch/realmode/int386.inc index f8ab7039c96..49a63eb9e37 100644 --- a/boot/freeldr/freeldr/arch/realmode/int386.inc +++ b/boot/freeldr/freeldr/arch/realmode/int386.inc @@ -1,10 +1,6 @@ #include "../../include/arch/pc/pcbios.h" -#define EFLAGS_CF HEX(01) -#define EFLAGS_ZF HEX(40) -#define EFLAGS_SF HEX(80) - Int386: /* Save all registers + segment registers */ push ds diff --git a/boot/freeldr/freeldr/arch/realmode/linux.inc b/boot/freeldr/freeldr/arch/realmode/linux.inc deleted file mode 100644 index 8b0312fac0d..00000000000 --- a/boot/freeldr/freeldr/arch/realmode/linux.inc +++ /dev/null @@ -1,15 +0,0 @@ - -BootLinuxKernel: - // dl must be set to the boot drive - - /* Load segment registers */ - cli - mov bx, HEX(9000) - mov ds, bx - mov es, bx - mov fs, bx - mov gs, bx - mov ss, bx - mov sp, HEX(9000) - - ljmp16 HEX(9020), HEX(0000) diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index 82fbe4e9670..804932de9ea 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -1,6 +1,12 @@ #ifndef _PCBIOS_H_ #define _PCBIOS_H_ +#ifdef __ASM__ +#define EFLAGS_CF HEX(01) +#define EFLAGS_ZF HEX(40) +#define EFLAGS_SF HEX(80) +#endif + #ifndef __ASM__ #define MAX_BIOS_DESCRIPTORS 80 @@ -160,12 +166,19 @@ int __cdecl Int386(int ivec, REGS* in, REGS* out); // If CF is set then the call failed (usually) #define INT386_SUCCESS(regs) ((regs.x.eflags & EFLAGS_CF) == 0) -VOID __cdecl ChainLoadBiosBootSectorCode( // Implemented in boot.S +VOID __cdecl ChainLoadBiosBootSectorCode( IN UCHAR BootDrive OPTIONAL, IN ULONG BootPartition OPTIONAL); -VOID __cdecl Reboot(VOID); // Implemented in boot.S -VOID DetectHardware(VOID); // Implemented in hardware.c +VOID __cdecl Relocator16Boot( + IN REGS* In, + IN USHORT StackSegment, + IN USHORT StackPointer, + IN USHORT CodeSegment, + IN USHORT CodePointer); + +VOID __cdecl Reboot(VOID); +VOID DetectHardware(VOID); #endif /* ! __ASM__ */ diff --git a/boot/freeldr/freeldr/include/arch/pc/x86common.h b/boot/freeldr/freeldr/include/arch/pc/x86common.h index 1b40ca39058..e4c304bb38c 100644 --- a/boot/freeldr/freeldr/include/arch/pc/x86common.h +++ b/boot/freeldr/freeldr/include/arch/pc/x86common.h @@ -54,11 +54,10 @@ /* Realmode function IDs */ #define FNID_Int386 0 #define FNID_Reboot 1 -#define FNID_ChainLoadBiosBootSectorCode 2 +#define FNID_Relocator16Boot 2 #define FNID_PxeCallApi 3 -#define FNID_PnpBiosGetDeviceNodeCount 4 -#define FNID_PnpBiosGetDeviceNode 5 -#define FNID_BootLinuxKernel 6 +#define FNID_PnpBiosGetDeviceNodeCount 4 +#define FNID_PnpBiosGetDeviceNode 5 /* Flag Masks */ #define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ diff --git a/boot/freeldr/freeldr/include/linux.h b/boot/freeldr/freeldr/include/linux.h index d0b35105f2b..c51f70dab9f 100644 --- a/boot/freeldr/freeldr/include/linux.h +++ b/boot/freeldr/freeldr/include/linux.h @@ -128,8 +128,13 @@ typedef struct } LINUX_SETUPSECTOR, *PLINUX_SETUPSECTOR; #include <poppack.h> -VOID __cdecl BootNewLinuxKernel(VOID); // Implemented in linux.S -VOID __cdecl BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S +// Implemented in linux.S +VOID __cdecl BootLinuxKernel( + IN ULONG KernelSize, + IN PVOID KernelCurrentLoadAddress, + IN PVOID KernelTargetLoadAddress, + IN UCHAR DriveNumber, + IN ULONG PartitionNumber); ARC_STATUS LoadAndBootLinux( diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index 48ebf53f54c..fa9ad60d442 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -154,6 +154,17 @@ LoadAndBootLinux( } } + /* If we haven't retrieved the BIOS drive and partition numbers above, do it now */ + if (PartitionNumber == 0) + { + /* Retrieve the BIOS drive and partition numbers */ + if (!DissectArcPath(BootPath, NULL, &DriveNumber, &PartitionNumber)) + { + /* This is not a fatal failure, but just an inconvenience: display a message */ + TRACE("DissectArcPath(%s) failed to retrieve BIOS drive and partition numbers.\n", BootPath); + } + } + /* Get the kernel name */ LinuxKernelName = GetArgumentValue(Argc, Argv, "Kernel"); if (!LinuxKernelName || !*LinuxKernelName) @@ -259,11 +270,13 @@ LoadAndBootLinux( UiUnInitialize("Booting Linux..."); IniCleanup(); - if (LinuxSetupSector->LoadFlags & LINUX_FLAG_LOAD_HIGH) - BootNewLinuxKernel(); - else - BootOldLinuxKernel(LinuxKernelSize); - + BootLinuxKernel(LinuxKernelSize, LinuxKernelLoadAddress, + (LinuxSetupSector->LoadFlags & LINUX_FLAG_LOAD_HIGH) + ? (PVOID)LINUX_KERNEL_LOAD_ADDRESS /* == 0x100000 */ + : (PVOID)0x10000, + DriveNumber, PartitionNumber); + /* Must not return! */ + return ESUCCESS; LinuxBootFailed: @@ -407,11 +420,17 @@ static BOOLEAN LinuxReadKernel(ULONG LinuxKernelFile) RtlStringCbPrintfA(StatusText, sizeof(StatusText), "Loading %s", LinuxKernelName); UiDrawStatusText(StatusText); - /* Allocate memory for Linux kernel */ + /* Try to allocate memory for the Linux kernel; if it fails, allocate somewhere else */ LinuxKernelLoadAddress = MmAllocateMemoryAtAddress(LinuxKernelSize, (PVOID)LINUX_KERNEL_LOAD_ADDRESS, LoaderSystemCode); if (LinuxKernelLoadAddress != (PVOID)LINUX_KERNEL_LOAD_ADDRESS) { - return FALSE; + /* It's OK, let's allocate again somewhere else */ + LinuxKernelLoadAddress = MmAllocateMemoryWithType(LinuxKernelSize, LoaderSystemCode); + if (LinuxKernelLoadAddress == NULL) + { + TRACE("Failed to allocate 0x%lx bytes for the kernel image.\n", LinuxKernelSize); + return FALSE; + } } LoadAddress = LinuxKernelLoadAddress;

4 years, 11 months

[reactos] 01/05: [SDK:CRT] For intrinsics that don't exist on MSVC 2010 we cannot use an implementation in inlined ASM for x64 builds.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=912268762eb3287ba2866… commit 912268762eb3287ba286615fa1b1c3bd0c04336b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 6 15:41:30 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 7 02:54:05 2019 +0200 [SDK:CRT] For intrinsics that don't exist on MSVC 2010 we cannot use an implementation in inlined ASM for x64 builds. --- sdk/include/crt/msc/intrin.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/include/crt/msc/intrin.h b/sdk/include/crt/msc/intrin.h index 305280bec9a..5fd30019174 100644 --- a/sdk/include/crt/msc/intrin.h +++ b/sdk/include/crt/msc/intrin.h @@ -268,6 +268,7 @@ extern "C" { #if (_MSC_VER >= 1700) #pragma intrinsic(__fastfail) #else +#if defined(_M_IX86) __declspec(noreturn) __forceinline void __fastfail(unsigned int Code) { @@ -277,6 +278,9 @@ void __fastfail(unsigned int Code) int 29h } } +#else +void __fastfail(unsigned int Code); +#endif // defined(_M_IX86) #endif #endif #if defined(_M_ARM) @@ -341,6 +345,7 @@ void __forceinline __invlpg_fixed(void * Address) #if (_MSC_VER >= 1800) #pragma intrinsic(_sgdt) #else +#if defined(_M_IX86) __forceinline void _sgdt(void *Destination) { @@ -350,6 +355,9 @@ void _sgdt(void *Destination) sgdt [eax] } } +#else +void _sgdt(void *Destination); +#endif // defined(_M_IX86) #endif #pragma intrinsic(_mm_pause) #endif

4 years, 11 months

[reactos] 01/01: [SYSSETUP][NETCFGX][INF] Install the TCPIP protocol driver properly

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80db055135221c2a54db8… commit 80db055135221c2a54db80aee018c2badcedc100 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 6 22:36:19 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 6 22:36:19 2019 +0200 [SYSSETUP][NETCFGX][INF] Install the TCPIP protocol driver properly Get rid of the special RandomProtocolGUID_TCPIP :-) Works with the Setup CD and Live CD. --- dll/win32/netcfgx/inetcfgcomp_iface.c | 7 +- dll/win32/syssetup/CMakeLists.txt | 3 +- dll/win32/syssetup/globals.h | 6 + dll/win32/syssetup/install.c | 95 +----- dll/win32/syssetup/netinstall.c | 528 ++++++++++++++++++++++++++++++++++ media/inf/nettcpip.inf | 22 +- 6 files changed, 561 insertions(+), 100 deletions(-) diff --git a/dll/win32/netcfgx/inetcfgcomp_iface.c b/dll/win32/netcfgx/inetcfgcomp_iface.c index 9e26208ea61..c4204291edb 100644 --- a/dll/win32/netcfgx/inetcfgcomp_iface.c +++ b/dll/win32/netcfgx/inetcfgcomp_iface.c @@ -503,7 +503,7 @@ CreateNotificationObject( HRESULT hr; LONG lRet; CLSID ClassGUID; - //CLSID InstanceGUID; + CLSID InstanceGUID; wcscpy(szName,L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); @@ -521,7 +521,6 @@ CreateNotificationObject( wcscat(szName, L"\\"); /* get the Instance GUID */ -#if 0 hr = INetCfgComponent_GetInstanceGuid(iface, &InstanceGUID); if (FAILED(hr)) return hr; @@ -532,10 +531,6 @@ CreateNotificationObject( wcscat(szName, pStr); CoTaskMemFree(pStr); -#else - // HACK HACK HACK HACK HACK - wcscat(szName, L"{RandomProtocolGUID_TCPIP}"); -#endif wcscat(szName, L"\\NDI"); diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index ab1ab4db45a..e3b44d1e6b7 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -6,6 +6,7 @@ list(APPEND SOURCE dllmain.c install.c logfile.c + netinstall.c proppage.c security.c wizard.c @@ -20,5 +21,5 @@ add_library(syssetup MODULE add_pch(syssetup precomp.h SOURCE) set_module_type(syssetup win32dll UNICODE) target_link_libraries(syssetup uuid wine ${PSEH_LIB}) -add_importlibs(syssetup advapi32 gdi32 user32 samlib userenv comctl32 setupapi ole32 shell32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(syssetup advapi32 gdi32 user32 samlib userenv comctl32 setupapi rpcrt4 ole32 shell32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET syssetup DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/syssetup/globals.h b/dll/win32/syssetup/globals.h index 38c1cd37dbc..8c020acefb3 100644 --- a/dll/win32/syssetup/globals.h +++ b/dll/win32/syssetup/globals.h @@ -31,6 +31,12 @@ extern ADMIN_INFO AdminInfo; BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); +/* netinstall.c */ + +BOOL +InstallNetworkComponent( + _In_ PWSTR pszComponentId); + /* security.c */ VOID InstallSecurity(VOID); diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index fa1d52b8a18..7ce1aaa3ffa 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -734,70 +734,6 @@ Exit: return bResult; } -/* Install a section of a .inf file - * Returns TRUE if success, FALSE if failure. Error code can - * be retrieved with GetLastError() - */ -static -BOOL -InstallInfSection( - IN HWND hWnd, - IN LPCWSTR InfFile, - IN LPCWSTR InfSection OPTIONAL, - IN LPCWSTR InfService OPTIONAL) -{ - WCHAR Buffer[MAX_PATH]; - HINF hInf = INVALID_HANDLE_VALUE; - UINT BufferSize; - PVOID Context = NULL; - BOOL ret = FALSE; - - /* Get Windows directory */ - BufferSize = ARRAYSIZE(Buffer) - 5 - wcslen(InfFile); - if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) - { - /* Function failed */ - SetLastError(ERROR_GEN_FAILURE); - goto cleanup; - } - /* We have enough space to add some information in the buffer */ - if (Buffer[wcslen(Buffer) - 1] != '\\') - wcscat(Buffer, L"\\"); - wcscat(Buffer, L"Inf\\"); - wcscat(Buffer, InfFile); - - /* Install specified section */ - hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); - if (hInf == INVALID_HANDLE_VALUE) - goto cleanup; - - Context = SetupInitDefaultQueueCallback(hWnd); - if (Context == NULL) - goto cleanup; - - ret = TRUE; - if (ret && InfSection) - { - ret = SetupInstallFromInfSectionW( - hWnd, hInf, - InfSection, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, Context, - NULL, NULL); - } - if (ret && InfService) - { - ret = SetupInstallServicesFromInfSectionW(hInf, InfService, 0); - } - -cleanup: - if (Context) - SetupTermDefaultQueueCallback(Context); - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); - return ret; -} - static DWORD InstallLiveCD(VOID) @@ -806,14 +742,14 @@ InstallLiveCD(VOID) PROCESS_INFORMATION ProcessInformation; BOOL bRes; - /* Hack: Install TCP/IP protocol driver */ - bRes = InstallInfSection(NULL, - L"nettcpip.inf", - L"MS_TCPIP.PrimaryInstall", - L"MS_TCPIP.PrimaryInstall.Services"); + if (!CommonInstall()) + goto error; + + /* Install the TCP/IP protocol driver */ + bRes = InstallNetworkComponent(L"MS_TCPIP"); if (!bRes && GetLastError() != ERROR_FILE_NOT_FOUND) { - DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); + DPRINT("InstallNetworkComponent() failed with error 0x%lx\n", GetLastError()); } else { @@ -822,9 +758,6 @@ InstallLiveCD(VOID) SetupStartService(L"Dhcp", FALSE); } - if (!CommonInstall()) - goto error; - /* Register components */ _SEH2_TRY { @@ -1327,14 +1260,14 @@ InstallReactOS(VOID) hHotkeyThread = CreateThread(NULL, 0, HotkeyThread, NULL, 0, NULL); - /* Hack: Install TCP/IP protocol driver */ - ret = InstallInfSection(NULL, - L"nettcpip.inf", - L"MS_TCPIP.PrimaryInstall", - L"MS_TCPIP.PrimaryInstall.Services"); + if (!CommonInstall()) + return 0; + + /* Install the TCP/IP protocol driver */ + ret = InstallNetworkComponent(L"MS_TCPIP"); if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND) { - DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError()); + DPRINT("InstallNetworkComponent() failed with error 0x%lx\n", GetLastError()); } else { @@ -1343,10 +1276,6 @@ InstallReactOS(VOID) SetupStartService(L"Dhcp", FALSE); } - - if (!CommonInstall()) - return 0; - InstallWizard(); InstallSecurity(); diff --git a/dll/win32/syssetup/netinstall.c b/dll/win32/syssetup/netinstall.c new file mode 100644 index 00000000000..b18fbc74fb5 --- /dev/null +++ b/dll/win32/syssetup/netinstall.c @@ -0,0 +1,528 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: System setup + * FILE: dll/win32/syssetup/netinstall.c + * PROGRAMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include <rpc.h> + +#define NDEBUG +#include <debug.h> + +typedef struct _COMPONENT_INFO +{ + PWSTR pszInfPath; + PWSTR pszInfSection; + PWSTR pszComponentId; + PWSTR pszDescription; + PWSTR pszClassGuid; + DWORD dwCharacteristics; +} COMPONENT_INFO, *PCOMPONENT_INFO; + + +/* GLOBALS ******************************************************************/ + + +/* FUNCTIONS ****************************************************************/ + +static +BOOL +InstallInfSections( + _In_ HWND hWnd, + _In_ HKEY hKey, + _In_ LPCWSTR InfFile, + _In_ LPCWSTR InfSection) +{ + WCHAR Buffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + UINT BufferSize; + PVOID Context = NULL; + BOOL ret = FALSE; + + DPRINT("InstallInfSections()\n"); + + if (InfSection == NULL) + return FALSE; + + /* Get Windows directory */ + BufferSize = ARRAYSIZE(Buffer) - 5 - wcslen(InfFile); + if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize) + { + /* Function failed */ + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + + /* We have enough space to add some information in the buffer */ + if (Buffer[wcslen(Buffer) - 1] != '\\') + wcscat(Buffer, L"\\"); + wcscat(Buffer, L"Inf\\"); + wcscat(Buffer, InfFile); + + /* Install specified section */ + hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL); + if (hInf == INVALID_HANDLE_VALUE) + goto cleanup; + + Context = SetupInitDefaultQueueCallback(hWnd); + if (Context == NULL) + goto cleanup; + + ret = SetupInstallFromInfSectionW( + hWnd, hInf, + InfSection, SPINST_ALL, + hKey, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, Context, + NULL, NULL); + if (ret == FALSE) + { + DPRINT1("SetupInstallFromInfSectionW(%S) failed (Error %lx)\n", InfSection, GetLastError()); + goto cleanup; + } + + wcscpy(Buffer, InfSection); + wcscat(Buffer, L".Services"); + + ret = SetupInstallServicesFromInfSectionW(hInf, Buffer, 0); + if (ret == FALSE) + { + DPRINT1("SetupInstallServicesFromInfSectionW(%S) failed (Error %lx)\n", Buffer, GetLastError()); + goto cleanup; + } + +cleanup: + if (Context) + SetupTermDefaultQueueCallback(Context); + + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + + DPRINT("InstallInfSections() done %u\n", ret); + + return ret; +} + + +static +BOOL +CreateInstanceKey( + _In_ PCOMPONENT_INFO pComponentInfo, + _Out_ PHKEY pInstanceKey) +{ + WCHAR szKeyBuffer[128]; + LPWSTR UuidString = NULL; + UUID Uuid; + RPC_STATUS RpcStatus; + HKEY hInstanceKey; + DWORD rc; + BOOL ret = FALSE; + + DPRINT("CreateInstanceKey()\n"); + + *pInstanceKey = NULL; + + wcscpy(szKeyBuffer, L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); + wcscat(szKeyBuffer, pComponentInfo->pszClassGuid); + wcscat(szKeyBuffer, L"\\{"); + + /* Create a new UUID */ + RpcStatus = UuidCreate(&Uuid); + if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) + { + DPRINT1("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); + goto done; + } + + RpcStatus = UuidToStringW(&Uuid, &UuidString); + if (RpcStatus != RPC_S_OK) + { + DPRINT1("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); + goto done; + } + + wcscat(szKeyBuffer, UuidString); + wcscat(szKeyBuffer, L"}"); + + RpcStringFreeW(&UuidString); + + DPRINT("szKeyBuffer %S\n", szKeyBuffer); + + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szKeyBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + NULL, + &hInstanceKey, + NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"Characteristics", + 0, + REG_DWORD, + (LPBYTE)&pComponentInfo->dwCharacteristics, + sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"ComponentId", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszComponentId, + (wcslen(pComponentInfo->pszComponentId) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"Description", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszDescription, + (wcslen(pComponentInfo->pszDescription) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"InfPath", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszInfPath, + (wcslen(pComponentInfo->pszInfPath) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + rc = RegSetValueExW(hInstanceKey, + L"InfSection", + 0, + REG_SZ, + (LPBYTE)pComponentInfo->pszInfSection, + (wcslen(pComponentInfo->pszInfSection) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + goto done; + } + + *pInstanceKey = hInstanceKey; + ret = TRUE; + +done: + if (ret == FALSE) + RegCloseKey(hInstanceKey); + + DPRINT("CreateInstanceKey() done %u\n", ret); + + return ret; +} + + +static +BOOL +CheckInfFile( + _In_ PWSTR pszFullInfName, + _In_ PWSTR pszComponentId, + _In_ PCOMPONENT_INFO pComponentInfo) +{ + WCHAR szLineBuffer[MAX_PATH]; + HINF hInf = INVALID_HANDLE_VALUE; + INFCONTEXT MfgContext, DevContext, MiscContext; + DWORD dwLength; + + hInf = SetupOpenInfFileW(pszFullInfName, + NULL, + INF_STYLE_WIN4, + NULL); + if (hInf == INVALID_HANDLE_VALUE) + { + DPRINT1("\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(hInf, + L"Manufacturer", + NULL, + &MfgContext)) + { + DPRINT("No Manufacurer section found!\n"); + goto done; + } + + for (;;) + { + if (!SetupGetStringFieldW(&MfgContext, + 1, + szLineBuffer, + MAX_PATH, + NULL)) + break; + + DPRINT("Manufacturer: %S\n", szLineBuffer); + if (!SetupFindFirstLineW(hInf, + szLineBuffer, + NULL, + &DevContext)) + break; + + for (;;) + { + if (!SetupGetStringFieldW(&DevContext, + 2, + szLineBuffer, + MAX_PATH, + NULL)) + break; + + DPRINT("Device: %S\n", szLineBuffer); + if (_wcsicmp(szLineBuffer, pszComponentId) == 0) + { + DPRINT("Found it!\n"); + + /* Get the section name*/ + SetupGetStringFieldW(&DevContext, + 1, + NULL, + 0, + &dwLength); + + pComponentInfo->pszInfSection = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszInfSection) + { + SetupGetStringFieldW(&DevContext, + 1, + pComponentInfo->pszInfSection, + dwLength, + &dwLength); + } + + /* Get the description*/ + SetupGetStringFieldW(&DevContext, + 0, + NULL, + 0, + &dwLength); + + pComponentInfo->pszDescription = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszDescription) + { + SetupGetStringFieldW(&DevContext, + 0, + pComponentInfo->pszDescription, + dwLength, + &dwLength); + } + + /* Get the class GUID */ + if (SetupFindFirstLineW(hInf, + L"Version", + L"ClassGuid", + &MiscContext)) + { + SetupGetStringFieldW(&MiscContext, + 1, + NULL, + 0, + &dwLength); + + pComponentInfo->pszClassGuid = HeapAlloc(GetProcessHeap(), + 0, + dwLength * sizeof(WCHAR)); + if (pComponentInfo->pszInfSection) + { + SetupGetStringFieldW(&MiscContext, + 1, + pComponentInfo->pszClassGuid, + dwLength, + &dwLength); + } + } + + /* Get the Characteristics value */ + if (SetupFindFirstLineW(hInf, + pComponentInfo->pszInfSection, + L"Characteristics", + &MiscContext)) + { + SetupGetIntField(&MiscContext, + 1, + (PINT)&pComponentInfo->dwCharacteristics); + } + + SetupCloseInfFile(hInf); + return TRUE; + } + + if (!SetupFindNextLine(&DevContext, &DevContext)) + break; + } + + if (!SetupFindNextLine(&MfgContext, &MfgContext)) + break; + } + +done: + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); + + return FALSE; +} + + +static +BOOL +ScanForInfFile( + _In_ PWSTR pszComponentId, + _In_ PCOMPONENT_INFO pComponentInfo) +{ + WCHAR szInfPath[MAX_PATH]; + WCHAR szFullInfName[MAX_PATH]; + WCHAR szPathBuffer[MAX_PATH]; + WIN32_FIND_DATAW fdw; + HANDLE hFindFile = INVALID_HANDLE_VALUE; + BOOL bFound = FALSE; + + GetWindowsDirectoryW(szInfPath, MAX_PATH); + wcscat(szInfPath, L"\\inf"); + + wcscpy(szPathBuffer, szInfPath); + wcscat(szPathBuffer, L"\\*.inf"); + + hFindFile = FindFirstFileW(szPathBuffer, &fdw); + if (hFindFile == INVALID_HANDLE_VALUE) + return FALSE; + + for (;;) + { + if (wcscmp(fdw.cFileName, L".") == 0 || + wcscmp(fdw.cFileName, L"..") == 0) + continue; + + DPRINT("FileName: %S\n", fdw.cFileName); + + wcscpy(szFullInfName, szInfPath); + wcscat(szFullInfName, L"\\"); + wcscat(szFullInfName, fdw.cFileName); + + DPRINT("Full Inf Name: %S\n", szFullInfName); + if (CheckInfFile(szFullInfName, + pszComponentId, + pComponentInfo)) + { + pComponentInfo->pszInfPath = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(fdw.cFileName) + 1) * sizeof(WCHAR)); + if (pComponentInfo->pszInfPath) + wcscpy(pComponentInfo->pszInfPath, fdw.cFileName); + + pComponentInfo->pszComponentId = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(pszComponentId) + 1) * sizeof(WCHAR)); + if (pComponentInfo->pszComponentId) + wcscpy(pComponentInfo->pszComponentId, pszComponentId); + + bFound = TRUE; + break; + } + + if (!FindNextFileW(hFindFile, &fdw)) + break; + } + + if (hFindFile != INVALID_HANDLE_VALUE) + FindClose(hFindFile); + + return bFound; +} + + +BOOL +InstallNetworkComponent( + _In_ PWSTR pszComponentId) +{ + COMPONENT_INFO ComponentInfo; + HKEY hInstanceKey = NULL; + BOOL bResult = FALSE; + + DPRINT("InstallNetworkComponent(%S)\n", pszComponentId); + + ZeroMemory(&ComponentInfo, sizeof(COMPONENT_INFO)); + + if (!ScanForInfFile(pszComponentId, &ComponentInfo)) + goto done; + + DPRINT("Characteristics: 0x%lx\n", ComponentInfo.dwCharacteristics); + DPRINT("ComponentId: %S\n", ComponentInfo.pszComponentId); + DPRINT("Description: %S\n", ComponentInfo.pszDescription); + DPRINT("InfPath: %S\n", ComponentInfo.pszInfPath); + DPRINT("InfSection: %S\n", ComponentInfo.pszInfSection); + DPRINT("ClassGuid: %S\n", ComponentInfo.pszClassGuid); + + if (!CreateInstanceKey(&ComponentInfo, + &hInstanceKey)) + { + DPRINT1("CreateInstanceKey() failed (Error %lx)\n", GetLastError()); + goto done; + } + + if (!InstallInfSections(NULL, + hInstanceKey, + ComponentInfo.pszInfPath, + ComponentInfo.pszInfSection)) + { + DPRINT1("InstallInfSections() failed (Error %lx)\n", GetLastError()); + goto done; + } + + bResult = TRUE; + +done: + if (hInstanceKey != NULL) + RegCloseKey(hInstanceKey); + + if (ComponentInfo.pszInfPath) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszInfPath); + + if (ComponentInfo.pszInfSection) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszInfSection); + + if (ComponentInfo.pszComponentId) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszComponentId); + + if (ComponentInfo.pszDescription) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszDescription); + + if (ComponentInfo.pszClassGuid) + HeapFree(GetProcessHeap(), 0, ComponentInfo.pszClassGuid); + + return bResult; +} + +/* EOF */ diff --git a/media/inf/nettcpip.inf b/media/inf/nettcpip.inf index eb21c968b17..eaf1b7cc9eb 100644 --- a/media/inf/nettcpip.inf +++ b/media/inf/nettcpip.inf @@ -11,22 +11,23 @@ ClassGUID = {4D36E975-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% DriverVer = 04/12/2006,1.00 +[Manufacturer] +%ReactOS% = ReactOS + +[ReactOS] +%MS_TCPIP.DisplayName% = MS_TCPIP.PrimaryInstall, MS_TCPIP + ;----------------------------- TCP/IPv4 DRIVER ---------------------------- [MS_TCPIP.PrimaryInstall] +Characteristics = 0xA0 AddReg = TCPIP_AddReg_Global.NT [TCPIP_AddReg_Global.NT] -; The following entries should be generated from .inf files during installation -; TCPIPv4 Protocol -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol Version 4 (TCP/IPv4)" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" -HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip" +HKR,"Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" +HKR,"Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" +HKR,"Ndi","Service",0x00000000,"Tcpip" +HKR,"Ndi","CoServices",0x00010000,"Tcpip","Dhcp" ; TCP/IPv4 driver ; NOTE: These settings should be added by the network setup @@ -278,6 +279,7 @@ HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll" [Strings] ReactOS = "ReactOS Team" +MS_TCPIP.DisplayName = "Internet Protocol Version 4 (TCP/IPv4)" [Strings.0a] ReactOS = "Equipo de ReactOS"

4 years, 11 months

[reactos] 02/02: [FREELDR] NT loader: Allocate the Loader Block Extension much earlier in the process.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d1a6b2db9e97ee046e6a… commit 2d1a6b2db9e97ee046e6ab60aae8f2625ea81c2b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 6 18:24:48 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 6 18:24:48 2019 +0200 [FREELDR] NT loader: Allocate the Loader Block Extension much earlier in the process. --- boot/freeldr/freeldr/ntldr/setupldr.c | 16 ++++++---- boot/freeldr/freeldr/ntldr/winldr.c | 59 +++++++++++++++++++++-------------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 71d395c46f1..1d87f082b57 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -17,7 +17,10 @@ DBG_DEFAULT_CHANNEL(WINDOWS); #define TAG_BOOT_OPTIONS 'pOtB' // TODO: Move to .h -VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); +VOID +AllocateAndInitLPB( + IN USHORT VersionToBoot, + OUT PLOADER_PARAMETER_BLOCK* OutLoaderBlock); static VOID SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, PCSTR SearchPath) @@ -79,6 +82,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, PCSTR S static BOOLEAN SetupLdrInitErrataInf( + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN HINF InfHandle, IN PCSTR SystemRoot) { @@ -111,8 +115,8 @@ SetupLdrInitErrataInf( return FALSE; } - WinLdrSystemBlock->Extension.EmInfFileImage = PaToVa(PhysicalBase); - WinLdrSystemBlock->Extension.EmInfFileSize = FileSize; + LoaderBlock->Extension->EmInfFileImage = PaToVa(PhysicalBase); + LoaderBlock->Extension->EmInfFileSize = FileSize; return TRUE; } @@ -350,8 +354,8 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions); - /* Allocate and minimalist-initialize LPB */ - AllocateAndInitLPB(&LoaderBlock); + /* Allocate and minimally-initialize the Loader Parameter Block */ + AllocateAndInitLPB(_WIN32_WINNT_WS03, &LoaderBlock); /* Allocate and initialize setup loader block */ SetupBlock = &WinLdrSystemBlock->SetupBlock; @@ -375,7 +379,7 @@ LoadReactOSSetup( SetupLdrLoadNlsData(LoaderBlock, InfHandle, FileName); /* Load the Firmware Errata file from the installation medium */ - Success = SetupLdrInitErrataInf(InfHandle, BootPath); + Success = SetupLdrInitErrataInf(LoaderBlock, InfHandle, BootPath); TRACE("Firmware Errata file %s\n", (Success ? "loaded" : "not loaded")); /* Not necessarily fatal if not found - carry on going */ diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index e8a7d38df91..5eeff108e55 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -31,11 +31,14 @@ VOID DumpMemoryAllocMap(VOID); // Init "phase 0" VOID -AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) +AllocateAndInitLPB( + IN USHORT VersionToBoot, + OUT PLOADER_PARAMETER_BLOCK* OutLoaderBlock) { PLOADER_PARAMETER_BLOCK LoaderBlock; + PLOADER_PARAMETER_EXTENSION Extension; - /* Allocate and zero-init the LPB */ + /* Allocate and zero-init the Loader Parameter Block */ WinLdrSystemBlock = MmAllocateMemoryWithType(sizeof(LOADER_SYSTEM_BLOCK), LoaderSystemBlock); if (WinLdrSystemBlock == NULL) @@ -49,6 +52,13 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) LoaderBlock = &WinLdrSystemBlock->LoaderBlock; LoaderBlock->NlsData = &WinLdrSystemBlock->NlsDataBlock; + /* Initialize the Loader Block Extension */ + Extension = &WinLdrSystemBlock->Extension; + LoaderBlock->Extension = Extension; + Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); + Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; + Extension->MinorVersion = (VersionToBoot & 0xFF); + /* Init three critical lists, used right away */ InitializeListHead(&LoaderBlock->LoadOrderListHead); InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); @@ -99,16 +109,16 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, // SetupBlock->ArcSetupDeviceName must be the path to the setup **SOURCE**, // and not the setup boot path. Indeed they may differ!! // - /* If we have a setup block, adjust also its ARC path */ if (LoaderBlock->SetupLdrBlock) { PSETUP_LOADER_BLOCK SetupBlock = LoaderBlock->SetupLdrBlock; - /* Matches ArcBoot path */ + /* Adjust the ARC path in the setup block - Matches ArcBoot path */ SetupBlock->ArcSetupDeviceName = WinLdrSystemBlock->ArcBootDeviceName; SetupBlock->ArcSetupDeviceName = PaToVa(SetupBlock->ArcSetupDeviceName); - /* Note: LoaderBlock->SetupLdrBlock is PaToVa'ed at the end of this function */ + /* Convert the setup block pointer */ + LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); } /* Fill ARC HalDevice, it matches ArcBoot path */ @@ -162,7 +172,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, &ArcDiskSig->DiskSignature.ListEntry); } - /* Convert all list's to Virtual address */ + /* Convert all lists to Virtual address */ /* Convert the ArcDisks list to virtual address */ List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); @@ -181,11 +191,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, /* Convert list of boot drivers */ List_PaToVa(&LoaderBlock->BootDriverListHead); - /* Initialize Extension now */ - Extension = &WinLdrSystemBlock->Extension; - Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); - Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; - Extension->MinorVersion = VersionToBoot & 0xFF; + Extension = LoaderBlock->Extension; + + /* FIXME! HACK value for docking profile */ Extension->Profile.Status = 2; /* Check if FreeLdr detected a ACPI table */ @@ -214,11 +222,8 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, &Extension->DrvDBSize, LoaderRegistryData)); - /* Convert extension and setup block pointers */ - LoaderBlock->Extension = PaToVa(Extension); - - if (LoaderBlock->SetupLdrBlock) - LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); + /* Convert the extension block pointer */ + LoaderBlock->Extension = PaToVa(LoaderBlock->Extension); TRACE("WinLdrInitializePhase1() completed\n"); } @@ -654,6 +659,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, static BOOLEAN WinLdrInitErrataInf( + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN USHORT OperatingSystemVersion, IN PCSTR SystemRoot) { @@ -706,8 +712,8 @@ WinLdrInitErrataInf( return FALSE; } - WinLdrSystemBlock->Extension.EmInfFileImage = PaToVa(PhysicalBase); - WinLdrSystemBlock->Extension.EmInfFileSize = FileSize; + LoaderBlock->Extension->EmInfFileImage = PaToVa(PhysicalBase); + LoaderBlock->Extension->EmInfFileSize = FileSize; return TRUE; } @@ -864,8 +870,8 @@ LoadAndBootWindows( /* Let user know we started loading */ //UiDrawStatusText("Loading..."); - /* Allocate and minimalist-initialize LPB */ - AllocateAndInitLPB(&LoaderBlock); + /* Allocate and minimally-initialize the Loader Parameter Block */ + AllocateAndInitLPB(OperatingSystemVersion, &LoaderBlock); /* Load the system hive */ UiDrawBackdrop(); @@ -876,6 +882,12 @@ LoadAndBootWindows( if (!Success) return ENOEXEC; + /* Fixup the version number using data from the registry */ + if (OperatingSystemVersion == 0) + OperatingSystemVersion = WinLdrDetectVersion(); + LoaderBlock->Extension->MajorVersion = (OperatingSystemVersion & 0xFF00) >> 8; + LoaderBlock->Extension->MinorVersion = (OperatingSystemVersion & 0xFF); + /* Load NLS data, OEM font, and prepare boot drivers list */ Success = WinLdrScanSystemHive(LoaderBlock, BootPath); TRACE("SYSTEM hive %s\n", (Success ? "scanned" : "not scanned")); @@ -884,7 +896,7 @@ LoadAndBootWindows( return ENOEXEC; /* Load the Firmware Errata file */ - Success = WinLdrInitErrataInf(OperatingSystemVersion, BootPath); + Success = WinLdrInitErrataInf(LoaderBlock, OperatingSystemVersion, BootPath); TRACE("Firmware Errata file %s\n", (Success ? "loaded" : "not loaded")); /* Not necessarily fatal if not found - carry on going */ @@ -912,6 +924,8 @@ LoadAndBootWindowsCommon( TRACE("LoadAndBootWindowsCommon()\n"); + ASSERT(OperatingSystemVersion != 0); + #ifdef _M_IX86 /* Setup redirection support */ WinLdrSetupEms((PCHAR)BootOptions); @@ -925,9 +939,6 @@ LoadAndBootWindowsCommon( UiDrawProgressBarCenter(20, 100, "Detecting hardware..."); LoaderBlock->ConfigurationRoot = MachHwDetect(); - if (OperatingSystemVersion == 0) - OperatingSystemVersion = WinLdrDetectVersion(); - /* Load the operating system core: the Kernel, the HAL and the Kernel Debugger Transport DLL */ Success = LoadWindowsCore(OperatingSystemVersion, LoaderBlock,

4 years, 11 months

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 2019