Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[sginsberg] 69040: Nothing to see here move along
by sginsberg＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: sginsberg Date: Sat Sep 5 19:50:14 2015 New Revision: 69040 URL: http://svn.reactos.org/svn/reactos?rev=69040&view=rev Log: Nothing to see here move along Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Sep 5 19:50:14 2015 @@ -4,7 +4,7 @@ #pragma once -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_MINIHAL_) #define INIT_SECTION __attribute__((section ("INIT"))) #else #define INIT_SECTION /* Done via alloc_text for MSC */

1 0

[ion] 69039: [BOOTMGFW]: Add support for converting the EFI file path as well. The first 1000 lines of many have been written. Time to test on Virtual Box.
by ion＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: ion Date: Sat Sep 5 19:38:20 2015 New Revision: 69039 URL: http://svn.reactos.org/svn/reactos?rev=69039&view=rev Log: [BOOTMGFW]: Add support for converting the EFI file path as well. The first 1000 lines of many have been written. Time to test on Virtual Box. Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Sat Sep 5 19:38:20 2015 @@ -72,6 +72,115 @@ } /*++ + * @name EfiInitpAppendPathString + * + * The EfiInitpAppendPathString routine + * + * @param DestinationPath + * UEFI Image Handle for the current loaded application. + * + * @param RemainingSize + * Pointer to the UEFI System Table. + * + * @param AppendPath + * Pointer to the UEFI System Table. + * + * @param AppendLength + * Pointer to the UEFI System Table. + * + * @param BytesAppended + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ +NTSTATUS +EfiInitpAppendPathString ( + _In_ PWCHAR PathString, + _In_ ULONG MaximumLength, + _In_ PWCHAR NewPathString, + _In_ ULONG NewPathLength, + _Out_ PULONG ResultLength + ) +{ + NTSTATUS Status; + ULONG FinalPathLength; + + /* We deal in Unicode, validate the length */ + if (NewPathLength & 1) + { + return STATUS_INVALID_PARAMETER; + } + + /* Is the new element at least a character? */ + Status = STATUS_SUCCESS; + if (NewPathLength >= sizeof(WCHAR)) + { + /* Is the last character already a NULL character? */ + if (NewPathString[(NewPathLength - sizeof(WCHAR)) / sizeof(WCHAR)] == + UNICODE_NULL) + { + /* Then we won't need to count it */ + NewPathLength -= sizeof(UNICODE_NULL); + } + + /* Was it more than just a NULL character? */ + if (NewPathLength >= sizeof(WCHAR)) + { + /* Yep -- but does it have a separator? */ + if (*NewPathString == OBJ_NAME_PATH_SEPARATOR) + { + /* Skip it, we'll add our own later */ + NewPathString++; + NewPathLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Was it more than just a separator? */ + if (NewPathLength >= sizeof(WCHAR)) + { + /* Yep -- but does it end with a separator? */ + if (NewPathString[(NewPathLength - sizeof(WCHAR)) / sizeof(WCHAR)] == + OBJ_NAME_PATH_SEPARATOR) + { + /* That's something else we won't need for now */ + NewPathLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + } + } + } + + /* Check if anything needs to be appended after all */ + if (NewPathLength != 0) + { + /* We will append the length of the new path element, plus a separator */ + FinalPathLength = NewPathLength + sizeof(OBJ_NAME_PATH_SEPARATOR); + if (MaximumLength >= FinalPathLength) + { + /* Add a separator to the existing path*/ + *PathString = OBJ_NAME_PATH_SEPARATOR; + + /* Followed by the new path element */ + RtlCopyMemory(PathString + 1, NewPathString, NewPathLength); + + /* Return the number of bytes appended */ + *ResultLength = FinalPathLength; + } + else + { + /* There's not enough space to do this */ + Status = STATUS_BUFFER_TOO_SMALL; + } + } + else + { + /* Nothing to append */ + *ResultLength = 0; + } + + return Status; +} + +/*++ * @name EfiInitpConvertEfiDevicePath * * The EfiInitpConvertEfiDevicePath routine @@ -93,13 +202,97 @@ *--*/ NTSTATUS EfiInitpConvertEfiFilePath ( - _In_ EFI_DEVICE_PATH_PROTOCOL *FilePath, + _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath, _In_ ULONG PathType, _In_ PBL_BCD_OPTION Option, _In_ ULONG MaximumLength ) { - return STATUS_NOT_IMPLEMENTED; + ULONG BytesAppended, DataSize, StringLength; + PBCDE_STRING StringEntry; + PWCHAR PathString; + FILEPATH_DEVICE_PATH *FilePath; + NTSTATUS Status; + + /* Make sure we have enough space for the option */ + if (MaximumLength < sizeof(*Option)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Set the initial size of the option, and consume from our buffer */ + DataSize = sizeof(*Option); + MaximumLength -= sizeof(*Option); + + /* Zero out and fill the option header */ + RtlZeroMemory(Option, DataSize); + Option->Type = PathType; + Option->DataOffset = sizeof(*Option); + + /* Extract the string option */ + StringEntry = (PBCDE_STRING)(Option + 1); + PathString = StringEntry->String; + + /* Start parsing the device path */ + FilePath = (FILEPATH_DEVICE_PATH*)DevicePath; + while (IsDevicePathEndType(FilePath) == FALSE) + { + /* Is this a file path? */ + if ((FilePath->Header.Type == MEDIA_DEVICE_PATH) && + (FilePath->Header.SubType == MEDIA_FILEPATH_DP)) + { + /* Get the length of the file path string, avoiding overflow */ + StringLength = DevicePathNodeLength(FilePath) - + FIELD_OFFSET(FILEPATH_DEVICE_PATH, PathName); + if (StringLength < FIELD_OFFSET(FILEPATH_DEVICE_PATH, PathName)) + { + Status = STATUS_INTEGER_OVERFLOW; + goto Quickie; + } + + /* Append this path string to the current path string */ + Status = EfiInitpAppendPathString(PathString, + MaximumLength, + FilePath->PathName, + StringLength, + &BytesAppended); + if (!NT_SUCCESS(Status)) return Status; + + /* Increase the size of the data, consume buffer space */ + DataSize += BytesAppended; + MaximumLength -= BytesAppended; + + /* Move to the next path string */ + PathString = (PWCHAR)((ULONG_PTR)PathString + BytesAppended); + } + + /* Move to the next path node */ + FilePath = (FILEPATH_DEVICE_PATH*)NextDevicePathNode(FilePath); + } + + /* Check if we still have space for a NULL-terminator */ + if (MaximumLength < sizeof(UNICODE_NULL)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* We do -- NULL-terminate the string */ + *PathString = UNICODE_NULL; + DataSize += sizeof(UNICODE_NULL); + + /* Check if all of this has amounted to a single NULL-char */ + if (PathString == StringEntry->String) + { + /* Then this option is empty */ + Option->Failed = TRUE; + } + + /* Set the final size of the option */ + Option->DataSize = DataSize; + +Quickie: + return STATUS_SUCCESS; } /*++ @@ -264,7 +457,7 @@ /* Set GPT partition ID */ DeviceEntry->Partition.Disk.HardDisk.PartitionType = GptPartition; - /* Copy the siggnature GUID */ + /* Copy the signature GUID */ RtlCopyMemory(&DeviceEntry->Partition.Gpt.PartitionGuid, DiskPath->Signature, sizeof(GUID));

1 0

[ion] 69038: [BOOTMGFW] - Implement EFI device path conversion
by ion＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: ion Date: Sat Sep 5 19:18:54 2015 New Revision: 69038 URL: http://svn.reactos.org/svn/reactos?rev=69038&view=rev Log: [BOOTMGFW] - Implement EFI device path conversion Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/efiemu.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Sat Sep 5 19:18:54 2015 @@ -7,34 +7,34 @@ add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) -list(APPEND BOOTMGR_COMMON_SOURCE +list(APPEND BOOTLIB_SOURCE app/bootmgr/bootmgr.h lib/bootlib.c lib/misc/bcd.c lib/misc/util.c) if(ARCH STREQUAL "i386") - list(APPEND BOOTMGR_COMMON_ASM_SOURCE + list(APPEND BOOTLIB_ASM_SOURCE #lib/arch/i386/foo.asm ) - list(APPEND BOOTMGR_COMMON_SOURCE + list(APPEND BOOTLIB_SOURCE #lib/arch/i386/foo.c ) elseif(ARCH STREQUAL "amd64") - list(APPEND BOOTMGR_COMMON_ASM_SOURCE + list(APPEND BOOTLIB_ASM_SOURCE #lib/arch/amd64/foo.asm ) - list(APPEND BOOTMGR_COMMON_SOURCE + list(APPEND BOOTLIB_SOURCE #lib/arch/amd64/foo.c ) else() #TBD endif() -add_asm_files(bootmgr_common_asm ${BOOTMGR_COMMON_ASM_SOURCE}) -add_library(bootmgr_common ${BOOTMGR_COMMON_SOURCE} ${bootmgr_common_asm}) -add_pch(bootmgr_common app/bootmgr/bootmgr.h BOOTMGR_COMMON_SOURCE) -add_dependencies(bootmgr_common bugcodes) +add_asm_files(bootlib_asm ${BOOTLIB_ASM_SOURCE}) +add_library(bootlib ${BOOTLIB_SOURCE} ${bootlib_asm}) +add_pch(bootlib app/bootmgr/bootmgr.h BOOTLIB_SOURCE) +add_dependencies(bootlib bugcodes) list(APPEND BOOTMGR_BASE_SOURCE app/bootmgr/efiemu.c @@ -61,7 +61,7 @@ set_entrypoint(bootmgfw EfiEntry) -target_link_libraries(bootmgfw bootmgr_common cportlib cmlib rtl libcntpr) +target_link_libraries(bootmgfw bootlib cportlib cmlib rtl libcntpr) if(STACK_PROTECTOR) target_link_libraries(bootmgfw gcc_ssp) Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Sat Sep 5 19:18:54 2015 @@ -32,41 +32,377 @@ /* FUNCTIONS *****************************************************************/ +/*++ + * @name AhCreateLoadOptionsList + * + * The AhCreateLoadOptionsList routine + * + * @param CommandLine + * UEFI Image Handle for the current loaded application. + * + * @param BootOptions + * Pointer to the UEFI System Table. + * + * @param MaximumLength + * Pointer to the UEFI System Table. + * + * @param OptionSize + * Pointer to the UEFI System Table. + * + * @param PreviousOption + * Pointer to the UEFI System Table. + * + * @param PreviousOptionSize + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ NTSTATUS AhCreateLoadOptionsList ( _In_ PWCHAR CommandLine, - _In_ PBOOT_ENTRY_OPTION BootOptions, + _In_ PBL_BCD_OPTION BootOptions, _In_ ULONG MaximumLength, _Out_ PULONG OptionSize, - _In_ PBOOT_ENTRY_OPTION* PreviousOption, + _In_ PBL_BCD_OPTION* PreviousOption, _In_ PULONG PreviousOptionSize ) { return STATUS_NOT_IMPLEMENTED; } +/*++ + * @name EfiInitpConvertEfiDevicePath + * + * The EfiInitpConvertEfiDevicePath routine + * + * @param DevicePath + * UEFI Image Handle for the current loaded application. + * + * @param DeviceType + * Pointer to the UEFI System Table. + * + * @param Option + * Pointer to the UEFI System Table. + * + * @param MaximumLength + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ NTSTATUS EfiInitpConvertEfiFilePath ( _In_ EFI_DEVICE_PATH_PROTOCOL *FilePath, _In_ ULONG PathType, - _In_ PBOOT_ENTRY_OPTION Option, + _In_ PBL_BCD_OPTION Option, _In_ ULONG MaximumLength ) { return STATUS_NOT_IMPLEMENTED; } +/*++ + * @name EfiInitpGetDeviceNode + * + * The EfiInitpGetDeviceNode routine + * + * @param DevicePath + * UEFI Image Handle for the current loaded application. + * + * @return None + * + *--*/ +EFI_DEVICE_PATH_PROTOCOL* +EfiInitpGetDeviceNode ( + _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath + ) +{ + EFI_DEVICE_PATH_PROTOCOL* NextPath; + + /* Check if we hit the end terminator */ + if (IsDevicePathEndType(DevicePath)) + { + return DevicePath; + } + + /* Loop each device path, until we get to the end or to a file path device node */ + for ((NextPath = NextDevicePathNode(DevicePath)); + !(IsDevicePathEndType(NextPath)) && ((NextPath->Type != MEDIA_DEVICE_PATH) && + (NextPath->SubType != MEDIA_FILEPATH_DP)); + (NextPath = NextDevicePathNode(NextPath))) + { + /* Keep iterating down */ + DevicePath = NextPath; + } + + /* Return the path found */ + return DevicePath; +} + +/*++ + * @name EfiInitTranslateDevicePath + * + * The EfiInitTranslateDevicePath routine + * + * @param DevicePath + * UEFI Image Handle for the current loaded application. + * + * @param DeviceEntry + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ +NTSTATUS +EfiInitTranslateDevicePath( + _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath, + _In_ PBL_DEVICE_DESCRIPTOR DeviceEntry + ) +{ + NTSTATUS Status; + EFI_DEVICE_PATH_PROTOCOL* DeviceNode; + MEMMAP_DEVICE_PATH* MemDevicePath; + ACPI_HID_DEVICE_PATH *AcpiPath; + HARDDRIVE_DEVICE_PATH *DiskPath; + + /* Assume failure */ + Status = STATUS_UNSUCCESSFUL; + + /* Set size first */ + DeviceEntry->Size = sizeof(*DeviceEntry); + + /* Check if we are booting from a RAM Disk */ + if ((DevicePath->Type == HARDWARE_DEVICE_PATH) && + (DevicePath->SubType == HW_MEMMAP_DP)) + { + /* Get the EFI data structure matching this */ + MemDevicePath = (MEMMAP_DEVICE_PATH*)DevicePath; + + /* Set the boot library specific device types */ + DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->Local.Type = RamDiskDevice; + + /* Extract the base, size, and offset */ + DeviceEntry->Local.RamDisk.ImageBase.QuadPart = MemDevicePath->StartingAddress; + DeviceEntry->Local.RamDisk.ImageSize.QuadPart = MemDevicePath->EndingAddress - + MemDevicePath->StartingAddress; + DeviceEntry->Local.RamDisk.ImageOffset = 0; + return STATUS_SUCCESS; + } + + /* Otherwise, check what kind of device node this is */ + DeviceNode = EfiInitpGetDeviceNode(DevicePath); + switch (DeviceNode->Type) + { + /* ACPI */ + case ACPI_DEVICE_PATH: + + /* We only support floppy drives */ + AcpiPath = (ACPI_HID_DEVICE_PATH*)DeviceNode; + if ((AcpiPath->HID != EISA_PNP_ID(0x604)) && + (AcpiPath->HID != EISA_PNP_ID(0x700))) + { + return Status; + } + + /* Set the boot library specific device types */ + DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->Local.Type = FloppyDevice; + + /* The ACPI UID is the drive number */ + DeviceEntry->Local.FloppyDisk.DriveNumber = AcpiPath->UID; + return STATUS_SUCCESS; + + /* Network, ATAPI, SCSI, USB */ + case MESSAGING_DEVICE_PATH: + + /* Check if it's network */ + if ((DeviceNode->SubType == MSG_MAC_ADDR_DP) || + (DeviceNode->SubType == MSG_IPv4_DP)) + { + /* Set the boot library specific device types */ + DeviceEntry->DeviceType = UdpDevice; + DeviceEntry->Remote.Unknown = 256; + return STATUS_SUCCESS; + } + + /* Other types should come in as MEDIA_DEVICE_PATH -- Windows assumes this is a floppy */ + DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->Local.Type = FloppyDevice; + DeviceEntry->Local.FloppyDisk.DriveNumber = 0; + return STATUS_SUCCESS; + + /* Disk or CDROM */ + case MEDIA_DEVICE_PATH: + + /* Extract the disk path and check if it's a physical disk */ + DiskPath = (HARDDRIVE_DEVICE_PATH*)DeviceNode; + if (DeviceNode->SubType == MEDIA_HARDDRIVE_DP) + { + /* Check if this is an MBR partition */ + if (DiskPath->SignatureType == SIGNATURE_TYPE_MBR) + { + /* Set that this is a local partition */ + DeviceEntry->DeviceType = PartitionDevice; + DeviceEntry->Partition.Disk.Type = LocalDevice; + + DeviceEntry->Partition.Disk.HardDisk.PartitionType = MbrPartition; + DeviceEntry->Partition.Disk.HardDisk.Mbr.PartitionSignature = + *(PULONG)&DiskPath->Signature[0]; + DeviceEntry->Partition.Mbr.PartitionNumber = DiskPath->PartitionNumber; + return STATUS_SUCCESS; + } + + /* Check if it's a GPT partition */ + if (DiskPath->SignatureType == SIGNATURE_TYPE_GUID) + { + /* Set that this is a local disk */ + DeviceEntry->DeviceType = HardDiskDevice; + DeviceEntry->Partition.Disk.Type = LocalDevice; + + /* Set GPT partition ID */ + DeviceEntry->Partition.Disk.HardDisk.PartitionType = GptPartition; + + /* Copy the siggnature GUID */ + RtlCopyMemory(&DeviceEntry->Partition.Gpt.PartitionGuid, + DiskPath->Signature, + sizeof(GUID)); + + DeviceEntry->Flags |= 4u; + return STATUS_SUCCESS; + } + + /* Othertwise, raw boot is not supported */ + DeviceEntry->DeviceType = HardDiskDevice; + DeviceEntry->Partition.Disk.HardDisk.PartitionType = RawPartition; + DeviceEntry->Partition.Disk.HardDisk.Raw.DiskNumber = 0; + } + else if (DeviceNode->SubType == MEDIA_CDROM_DP) + { + /* Set the right type for a CDROM */ + DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->Local.Type = CdRomDevice; + + /* Set the drive number to zero */ + DeviceEntry->Local.FloppyDisk.DriveNumber = 0; + return STATUS_SUCCESS; + } + + /* Fail anything else */ + default: + break; + } + + /* Return here only on failure */ + return Status; +} + +/*++ + * @name EfiInitpConvertEfiDevicePath + * + * The EfiInitpConvertEfiDevicePath routine + * + * @param DevicePath + * UEFI Image Handle for the current loaded application. + * + * @param DeviceType + * Pointer to the UEFI System Table. + * + * @param Option + * Pointer to the UEFI System Table. + * + * @param MaximumLength + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ NTSTATUS EfiInitpConvertEfiDevicePath ( _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath, _In_ ULONG DeviceType, - _In_ PBOOT_ENTRY_OPTION Option, + _In_ PBL_BCD_OPTION Option, _In_ ULONG MaximumLength ) { - return STATUS_NOT_IMPLEMENTED; + PBCDE_DEVICE DeviceEntry; + NTSTATUS Status; + + /* Make sure we have enough space for the option */ + if (MaximumLength < sizeof(*Option)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Zero out the option */ + RtlZeroMemory(Option, sizeof(*Option)); + + /* Make sure we have enough space for the device entry */ + if ((MaximumLength - sizeof(*Option)) < (ULONG)FIELD_OFFSET(BCDE_DEVICE, Device)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Fill it out */ + DeviceEntry = (PBCDE_DEVICE)(Option + 1); + Status = EfiInitTranslateDevicePath(DevicePath, &DeviceEntry->Device); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Fill out the rest of the option structure */ + Option->DataOffset = sizeof(*Option); + Option->Type = DeviceType; + Option->DataSize = FIELD_OFFSET(BCDE_DEVICE, Device) + + DeviceEntry->Device.Size; + Status = STATUS_SUCCESS; + +Quickie: + return Status; } +/*++ + * @name EfiInitpCreateApplicationEntry + * + * The EfiInitpCreateApplicationEntry routine + * + * @param SystemTable + * UEFI Image Handle for the current loaded application. + * + * @param Entry + * Pointer to the UEFI System Table. + * + * @param MaximumLength + * Pointer to the UEFI System Table. + * + * @param DevicePath + * Pointer to the UEFI System Table. + * + * @param FilePath + * Pointer to the UEFI System Table. + * + * @param LoadOptions + * Pointer to the UEFI System Table. + * + * @param LoadOptionsSize + * Pointer to the UEFI System Table. + * + * @param Flags + * Pointer to the UEFI System Table. + * + * @param ResultLength + * Pointer to the UEFI System Table. + * + * @param AppEntryDevice + * Pointer to the UEFI System Table. + * + * @return None + * + *--*/ VOID EfiInitpCreateApplicationEntry ( __in EFI_SYSTEM_TABLE *SystemTable, @@ -83,7 +419,7 @@ { PBL_WINDOWS_LOAD_OPTIONS WindowsOptions; PWCHAR ObjectString, CommandLine; - PBOOT_ENTRY_OPTION Option, PreviousOption; + PBL_BCD_OPTION Option, PreviousOption; ULONG HeaderSize, TotalOptionSize, Size, CommandLineSize, RemainingSize; NTSTATUS Status; UNICODE_STRING GuidString; @@ -183,7 +519,7 @@ { /* We failed, so mark the option as such and return an empty one */ Entry->BcdData.Failed = TRUE; - TotalOptionSize = sizeof(BOOT_ENTRY_OPTION); + TotalOptionSize = sizeof(BL_BCD_OPTION); goto Quickie; } @@ -243,7 +579,7 @@ OsPath = (PVOID)((ULONG_PTR)WindowsOptions + WindowsOptions->OsPathOffset); /* IS the OS path in EFI format? */ - if ((OsPath->Length > FIELD_OFFSET(BL_FILE_PATH_DESCRIPTOR, Path)) && + if ((OsPath->Length > (ULONG)FIELD_OFFSET(BL_FILE_PATH_DESCRIPTOR, Path)) && (OsPath->PathType == EfiPath)) { /* Convert the device portion */ Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sat Sep 5 19:18:54 2015 @@ -48,8 +48,31 @@ // typedef enum _BL_DEVICE_TYPE { - UdpDevice = 4 + LocalDevice = 0, + PartitionDevice = 2, + UdpDevice = 4, + HardDiskDevice = 6 } BL_DEVICE_TYPE; + +// +// Local Device Types +// +typedef enum _BL_LOCAL_DEVICE_TYPE +{ + FloppyDevice = 1, + CdRomDevice = 2, + RamDiskDevice = 3, +} BL_LOCAL_DEVICE_TYPE; + +// +// Partition types +// +typedef enum _BL_PARTITION_TYPE +{ + GptPartition, + MbrPartition, + RawPartition, +} BL_PARTITION_TYPE; // // File Path Types @@ -191,7 +214,7 @@ BL_MEMORY_TYPE Type; } BL_MEMORY_DESCRIPTOR, *PBL_MEMORY_DESCRIPTOR; -typedef struct _BOOT_ENTRY_OPTION +typedef struct _BL_BCD_OPTION { ULONG Type; ULONG DataOffset; @@ -199,7 +222,7 @@ ULONG ListOffset; ULONG NextEntryOffset; ULONG Failed; -} BOOT_ENTRY_OPTION, *PBOOT_ENTRY_OPTION; +} BL_BCD_OPTION, *PBL_BCD_OPTION; typedef struct _BL_APPLICATION_ENTRY { @@ -207,7 +230,7 @@ ULONG Flags; GUID Guid; ULONG Unknown[4]; - BOOT_ENTRY_OPTION BcdData; + BL_BCD_OPTION BcdData; } BL_APPLICATION_ENTRY, *PBL_APPLICATION_ENTRY; typedef struct _BL_HARDDISK_DEVICE @@ -270,15 +293,18 @@ struct { - ULONG PartitionNumber; + union + { + ULONG PartitionNumber; + } Mbr; + + union + { + GUID PartitionGuid; + } Gpt; + BL_LOCAL_DEVICE Disk; - } MbrPartition; - - struct - { - GUID PartitionGuid; - BL_LOCAL_DEVICE Disk; - } GptPartition; + } Partition; }; } BL_DEVICE_DESCRIPTOR, *PBL_DEVICE_DESCRIPTOR; @@ -318,7 +344,7 @@ ULONG BlGetBootOptionSize ( - _In_ PBOOT_ENTRY_OPTION BcdOption + _In_ PBL_BCD_OPTION BcdOption ); #endif Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Sat Sep 5 19:18:54 2015 @@ -12,19 +12,30 @@ /* FUNCTIONS *****************************************************************/ +/*++ + * @name BlGetBootOptionListSize + * + * The BlGetBootOptionListSize routine + * + * @param BcdOption + * UEFI Image Handle for the current loaded application. + * + * @return Size of the BCD option + * + *--*/ ULONG BlGetBootOptionListSize ( - _In_ PBOOT_ENTRY_OPTION BcdOption + _In_ PBL_BCD_OPTION BcdOption ) { ULONG Size = 0, NextOffset = 0; - PBOOT_ENTRY_OPTION NextOption; + PBL_BCD_OPTION NextOption; /* Loop all the options*/ do { /* Move to the next one */ - NextOption = (PBOOT_ENTRY_OPTION)((ULONG_PTR)BcdOption + NextOffset); + NextOption = (PBL_BCD_OPTION)((ULONG_PTR)BcdOption + NextOffset); /* Compute the size of the next one */ Size += BlGetBootOptionSize(NextOption); @@ -37,9 +48,20 @@ return Size; } +/*++ + * @name BlGetBootOptionSize + * + * The BlGetBootOptionSize routine + * + * @param BcdOption + * UEFI Image Handle for the current loaded application. + * + * @return Size of the BCD option + * + *--*/ ULONG BlGetBootOptionSize ( - _In_ PBOOT_ENTRY_OPTION BcdOption + _In_ PBL_BCD_OPTION BcdOption ) { ULONG Size, Offset;

1 0

[sginsberg] 69037: - Add in MSVC support for HAL .init sections by using alloc_text. MSVC support for putting the HAL pci class and vendor tables into .init is still lacking. Put into a _MINIHAL_ g...
by sginsberg＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: sginsberg Date: Sat Sep 5 18:33:38 2015 New Revision: 69037 URL: http://svn.reactos.org/svn/reactos?rev=69037&view=rev Log: - Add in MSVC support for HAL .init sections by using alloc_text. MSVC support for putting the HAL pci class and vendor tables into .init is still lacking. Put into a _MINIHAL_ guard or freeldr gets REALLY sad. - Rename INIT_FUNCTION to INIT_SECTION and put it at the top of functions for consistency with __declspec declarations (it is actually possible to do this via __declspec in newer MSVC versions). Modified: trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/legacy/bus/pcibus.c trunk/reactos/hal/halx86/legacy/bussupp.c trunk/reactos/hal/halx86/legacy/halpcat.c trunk/reactos/hal/halx86/pcidata.cmake Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -13,6 +13,9 @@ #define NDEBUG #include <debug.h> +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpInitializeClock) +#endif /* GLOBALS ********************************************************************/ @@ -61,10 +64,9 @@ HalpReleaseCmosSpinLock(); } - +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpInitializeClock(VOID) { ULONG_PTR EFlags; Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -13,6 +13,10 @@ #define NDEBUG #include <debug.h> +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpInitializeCmos) +#endif + /* GLOBALS *******************************************************************/ UCHAR HalpCmosCenturyOffset; @@ -150,9 +154,9 @@ return Length - Len; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpInitializeCmos(VOID) { /* Set default century offset byte */ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -76,6 +76,10 @@ #define NDEBUG #include <debug.h> + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpInitDma) +#endif #define MAX_SG_ELEMENTS 0x10 @@ -129,8 +133,8 @@ /* FUNCTIONS *****************************************************************/ #ifndef _MINIHAL_ +INIT_SECTION VOID -INIT_FUNCTION HalpInitDma(VOID) { /* Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -12,15 +12,26 @@ #define NDEBUG #include <debug.h> +VOID +NTAPI +HalpGetParameters( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalInitSystem) +#pragma alloc_text(INIT, HalpGetParameters) +#endif + /* GLOBALS *******************************************************************/ BOOLEAN HalpPciLockSettings; /* PRIVATE FUNCTIONS *********************************************************/ +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PCHAR CommandLine; @@ -65,9 +76,9 @@ /* * @implemented */ +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalInitSystem(IN ULONG BootPhase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -12,6 +12,11 @@ #define NDEBUG #include <debug.h> +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpMarkAcpiHal) +#pragma alloc_text(INIT, HalpReportSerialNumber) +#endif + /* GLOBALS *******************************************************************/ BOOLEAN HalpNMIInProgress; @@ -22,9 +27,9 @@ /* PRIVATE FUNCTIONS **********************************************************/ #ifndef _MINIHAL_ -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpReportSerialNumber(VOID) { NTSTATUS Status; @@ -53,9 +58,9 @@ } } +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpMarkAcpiHal(VOID) { NTSTATUS Status; Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -12,6 +12,10 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpInitializeClock) +#endif /* GLOBALS *******************************************************************/ @@ -107,9 +111,9 @@ __writeeflags(Flags); } -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpInitializeClock(VOID) { ULONG Increment; Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -11,6 +11,42 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +VOID +NTAPI +HalpGetResourceSortValue( + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + OUT PULONG Scale, + OUT PLARGE_INTEGER Value +); + +VOID +NTAPI +HalpBuildPartialFromIdt( + IN ULONG Entry, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor +); + +VOID +NTAPI +HalpBuildPartialFromAddress( + IN INTERFACE_TYPE Interface, + IN PADDRESS_USAGE CurrentAddress, + IN ULONG Element, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor +); + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpBuildPartialFromAddress) +#pragma alloc_text(INIT, HalpBuildPartialFromIdt) +#pragma alloc_text(INIT, HalpEnableInterruptHandler) +#pragma alloc_text(INIT, HalpGetNMICrashFlag) +#pragma alloc_text(INIT, HalpGetResourceSortValue) +#pragma alloc_text(INIT, HalpRegisterVector) +#pragma alloc_text(INIT, HalpReportResourceUsage) +#endif /* GLOBALS ********************************************************************/ @@ -61,9 +97,9 @@ /* FUNCTIONS ******************************************************************/ #ifndef _MINIHAL_ -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpGetResourceSortValue(IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, OUT PULONG Scale, OUT PLARGE_INTEGER Value) @@ -101,9 +137,9 @@ } } -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpBuildPartialFromIdt(IN ULONG Entry, IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor, IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor) @@ -139,9 +175,9 @@ TranslatedDescriptor->u.Interrupt.Level = HalpIDTUsage[Entry].Irql; } -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpBuildPartialFromAddress(IN INTERFACE_TYPE Interface, IN PADDRESS_USAGE CurrentAddress, IN ULONG Element, @@ -207,9 +243,9 @@ } } -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpReportResourceUsage(IN PUNICODE_STRING HalName, IN INTERFACE_TYPE InterfaceType) { @@ -486,9 +522,9 @@ } #endif -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpRegisterVector(IN UCHAR Flags, IN ULONG BusVector, IN ULONG SystemVector, @@ -503,9 +539,9 @@ } #ifndef _MINIHAL_ -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpEnableInterruptHandler(IN UCHAR Flags, IN ULONG BusVector, IN ULONG SystemVector, @@ -526,9 +562,9 @@ HalEnableSystemInterrupt(SystemVector, Irql, Mode); } -VOID -NTAPI -INIT_FUNCTION +INIT_SECTION +VOID +NTAPI HalpGetNMICrashFlag(VOID) { UNICODE_STRING ValueName; Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -4,10 +4,10 @@ #pragma once -#if defined(__GNUC__) && !defined(_MINIHAL_) -#define INIT_FUNCTION __attribute__((section ("INIT"))) +#ifdef __GNUC__ +#define INIT_SECTION __attribute__((section ("INIT"))) #else -#define INIT_FUNCTION /* Done via alloc_text for MSC */ +#define INIT_SECTION /* Done via alloc_text for MSC */ #endif Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -11,6 +11,14 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpInitializePciStubs) +#pragma alloc_text(INIT, HalpQueryPciRegistryInfo) +#pragma alloc_text(INIT, HalpRegisterPciDebuggingDeviceInfo) +#pragma alloc_text(INIT, HalpReleasePciDeviceForDebugging) +#pragma alloc_text(INIT, HalpSetupPciDeviceForDebugging) +#endif /* GLOBALS *******************************************************************/ @@ -600,9 +608,9 @@ return STATUS_SUCCESS; } +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock, IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) { @@ -610,18 +618,18 @@ return STATUS_NOT_IMPLEMENTED; } +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) { DPRINT1("Unimplemented!\n"); return STATUS_NOT_IMPLEMENTED; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpRegisterPciDebuggingDeviceInfo(VOID) { BOOLEAN Found = FALSE; @@ -854,9 +862,9 @@ return Length; } +INIT_SECTION PPCI_REGISTRY_INFO_INTERNAL NTAPI -INIT_FUNCTION HalpQueryPciRegistryInfo(VOID) { #ifndef _MINIHAL_ @@ -1087,9 +1095,9 @@ #endif } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpInitializePciStubs(VOID) { PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -11,6 +11,100 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +PBUS_HANDLER +NTAPI +HalpAllocateAndInitPciBusHandler( + IN ULONG PciType, + IN ULONG BusNo, + IN BOOLEAN TestAllocation +); + +VOID +NTAPI +HalpFixupPciSupportedRanges( + IN ULONG BusCount +); + +NTSTATUS +NTAPI +HalpGetChipHacks( + IN USHORT VendorId, + IN USHORT DeviceId, + IN UCHAR RevisionId, + IN PULONG HackFlags +); + +BOOLEAN +NTAPI +HalpGetPciBridgeConfig( + IN ULONG PciType, + IN PUCHAR BusCount +); + +BOOLEAN +NTAPI +HalpIsBridgeDevice( + IN PPCI_COMMON_CONFIG PciData +); + +BOOLEAN +NTAPI +HalpIsIdeDevice( + IN PPCI_COMMON_CONFIG PciData +); + +BOOLEAN +NTAPI +HalpIsRecognizedCard( + IN PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo, + IN PPCI_COMMON_CONFIG PciData, + IN ULONG Flags +); + +BOOLEAN +NTAPI +HalpIsValidPCIDevice( + IN PBUS_HANDLER BusHandler, + IN PCI_SLOT_NUMBER Slot +); + +NTSTATUS +NTAPI +HalpMarkChipsetDecode( + IN BOOLEAN OverrideEnable +); + +VOID +NTAPI +HalpRegisterInternalBusHandlers( + VOID +); + +VOID +NTAPI +ShowSize( + IN ULONG Size +); + + +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +#pragma alloc_text(INIT, HalpAllocateAndInitPciBusHandler) +#pragma alloc_text(INIT, HalpDebugPciDumpBus) +#pragma alloc_text(INIT, HalpFixupPciSupportedRanges) +#pragma alloc_text(INIT, HalpGetChipHacks) +#pragma alloc_text(INIT, HalpGetPciBridgeConfig) +#pragma alloc_text(INIT, HalpInitBusHandlers) +#pragma alloc_text(INIT, HalpInitializePciBus) +#pragma alloc_text(INIT, HalpIsBridgeDevice) +#pragma alloc_text(INIT, HalpIsIdeDevice) +#pragma alloc_text(INIT, HalpIsRecognizedCard) +#pragma alloc_text(INIT, HalpIsValidPCIDevice) +#pragma alloc_text(INIT, HalpMarkChipsetDecode) +#pragma alloc_text(INIT, HalpRegisterKdSupportFunctions) +#pragma alloc_text(INIT, HalpRegisterInternalBusHandlers) +#pragma alloc_text(INIT, ShowSize) +#endif /* GLOBALS ********************************************************************/ @@ -66,9 +160,9 @@ return Bus; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpRegisterInternalBusHandlers(VOID) { PBUS_HANDLER Bus; @@ -141,9 +235,9 @@ } #ifndef _MINIHAL_ +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpMarkChipsetDecode(BOOLEAN OverrideEnable) { NTSTATUS Status; @@ -189,9 +283,9 @@ return Status; } +INIT_SECTION PBUS_HANDLER NTAPI -INIT_FUNCTION HalpAllocateAndInitPciBusHandler(IN ULONG PciType, IN ULONG BusNo, IN BOOLEAN TestAllocation) @@ -274,9 +368,9 @@ return Bus; } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpIsValidPCIDevice(IN PBUS_HANDLER BusHandler, IN PCI_SLOT_NUMBER Slot) { @@ -336,9 +430,9 @@ static BOOLEAN WarningsGiven[5]; +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpGetChipHacks(IN USHORT VendorId, IN USHORT DeviceId, IN UCHAR RevisionId, @@ -400,9 +494,9 @@ return Status; } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpIsRecognizedCard(IN PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo, IN PPCI_COMMON_CONFIG PciData, IN ULONG Flags) @@ -481,9 +575,9 @@ return FALSE; } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpIsIdeDevice(IN PPCI_COMMON_CONFIG PciData) { /* Simple test first */ @@ -534,9 +628,9 @@ return FALSE; } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpIsBridgeDevice(IN PPCI_COMMON_CONFIG PciData) { /* Either this is a PCI-to-PCI Bridge, or a CardBUS Bridge */ @@ -548,9 +642,9 @@ (PciData->SubClass == PCI_SUBCLASS_BR_CARDBUS))); } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpGetPciBridgeConfig(IN ULONG PciType, IN PUCHAR BusCount) { @@ -601,9 +695,9 @@ return FALSE; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpFixupPciSupportedRanges(IN ULONG BusCount) { ULONG i; @@ -664,9 +758,9 @@ } } +INIT_SECTION VOID NTAPI -INIT_FUNCTION ShowSize(ULONG x) { if (!x) return; @@ -696,9 +790,9 @@ */ #include "pci_classes.h" #include "pci_vendors.h" +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpDebugPciDumpBus(IN ULONG i, IN ULONG j, IN ULONG k, @@ -849,9 +943,9 @@ } #endif +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpInitializePciBus(VOID) { #ifndef _MINIHAL_ @@ -1114,18 +1208,18 @@ #endif } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpInitBusHandlers(VOID) { /* Register the HAL Bus Handler support */ HalpRegisterInternalBusHandlers(); } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpRegisterKdSupportFunctions(VOID) { /* Register PCI Device Functions */ Modified: trunk/reactos/hal/halx86/legacy/halpcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpcat.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpcat.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpcat.c [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -12,6 +12,15 @@ #define NDEBUG #include <debug.h> +#if defined(ALLOC_PRAGMA) && !defined(_MINIHAL_) +//#pragma alloc_text(INIT, HaliInitPnpDriver) +#pragma alloc_text(INIT, HalpBuildAddressMap) +#pragma alloc_text(INIT, HalpGetDebugPortTable) +#pragma alloc_text(INIT, HalpIs16BitPortDecodeSupported) +#pragma alloc_text(INIT, HalpSetupAcpiPhase0) +#pragma alloc_text(INIT, HalReportResourceUsage) +#endif + /* GLOBALS ********************************************************************/ /* This determines the HAL type */ @@ -21,18 +30,18 @@ /* PRIVATE FUNCTIONS **********************************************************/ +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { /* There is no ACPI on these HALs */ return STATUS_NO_SUCH_DEVICE; } +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalpBuildAddressMap(VOID) { /* FIXME: Inherit ROM blocks from the registry */ @@ -42,18 +51,18 @@ //HalpAddROMRanges(); } +INIT_SECTION BOOLEAN NTAPI -INIT_FUNCTION HalpGetDebugPortTable(VOID) { /* No ACPI */ return FALSE; } +INIT_SECTION ULONG NTAPI -INIT_FUNCTION HalpIs16BitPortDecodeSupported(VOID) { /* Only EISA systems support this */ @@ -61,9 +70,9 @@ } #if 0 +INIT_SECTION NTSTATUS NTAPI -INIT_FUNCTION HaliInitPnpDriver(VOID) { /* On PC-AT, this will interface with the PCI driver */ @@ -75,9 +84,9 @@ /* * @implemented */ +INIT_SECTION VOID NTAPI -INIT_FUNCTION HalReportResourceUsage(VOID) { INTERFACE_TYPE InterfaceType; Modified: trunk/reactos/hal/halx86/pcidata.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pcidata.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] Sat Sep 5 18:33:38 2015 @@ -3,11 +3,11 @@ # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR ClassTable INIT_SECTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR VendorTable INIT_SECTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids) #####################################

1 0

[akhaldi] 69036: [CMAKE/MSVC] C4200 doesn't look useful to us.
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 17:46:04 2015 New Revision: 69036 URL: http://svn.reactos.org/svn/reactos?rev=69036&view=rev Log: [CMAKE/MSVC] C4200 doesn't look useful to us. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=69036… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Sep 5 17:46:04 2015 @@ -48,8 +48,8 @@ # - C4244: implicit integer truncation # - C4290: C++ exception specification ignored # - C4800: forcing value to bool 'true' or 'false' (performance warning) -#add_compile_flags("/wd4244 /wd4290 /wd4800 ") -add_compile_flags("/wd4244 /wd4290 /wd4800") +# - C4200: nonstandard extension used : zero-sized array in struct/union +add_compile_flags("/wd4244 /wd4290 /wd4800 /wd4200") # FIXME: Temporarily disable C4018 until we fix more of the others. CORE-10113 add_compile_flags("/wd4018")

1 0

[akhaldi] 69035: [SOFTPUB] Don't assign ordinals to Dll{Register, Unregister}Server(). CORE-10113
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 17:42:27 2015 New Revision: 69035 URL: http://svn.reactos.org/svn/reactos?rev=69035&view=rev Log: [SOFTPUB] Don't assign ordinals to Dll{Register,Unregister}Server(). CORE-10113 Modified: trunk/reactos/dll/win32/softpub/softpub.spec Modified: trunk/reactos/dll/win32/softpub/softpub.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/softpub/softpub.… ============================================================================== --- trunk/reactos/dll/win32/softpub/softpub.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/softpub/softpub.spec [iso-8859-1] Sat Sep 5 17:42:27 2015 @@ -5,8 +5,8 @@ 5 stub SoftpubFreeDefUsageCallData 6 stub SoftpubLoadDefUsageCallData 7 stub AddPersonalTrustDBPages -8 stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer -9 stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer +@ stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer +@ stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer 10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy 11 stdcall DriverFinalPolicy(ptr) wintrust.DriverFinalPolicy 12 stdcall DriverInitializePolicy(ptr) wintrust.DriverInitializePolicy

1 0

[akhaldi] 69034: [CMAKE/MSVC] Temporarily disable C4018 until we fix more of the others. CORE-10113
by akhaldi＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: akhaldi Date: Sat Sep 5 17:31:51 2015 New Revision: 69034 URL: http://svn.reactos.org/svn/reactos?rev=69034&view=rev Log: [CMAKE/MSVC] Temporarily disable C4018 until we fix more of the others. CORE-10113 Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=69034… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Sep 5 17:31:51 2015 @@ -50,6 +50,9 @@ # - C4800: forcing value to bool 'true' or 'false' (performance warning) #add_compile_flags("/wd4244 /wd4290 /wd4800 ") add_compile_flags("/wd4244 /wd4290 /wd4800") + +# FIXME: Temporarily disable C4018 until we fix more of the others. CORE-10113 +add_compile_flags("/wd4018") # The following warnings are treated as errors: # - C4013: implicit function declaration

1 0

[ion] 69033: [BOOTMGFW] - Define some core boot library structures -- reverse engineered to be compatible with MS. This is important if we want to load MS' own binaries for testing (such as MemTest...
by ion＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: ion Date: Sat Sep 5 16:05:20 2015 New Revision: 69033 URL: http://svn.reactos.org/svn/reactos?rev=69033&view=rev Log: [BOOTMGFW] - Define some core boot library structures -- reverse engineered to be compatible with MS. This is important if we want to load MS' own binaries for testing (such as MemTest.Efi) - Define basic BCD structures - Start implementing EFI->Windows Boot Library conversion routines. Last part remaining is EFI path conversion. - Fix linking with RTL, by providing some stubs for now. Added: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c (with props) trunk/reactos/boot/environ/include/bcd.h (with props) trunk/reactos/boot/environ/lib/misc/bcd.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/efiemu.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/util.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -10,6 +10,7 @@ list(APPEND BOOTMGR_COMMON_SOURCE app/bootmgr/bootmgr.h lib/bootlib.c + lib/misc/bcd.c lib/misc/util.c) if(ARCH STREQUAL "i386") @@ -38,6 +39,7 @@ list(APPEND BOOTMGR_BASE_SOURCE app/bootmgr/efiemu.c app/bootmgr/bootmgr.c + app/bootmgr/rtlcompat.c ) add_executable(bootmgfw ${BOOTMGR_BASE_SOURCE}) Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -9,8 +9,310 @@ /* INCLUDES ******************************************************************/ #include "bootmgr.h" +#include <bcd.h> + +/* DATA STRUCTURES ***********************************************************/ + +typedef struct _BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH +{ + BOOT_APPLICATION_PARAMETER_BLOCK; + BL_MEMORY_DATA BootMemoryData; + BL_MEMORY_DESCRIPTOR MemEntry; + UCHAR AppEntry[788]; +} BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH; + +/* DATA VARIABLES ************************************************************/ + +ULONG BlpApplicationFlags; + +GUID EfiLoadedImageProtocol = EFI_LOADED_IMAGE_PROTOCOL_GUID; +GUID EfiDevicePathProtocol = EFI_DEVICE_PATH_PROTOCOL_GUID; + +BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH EfiInitScratch; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +AhCreateLoadOptionsList ( + _In_ PWCHAR CommandLine, + _In_ PBOOT_ENTRY_OPTION BootOptions, + _In_ ULONG MaximumLength, + _Out_ PULONG OptionSize, + _In_ PBOOT_ENTRY_OPTION* PreviousOption, + _In_ PULONG PreviousOptionSize + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +EfiInitpConvertEfiFilePath ( + _In_ EFI_DEVICE_PATH_PROTOCOL *FilePath, + _In_ ULONG PathType, + _In_ PBOOT_ENTRY_OPTION Option, + _In_ ULONG MaximumLength + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +EfiInitpConvertEfiDevicePath ( + _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath, + _In_ ULONG DeviceType, + _In_ PBOOT_ENTRY_OPTION Option, + _In_ ULONG MaximumLength + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +VOID +EfiInitpCreateApplicationEntry ( + __in EFI_SYSTEM_TABLE *SystemTable, + __in PBL_APPLICATION_ENTRY Entry, + __in ULONG MaximumLength, + __in EFI_DEVICE_PATH *DevicePath, + __in EFI_DEVICE_PATH *FilePath, + __in PWCHAR LoadOptions, + __in ULONG LoadOptionsSize, + __in ULONG Flags, + __out PULONG ResultLength, + __out PBL_DEVICE_DESCRIPTOR *AppEntryDevice + ) +{ + PBL_WINDOWS_LOAD_OPTIONS WindowsOptions; + PWCHAR ObjectString, CommandLine; + PBOOT_ENTRY_OPTION Option, PreviousOption; + ULONG HeaderSize, TotalOptionSize, Size, CommandLineSize, RemainingSize; + NTSTATUS Status; + UNICODE_STRING GuidString; + GUID ObjectGuid; + PBCDE_DEVICE BcdDevice; + BOOLEAN HaveBinaryOptions, HaveGuid; + PBL_FILE_PATH_DESCRIPTOR OsPath; + EFI_DEVICE_PATH *OsDevicePath; + + /* Initialize everything */ + TotalOptionSize = 0; + *AppEntryDevice = NULL; + HeaderSize = 0; + + /* Check if the load options are in binary Windows format */ + WindowsOptions = (PBL_WINDOWS_LOAD_OPTIONS)LoadOptions; + if ((WindowsOptions != NULL) && + (LoadOptionsSize >= sizeof(BL_WINDOWS_LOAD_OPTIONS)) && + (WindowsOptions->Length >= sizeof(BL_WINDOWS_LOAD_OPTIONS)) && + !(strncmp(WindowsOptions->Signature, "WINDOWS", 7))) + { + /* They are, so firmware must have loaded us -- extract arguments */ + CommandLine = WindowsOptions->LoadOptions; + CommandLineSize = LoadOptionsSize - FIELD_OFFSET(BL_WINDOWS_LOAD_OPTIONS, + LoadOptions); + + /* Remember that we used binary options */ + HaveBinaryOptions = TRUE; + } + else + { + /* Nope -- so treat them as raw command-line options */ + CommandLine = LoadOptions; + CommandLineSize = LoadOptionsSize; + + /* No binary options */ + HaveBinaryOptions = FALSE; + } + + /* EFI uses UTF-16LE, like NT, so convert to characters */ + CommandLineSize /= sizeof(WCHAR); + if (CommandLineSize != 0) + { + /* And check if the options are not NULL-terminated */ + if (wcsnlen(CommandLine, CommandLineSize) == CommandLineSize) + { + /* NULL-terminate them */ + CommandLine[CommandLineSize - 1] = UNICODE_NULL; + } + } + + /* Begin by making sure we at least have space for the app entry header */ + RemainingSize = MaximumLength; + if (RemainingSize < sizeof(BL_APPLICATION_ENTRY)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* On exit, return that we've at least consumed this much */ + HeaderSize = FIELD_OFFSET(BL_APPLICATION_ENTRY, BcdData); + + /* Zero out the header, and write down the signature */ + RtlZeroMemory(Entry, sizeof(BL_APPLICATION_ENTRY)); + RtlCopyMemory(Entry->Signature, "BTAPENT", 7); + + /* Check if a BCD object was passed on the command-line */ + ObjectString = wcsstr(CommandLine, L"BCDOBJECT="); + if (ObjectString != NULL) + { + /* Convert the BCD object to a GUID */ + RtlInitUnicodeString(&GuidString, ObjectString + 10); + RtlGUIDFromString(&GuidString, &ObjectGuid); + + /* Store it in the application entry */ + Entry->Guid = ObjectGuid; + + /* Remember one was passed */ + HaveGuid = TRUE; + } + else + { + /* Remember that no identifier was passed */ + Entry->Flags |= BL_APPLICATION_ENTRY_FLAG_NO_GUID; + HaveGuid = FALSE; + } + + /* At this point, the header is consumed, and we must now handle BCD options */ + RemainingSize -= FIELD_OFFSET(BL_APPLICATION_ENTRY, BcdData); + + /* Convert the device path into a BCD option */ + Status = EfiInitpConvertEfiDevicePath(DevicePath, + BcdLibraryDevice_ApplicationDevice, + &Entry->BcdData, + RemainingSize); + if (!NT_SUCCESS(Status)) + { + /* We failed, so mark the option as such and return an empty one */ + Entry->BcdData.Failed = TRUE; + TotalOptionSize = sizeof(BOOT_ENTRY_OPTION); + goto Quickie; + } + + /* Extract the device descriptor and return it */ + BcdDevice = (PVOID)((ULONG_PTR)&Entry->BcdData + Entry->BcdData.DataOffset); + *AppEntryDevice = &BcdDevice->Device; + + /* Calculate how big this option was and consume that from the buffer */ + TotalOptionSize = BlGetBootOptionSize(&Entry->BcdData); + RemainingSize -= TotalOptionSize; + + /* Calculate where the next option should go */ + Option = (PVOID)((ULONG_PTR)&Entry->BcdData + TotalOptionSize); + + /* Check if we're PXE booting or not */ + if ((*AppEntryDevice)->DeviceType == UdpDevice) + { + /* lol */ + Status = STATUS_NOT_IMPLEMENTED; + } + else + { + /* Convert the local file path into a BCD option */ + Status = EfiInitpConvertEfiFilePath(FilePath, + BcdLibraryString_ApplicationPath, + Option, + RemainingSize); + } + + /* Bail out on failure */ + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* The next option is right after this one */ + Entry->BcdData.NextEntryOffset = TotalOptionSize; + + /* Now compute the size of the next option, and add to the rolling sum */ + Size = BlGetBootOptionSize(Option); + TotalOptionSize += Size; + + /* Remember the previous option so we can update its next offset */ + PreviousOption = Option; + + /* Consume the option from the buffer */ + RemainingSize -= Size; + + /* Calculate where the next option should go */ + Option = (PVOID)((ULONG_PTR)Option + Size); + + /* Check if we were using binary options without a BCD GUID */ + if ((HaveBinaryOptions) && !(HaveGuid)) + { + /* Then this means we have to convert the OS paths to BCD too */ + WindowsOptions = (PBL_WINDOWS_LOAD_OPTIONS)LoadOptions; + OsPath = (PVOID)((ULONG_PTR)WindowsOptions + WindowsOptions->OsPathOffset); + + /* IS the OS path in EFI format? */ + if ((OsPath->Length > FIELD_OFFSET(BL_FILE_PATH_DESCRIPTOR, Path)) && + (OsPath->PathType == EfiPath)) + { + /* Convert the device portion */ + OsDevicePath = (EFI_DEVICE_PATH*)OsPath->Path; + Status = EfiInitpConvertEfiDevicePath(OsDevicePath, + BcdOSLoaderDevice_OSDevice, + Option, + RemainingSize); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Update the offset of the previous option */ + PreviousOption->NextEntryOffset = (ULONG_PTR)Option - (ULONG_PTR)&Entry->BcdData; + + /* Now compute the size of the next option, and add to the rolling sum */ + Size = BlGetBootOptionSize(Option); + TotalOptionSize += Size; + + /* Remember the previous option so we can update its next offset */ + PreviousOption = Option; + + /* Consume the option from the buffer */ + RemainingSize -= Size; + + /* Calculate where the next option should go */ + Option = (PVOID)((ULONG_PTR)Option + Size); + + /* Convert the path oprtion */ + Status = EfiInitpConvertEfiFilePath(OsDevicePath, + BcdOSLoaderString_SystemRoot, + Option, + RemainingSize); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Update the offset of the previous option */ + PreviousOption->NextEntryOffset = (ULONG_PTR)Option - (ULONG_PTR)&Entry->BcdData; + + /* Now compute the size of the next option, and add to the rolling sum */ + Size = BlGetBootOptionSize(Option); + TotalOptionSize += Size; + + /* Remember the previous option so we can update its next offset */ + PreviousOption = Option; + + /* Consume the option from the buffer */ + RemainingSize -= Size; + + /* Calculate where the next option should go */ + Option = (PVOID)((ULONG_PTR)Option + Size); + } + } + + /* Now convert everything else */ + AhCreateLoadOptionsList(CommandLine, + &Entry->BcdData, + RemainingSize, + &TotalOptionSize, + &PreviousOption, + &Size); + +Quickie: + /* Return the final size */ + *ResultLength = HeaderSize + TotalOptionSize; +} /*++ * @name EfiInitCreateInputParametersEx @@ -34,11 +336,134 @@ _In_ EFI_SYSTEM_TABLE *SystemTable ) { - DBG_UNREFERENCED_PARAMETER(ImageHandle); - DBG_UNREFERENCED_PARAMETER(SystemTable); - - /* Not yet implemented */ - return NULL; + EFI_BOOT_SERVICES* BootServices; + EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + PBL_FIRMWARE_DESCRIPTOR FirmwareData; + PBL_RETURN_ARGUMENTS ReturnArguments; + ULONG FirmwareOffset, ConsumedSize; + PBL_DEVICE_DESCRIPTOR AppDevice; + EFI_STATUS Status; + + /* Initialize the header with the signature and version */ + EfiInitScratch.Signature[0] = BOOT_APPLICATION_SIGNATURE_1; + EfiInitScratch.Signature[1] = BOOT_APPLICATION_SIGNATURE_2; + EfiInitScratch.Version = BOOT_APPLICATION_VERSION; + + /* Set the image type to x86 */ + EfiInitScratch.ImageType = EFI_IMAGE_MACHINE_IA32; + + /* Set the translation type to physical */ + EfiInitScratch.MemoryTranslationType = BOOT_MEMORY_TRANSLATION_TYPE_PHYSICAL; + + /* Indicate that the data was converted from EFI */ + BlpApplicationFlags |= BL_APPLICATION_FLAG_CONVERTED_FROM_EFI; + + /* Grab the loaded image protocol, which has our base and size */ + BootServices = SystemTable->BootServices; + Status = BootServices->HandleProtocol(ImageHandle, + &EfiLoadedImageProtocol, + (VOID**)&LoadedImage); + if (Status != EFI_SUCCESS) + { + SystemTable->ConOut->OutputString(SystemTable->ConsoleOutHandle, + L"Loaded image failed\n"); + return NULL; + } + + /* Capture it in the boot application parameters */ + EfiInitScratch.ImageBase = (ULONG_PTR)LoadedImage->ImageBase; + EfiInitScratch.ImageSize = (ULONG)LoadedImage->ImageSize; + + /* Now grab our device path protocol, so we can convert the path later on */ + Status = BootServices->HandleProtocol(ImageHandle, + &EfiDevicePathProtocol, + (VOID**)&DevicePath); + if (Status != EFI_SUCCESS) + { + SystemTable->ConOut->OutputString(SystemTable->ConsoleOutHandle, + L"Device path failed\n"); + return NULL; + } + + /* The built-in boot memory data comes right after our block */ + EfiInitScratch.MemoryDataOffset = + FIELD_OFFSET(BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH, BootMemoryData); + + /* Build the boot memory data structure, with 1 descriptor */ + EfiInitScratch.BootMemoryData.Version = BL_MEMORY_DATA_VERSION; + EfiInitScratch.BootMemoryData.MdListOffset = + FIELD_OFFSET(BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH, MemEntry) - + EfiInitScratch.MemoryDataOffset; + EfiInitScratch.BootMemoryData.DescriptorSize = sizeof(BL_MEMORY_DESCRIPTOR); + EfiInitScratch.BootMemoryData.DescriptorCount = 1; + EfiInitScratch.BootMemoryData.Unknown = 8; + + /* Build the memory entry descriptor for this image itself */ + EfiInitScratch.MemEntry.Flags = 8; + EfiInitScratch.MemEntry.Type = BlLoaderMemory; + EfiInitScratch.MemEntry.BasePage = EfiInitScratch.ImageBase >> PAGE_SHIFT; + EfiInitScratch.MemEntry.PageCount = ALIGN_UP_BY(EfiInitScratch.ImageSize, PAGE_SIZE) >> PAGE_SHIFT; + + /* The built-in application entry comes right after the memory descriptor*/ + EfiInitScratch.AppEntryOffset = + FIELD_OFFSET(BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH, AppEntry); + + /* Go and build it */ + EfiInitpCreateApplicationEntry(SystemTable, + (PBL_APPLICATION_ENTRY)&EfiInitScratch.AppEntry, + sizeof(EfiInitScratch.AppEntry), + DevicePath, + LoadedImage->FilePath, + LoadedImage->LoadOptions, + LoadedImage->LoadOptionsSize, + EfiInitScratch.MemEntry.PageCount, + &ConsumedSize, + &AppDevice); + + /* Boot device information comes right after the application entry */ + EfiInitScratch.BootDeviceOffset = ConsumedSize + EfiInitScratch.AppEntryOffset; + + /* Check if we have a boot device */ + if (AppDevice != NULL) + { + /* We do -- copy it */ + RtlCopyMemory(EfiInitScratch.AppEntry + ConsumedSize, + AppDevice, + AppDevice->Size); + + /* Firmware data follows right after the boot device entry */ + FirmwareOffset = AppDevice->Size + EfiInitScratch.BootDeviceOffset; + } + else + { + /* We do not, so zero out the space where a full boot device structure would fit */ + RtlZeroMemory(EfiInitScratch.AppEntry + ConsumedSize, + sizeof(BL_DEVICE_DESCRIPTOR)); + + /* And start the firmware data past that */ + FirmwareOffset = EfiInitScratch.BootDeviceOffset + sizeof(BL_DEVICE_DESCRIPTOR); + } + + /* Set the computed firmware data offset */ + EfiInitScratch.FirmwareParametersOffset = FirmwareOffset; + + /* Fill out the firmware data that's there */ + FirmwareData = (PVOID)((ULONG_PTR)&EfiInitScratch + EfiInitScratch.FirmwareParametersOffset); + FirmwareData->Version = BL_FIRMWARE_DESCRIPTOR_VERSION; + FirmwareData->ImageHandle = ImageHandle; + FirmwareData->SystemTable = SystemTable; + + /* Finally, set the return argument offset */ + EfiInitScratch.ReturnArgumentsOffset = FirmwareOffset + sizeof(BL_FIRMWARE_DESCRIPTOR); + + /* And fill out the return argument data */ + ReturnArguments = (PVOID)((ULONG_PTR)&EfiInitScratch + EfiInitScratch.ReturnArgumentsOffset); + ReturnArguments->Version = BL_RETURN_ARGUMENTS_VERSION; + + /* We're done, compute the final size and return the block */ + EfiInitScratch.Size = EfiInitScratch.ReturnArgumentsOffset + sizeof(BL_RETURN_ARGUMENTS); + return (PBOOT_APPLICATION_PARAMETER_BLOCK)&EfiInitScratch; } /*++ Added: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/r… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c (added) +++ trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -0,0 +1,77 @@ +/* +* COPYRIGHT: See COPYING.ARM in the top level directory +* PROJECT: ReactOS UEFI Boot Manager +* FILE: boot/environ/app/rtlcompat.c +* PURPOSE: RTL Library Compatibility Routines +* PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "bootmgr.h" + +/* FUNCTIONS *****************************************************************/ + +#if DBG +VOID FASTCALL +CHECK_PAGED_CODE_RTL ( + char *file, + int line + ) +{ + // boot-code is always ok +} +#endif + +PVOID +NTAPI +RtlpAllocateMemory ( + _In_ ULONG Bytes, + _In_ ULONG Tag + ) +{ + return NULL; +} + +VOID +NTAPI +RtlpFreeMemory ( + _In_ PVOID Mem, + _In_ ULONG Tag + ) +{ + return; +} + +NTSTATUS +NTAPI +RtlpSafeCopyMemory ( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length + ) +{ + RtlCopyMemory(Destination, Source, Length); + return STATUS_SUCCESS; +} + +VOID +NTAPI +RtlAssert ( + IN PVOID FailedAssertion, + IN PVOID FileName, + IN ULONG LineNumber, + IN PCHAR Message OPTIONAL + ) +{ + +} + +ULONG +DbgPrint ( + const char *Format, + ... + ) +{ + return 0; +} Propchange: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h (added) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -0,0 +1,153 @@ +/* +* COPYRIGHT: See COPYING.ARM in the top level directory +* PROJECT: ReactOS Boot Configuration Data +* FILE: boot/environ/include/bcd.h +* PURPOSE: BCD Main Header +* PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +#ifndef _BCD_H +#define _BCD_H + +/* ENUMERATIONS **************************************************************/ + +typedef enum BcdLibraryElementTypes +{ + BcdLibraryDevice_ApplicationDevice = 0x11000001, + BcdLibraryString_ApplicationPath = 0x12000002, + BcdLibraryString_Description = 0x12000004, + BcdLibraryString_PreferredLocale = 0x12000005, + BcdLibraryObjectList_InheritedObjects = 0x14000006, + BcdLibraryInteger_TruncatePhysicalMemory = 0x15000007, + BcdLibraryObjectList_RecoverySequence = 0x14000008, + BcdLibraryBoolean_AutoRecoveryEnabled = 0x16000009, + BcdLibraryIntegerList_BadMemoryList = 0x1700000a, + BcdLibraryBoolean_AllowBadMemoryAccess = 0x1600000b, + BcdLibraryInteger_FirstMegabytePolicy = 0x1500000c, + BcdLibraryInteger_RelocatePhysicalMemory = 0x1500000D, + BcdLibraryInteger_AvoidLowPhysicalMemory = 0x1500000E, + BcdLibraryBoolean_DebuggerEnabled = 0x16000010, + BcdLibraryInteger_DebuggerType = 0x15000011, + BcdLibraryInteger_SerialDebuggerPortAddress = 0x15000012, + BcdLibraryInteger_SerialDebuggerPort = 0x15000013, + BcdLibraryInteger_SerialDebuggerBaudRate = 0x15000014, + BcdLibraryInteger_1394DebuggerChannel = 0x15000015, + BcdLibraryString_UsbDebuggerTargetName = 0x12000016, + BcdLibraryBoolean_DebuggerIgnoreUsermodeExceptions = 0x16000017, + BcdLibraryInteger_DebuggerStartPolicy = 0x15000018, + BcdLibraryString_DebuggerBusParameters = 0x12000019, + BcdLibraryInteger_DebuggerNetHostIP = 0x1500001A, + BcdLibraryInteger_DebuggerNetPort = 0x1500001B, + BcdLibraryBoolean_DebuggerNetDhcp = 0x1600001C, + BcdLibraryString_DebuggerNetKey = 0x1200001D, + BcdLibraryBoolean_EmsEnabled = 0x16000020, + BcdLibraryInteger_EmsPort = 0x15000022, + BcdLibraryInteger_EmsBaudRate = 0x15000023, + BcdLibraryString_LoadOptionsString = 0x12000030, + BcdLibraryBoolean_DisplayAdvancedOptions = 0x16000040, + BcdLibraryBoolean_DisplayOptionsEdit = 0x16000041, + BcdLibraryDevice_BsdLogDevice = 0x11000043, + BcdLibraryString_BsdLogPath = 0x12000044, + BcdLibraryBoolean_GraphicsModeDisabled = 0x16000046, + BcdLibraryInteger_ConfigAccessPolicy = 0x15000047, + BcdLibraryBoolean_DisableIntegrityChecks = 0x16000048, + BcdLibraryBoolean_AllowPrereleaseSignatures = 0x16000049, + BcdLibraryString_FontPath = 0x1200004A, + BcdLibraryInteger_SiPolicy = 0x1500004B, + BcdLibraryInteger_FveBandId = 0x1500004C, + BcdLibraryBoolean_ConsoleExtendedInput = 0x16000050, + BcdLibraryInteger_GraphicsResolution = 0x15000052, + BcdLibraryBoolean_RestartOnFailure = 0x16000053, + BcdLibraryBoolean_GraphicsForceHighestMode = 0x16000054, + BcdLibraryBoolean_IsolatedExecutionContext = 0x16000060, + BcdLibraryBoolean_BootUxDisable = 0x1600006C, + BcdLibraryBoolean_BootShutdownDisabled = 0x16000074, + BcdLibraryIntegerList_AllowedInMemorySettings = 0x17000077, + BcdLibraryBoolean_ForceFipsCrypto = 0x16000079 +} BcdLibraryElementTypes; + +typedef enum BcdOSLoaderElementTypes +{ + BcdOSLoaderDevice_OSDevice = 0x21000001, + BcdOSLoaderString_SystemRoot = 0x22000002, + BcdOSLoaderObject_AssociatedResumeObject = 0x23000003, + BcdOSLoaderBoolean_DetectKernelAndHal = 0x26000010, + BcdOSLoaderString_KernelPath = 0x22000011, + BcdOSLoaderString_HalPath = 0x22000012, + BcdOSLoaderString_DbgTransportPath = 0x22000013, + BcdOSLoaderInteger_NxPolicy = 0x25000020, + BcdOSLoaderInteger_PAEPolicy = 0x25000021, + BcdOSLoaderBoolean_WinPEMode = 0x26000022, + BcdOSLoaderBoolean_DisableCrashAutoReboot = 0x26000024, + BcdOSLoaderBoolean_UseLastGoodSettings = 0x26000025, + BcdOSLoaderBoolean_AllowPrereleaseSignatures = 0x26000027, + BcdOSLoaderBoolean_NoLowMemory = 0x26000030, + BcdOSLoaderInteger_RemoveMemory = 0x25000031, + BcdOSLoaderInteger_IncreaseUserVa = 0x25000032, + BcdOSLoaderBoolean_UseVgaDriver = 0x26000040, + BcdOSLoaderBoolean_DisableBootDisplay = 0x26000041, + BcdOSLoaderBoolean_DisableVesaBios = 0x26000042, + BcdOSLoaderBoolean_DisableVgaMode = 0x26000043, + BcdOSLoaderInteger_ClusterModeAddressing = 0x25000050, + BcdOSLoaderBoolean_UsePhysicalDestination = 0x26000051, + BcdOSLoaderInteger_RestrictApicCluster = 0x25000052, + BcdOSLoaderBoolean_UseLegacyApicMode = 0x26000054, + BcdOSLoaderInteger_X2ApicPolicy = 0x25000055, + BcdOSLoaderBoolean_UseBootProcessorOnly = 0x26000060, + BcdOSLoaderInteger_NumberOfProcessors = 0x25000061, + BcdOSLoaderBoolean_ForceMaximumProcessors = 0x26000062, + BcdOSLoaderBoolean_ProcessorConfigurationFlags = 0x25000063, + BcdOSLoaderBoolean_MaximizeGroupsCreated = 0x26000064, + BcdOSLoaderBoolean_ForceGroupAwareness = 0x26000065, + BcdOSLoaderInteger_GroupSize = 0x25000066, + BcdOSLoaderInteger_UseFirmwarePciSettings = 0x26000070, + BcdOSLoaderInteger_MsiPolicy = 0x25000071, + BcdOSLoaderInteger_SafeBoot = 0x25000080, + BcdOSLoaderBoolean_SafeBootAlternateShell = 0x26000081, + BcdOSLoaderBoolean_BootLogInitialization = 0x26000090, + BcdOSLoaderBoolean_VerboseObjectLoadMode = 0x26000091, + BcdOSLoaderBoolean_KernelDebuggerEnabled = 0x260000a0, + BcdOSLoaderBoolean_DebuggerHalBreakpoint = 0x260000a1, + BcdOSLoaderBoolean_UsePlatformClock = 0x260000A2, + BcdOSLoaderBoolean_ForceLegacyPlatform = 0x260000A3, + BcdOSLoaderInteger_TscSyncPolicy = 0x250000A6, + BcdOSLoaderBoolean_EmsEnabled = 0x260000b0, + BcdOSLoaderInteger_DriverLoadFailurePolicy = 0x250000c1, + BcdOSLoaderInteger_BootMenuPolicy = 0x250000C2, + BcdOSLoaderBoolean_AdvancedOptionsOneTime = 0x260000C3, + BcdOSLoaderInteger_BootStatusPolicy = 0x250000E0, + BcdOSLoaderBoolean_DisableElamDrivers = 0x260000E1, + BcdOSLoaderInteger_HypervisorLaunchType = 0x250000F0, + BcdOSLoaderBoolean_HypervisorDebuggerEnabled = 0x260000F2, + BcdOSLoaderInteger_HypervisorDebuggerType = 0x250000F3, + BcdOSLoaderInteger_HypervisorDebuggerPortNumber = 0x250000F4, + BcdOSLoaderInteger_HypervisorDebuggerBaudrate = 0x250000F5, + BcdOSLoaderInteger_HypervisorDebugger1394Channel = 0x250000F6, + BcdOSLoaderInteger_BootUxPolicy = 0x250000F7, + BcdOSLoaderString_HypervisorDebuggerBusParams = 0x220000F9, + BcdOSLoaderInteger_HypervisorNumProc = 0x250000FA, + BcdOSLoaderInteger_HypervisorRootProcPerNode = 0x250000FB, + BcdOSLoaderBoolean_HypervisorUseLargeVTlb = 0x260000FC, + BcdOSLoaderInteger_HypervisorDebuggerNetHostIp = 0x250000FD, + BcdOSLoaderInteger_HypervisorDebuggerNetHostPort = 0x250000FE, + BcdOSLoaderInteger_TpmBootEntropyPolicy = 0x25000100, + BcdOSLoaderString_HypervisorDebuggerNetKey = 0x22000110, + BcdOSLoaderBoolean_HypervisorDebuggerNetDhcp = 0x26000114, + BcdOSLoaderInteger_HypervisorIommuPolicy = 0x25000115, + BcdOSLoaderInteger_XSaveDisable = 0x2500012b +} BcdOSLoaderElementTypes; + +/* DATA STRUCTURES ***********************************************************/ + +typedef struct _BCDE_DEVICE +{ + GUID AdditionalOptions; + BL_DEVICE_DESCRIPTOR Device; +} BCDE_DEVICE, *PBCDE_DEVICE; + +typedef struct _BCDE_STRING +{ + WCHAR String[ANYSIZE_ARRAY]; +} BCDE_STRING, *PBCDE_STRING; + +#endif Propchange: trunk/reactos/boot/environ/include/bcd.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -21,6 +21,88 @@ /* UEFI Headers */ #include <Uefi.h> +#include <DevicePath.h> +#include <LoadedImage.h> + +/* DEFINES *******************************************************************/ + +#define BL_APPLICATION_FLAG_CONVERTED_FROM_EFI 0x01 + +#define BOOT_APPLICATION_SIGNATURE_1 'TOOB' +#define BOOT_APPLICATION_SIGNATURE_2 ' PPA' + +#define BOOT_MEMORY_TRANSLATION_TYPE_PHYSICAL 0 +#define BOOT_MEMORY_TRANSLATION_TYPE_VIRTUAL 1 + +#define BOOT_APPLICATION_VERSION 2 +#define BL_MEMORY_DATA_VERSION 1 +#define BL_RETURN_ARGUMENTS_VERSION 1 +#define BL_FIRMWARE_DESCRIPTOR_VERSION 2 + +#define BL_APPLICATION_ENTRY_FLAG_NO_GUID 0x01 + +/* ENUMERATIONS **************************************************************/ + +// +// Boot Device Types +// +typedef enum _BL_DEVICE_TYPE +{ + UdpDevice = 4 +} BL_DEVICE_TYPE; + +// +// File Path Types +// +typedef enum _BL_PATH_TYPE +{ + EfiPath = 4 +} BL_PATH_TYPE; + +// +// Classes of Memory +// +typedef enum _BL_MEMORY_CLASS +{ + BlLoaderClass = 0xD, + BlApplicationClass, + BlSystemClass +} BL_MEMORY_CLASS; + +// +// Types of Memory +// +typedef enum _BL_MEMORY_TYPE +{ + // + // Loader Memory + // + BlLoaderMemory = 0xD0000002, + BlLoaderPageDirectory = 0xD0000006, + BlLoaderReferencePage = 0xD0000007, + BlLoaderRamDisk = 0xD0000008, + BlLoaderData = 0xD000000A, + BlLoaderSelfMap = 0xD000000F, + + // + // Application Memory + // + BlApplicationData = 0xE0000004, + + // + // System Memory + // + BlConventionalMemory = 0xF0000001, + BlUnusableMemory = 0xF0000002, + BlReservedMemory = 0xF0000003, + BlEfiBootMemory = 0xF0000004, + BlEfiRuntimeMemory = 0xF0000006, + BlAcpiReclaimMemory = 0xF0000008, + BlAcpiNvsMemory = 0xF0000009, + BlDeviceIoMemory = 0xF000000A, + BlDevicePortMemory = 0xF000000B, + BlPalMemory = 0xF000000C, +} BL_MEMORY_TYPE; /* DATA STRUCTURES ***********************************************************/ @@ -38,19 +120,184 @@ /* This should eventually go into a more public header */ typedef struct _BOOT_APPLICATION_PARAMETER_BLOCK { + /* This header tells the library what image we're dealing with */ ULONG Signature[2]; ULONG Version; ULONG Size; ULONG ImageType; ULONG MemoryTranslationType; + + /* Where is the image located */ ULONGLONG ImageBase; ULONG ImageSize; - ULONG MemorySettingsOffset; + + /* Offset to BL_MEMORY_DATA */ + ULONG MemoryDataOffset; + + /* Offset to BL_APPLICATION_ENTRY */ ULONG AppEntryOffset; + + /* Offset to BL_DEVICE_DESCRPIPTOR */ ULONG BootDeviceOffset; + + /* Offset to BL_FIRMWARE_PARAMETERS */ ULONG FirmwareParametersOffset; - ULONG FlagOffset; + + /* Offset to BL_RETURN_ARGUMENTS */ + ULONG ReturnArgumentsOffset; } BOOT_APPLICATION_PARAMETER_BLOCK, *PBOOT_APPLICATION_PARAMETER_BLOCK; + +typedef struct _BL_MEMORY_DATA +{ + ULONG Version; + ULONG MdListOffset; + ULONG DescriptorCount; + ULONG DescriptorSize; + ULONG Unknown; +} BL_MEMORY_DATA, *PBL_MEMORY_DATA; + +typedef struct _BL_FIRMWARE_DESCRIPTOR +{ + ULONG Version; + ULONG Unknown; + EFI_HANDLE ImageHandle; + EFI_SYSTEM_TABLE *SystemTable; +} BL_FIRMWARE_DESCRIPTOR, *PBL_FIRMWARE_DESCRIPTOR; + +typedef struct _BL_RETURN_ARGUMENTS +{ + ULONG Version; + ULONG ReturnArgumentData[6]; +} BL_RETURN_ARGUMENTS, *PBL_RETURN_ARGUMENTS; + +typedef struct _BL_MEMORY_DESCRIPTOR +{ + LIST_ENTRY ListEntry; + union + { + struct + { + ULONGLONG BasePage; + ULONGLONG VirtualPage; + }; + struct + { + ULONGLONG BaseAddress; + ULONGLONG VirtualAddress; + }; + }; + ULONGLONG PageCount; + ULONG Flags; + BL_MEMORY_TYPE Type; +} BL_MEMORY_DESCRIPTOR, *PBL_MEMORY_DESCRIPTOR; + +typedef struct _BOOT_ENTRY_OPTION +{ + ULONG Type; + ULONG DataOffset; + ULONG DataSize; + ULONG ListOffset; + ULONG NextEntryOffset; + ULONG Failed; +} BOOT_ENTRY_OPTION, *PBOOT_ENTRY_OPTION; + +typedef struct _BL_APPLICATION_ENTRY +{ + CHAR Signature[8]; + ULONG Flags; + GUID Guid; + ULONG Unknown[4]; + BOOT_ENTRY_OPTION BcdData; +} BL_APPLICATION_ENTRY, *PBL_APPLICATION_ENTRY; + +typedef struct _BL_HARDDISK_DEVICE +{ + ULONG PartitionType; + union + { + struct + { + ULONG PartitionSignature; + } Mbr; + + struct + { + GUID PartitionSignature; + } Gpt; + + struct + { + ULONG DiskNumber; + } Raw; + }; +} BL_HARDDISK_DEVICE; + +typedef struct _BL_LOCAL_DEVICE +{ + ULONG Type; + union + { + struct + { + ULONG DriveNumber; + } FloppyDisk; + + BL_HARDDISK_DEVICE HardDisk; + + struct + { + PHYSICAL_ADDRESS ImageBase; + LARGE_INTEGER ImageSize; + ULONG ImageOffset; + } RamDisk; + }; +} BL_LOCAL_DEVICE; + +typedef struct _BL_DEVICE_DESCRIPTOR +{ + ULONG Size; + ULONG Flags; + DEVICE_TYPE DeviceType; + ULONG Unknown; + union + { + BL_LOCAL_DEVICE Local; + + struct + { + ULONG Unknown; + } Remote; + + struct + { + ULONG PartitionNumber; + BL_LOCAL_DEVICE Disk; + } MbrPartition; + + struct + { + GUID PartitionGuid; + BL_LOCAL_DEVICE Disk; + } GptPartition; + }; +} BL_DEVICE_DESCRIPTOR, *PBL_DEVICE_DESCRIPTOR; + +typedef struct _BL_FILE_PATH_DESCRIPTOR +{ + ULONG Version; + ULONG Length; + ULONG PathType; + UCHAR Path[ANYSIZE_ARRAY]; +} BL_FILE_PATH_DESCRIPTOR, *PBL_FILE_PATH_DESCRIPTOR; + +typedef struct _BL_WINDOWS_LOAD_OPTIONS +{ + CHAR Signature[8]; + ULONG Version; + ULONG Length; + ULONG OsPathOffset; + WCHAR LoadOptions[ANYSIZE_ARRAY]; +} BL_WINDOWS_LOAD_OPTIONS, *PBL_WINDOWS_LOAD_OPTIONS; /* INITIALIZATION ROUTINES ***************************************************/ @@ -67,4 +314,11 @@ _In_ NTSTATUS Status ); +/* BCD ROUTINES **************************************************************/ + +ULONG +BlGetBootOptionSize ( + _In_ PBOOT_ENTRY_OPTION BcdOption + ); + #endif Added: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c (added) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -0,0 +1,69 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/misc/bcd.c + * PURPOSE: Boot Library BCD Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* FUNCTIONS *****************************************************************/ + +ULONG +BlGetBootOptionListSize ( + _In_ PBOOT_ENTRY_OPTION BcdOption + ) +{ + ULONG Size = 0, NextOffset = 0; + PBOOT_ENTRY_OPTION NextOption; + + /* Loop all the options*/ + do + { + /* Move to the next one */ + NextOption = (PBOOT_ENTRY_OPTION)((ULONG_PTR)BcdOption + NextOffset); + + /* Compute the size of the next one */ + Size += BlGetBootOptionSize(NextOption); + + /* Update the offset */ + NextOffset = NextOption->NextEntryOffset; + } while (NextOffset != 0); + + /* Return final computed size */ + return Size; +} + +ULONG +BlGetBootOptionSize ( + _In_ PBOOT_ENTRY_OPTION BcdOption + ) +{ + ULONG Size, Offset; + + /* Check if there's any data */ + if (BcdOption->DataOffset != 0) + { + /* Add the size of the data */ + Size = BcdOption->DataOffset + BcdOption->DataSize; + } + else + { + /* No data, just the structure itself */ + Size = sizeof(*BcdOption); + } + + /* Any associated options? */ + Offset = BcdOption->ListOffset; + if (Offset != 0) + { + /* Go get those too */ + Size += BlGetBootOptionListSize((PVOID)((ULONG_PTR)BcdOption + Offset)); + } + + /* Return the final size */ + return Size; +} Propchange: trunk/reactos/boot/environ/lib/misc/bcd.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Sat Sep 5 16:05:20 2015 @@ -1,10 +1,10 @@ /* -* COPYRIGHT: See COPYING.ARM in the top level directory -* PROJECT: ReactOS UEFI Boot Library -* FILE: boot/environ/lib/bootlib.c -* PURPOSE: Boot Library Initialization -* PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/misc/util.c + * PURPOSE: Boot Library Utility Functions + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ /* INCLUDES ******************************************************************/

1 0

[sginsberg] 69032: - Don't have two different implementation of KiConvertToGuiThread, first as inlined assembly gcc and second as a function call (for msvc). Always use the function call to be cons...
by sginsberg＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: sginsberg Date: Sat Sep 5 15:20:27 2015 New Revision: 69032 URL: http://svn.reactos.org/svn/reactos?rev=69032&view=rev Log: - Don't have two different implementation of KiConvertToGuiThread, first as inlined assembly gcc and second as a function call (for msvc). Always use the function call to be consistent with both compilers. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sat Sep 5 15:20:27 2015 @@ -524,6 +524,12 @@ IN ULONG_PTR Parameter2, IN ULONG_PTR Parameter3, IN PKTRAP_FRAME TrapFrame +); + +NTSTATUS +NTAPI +KiConvertToGuiThread( + VOID ); // @@ -777,55 +783,6 @@ } // -// Converts a base thread to a GUI thread -// -#ifdef __GNUC__ -FORCEINLINE -NTSTATUS -KiConvertToGuiThread(VOID) -{ - NTSTATUS NTAPI PsConvertToGuiThread(VOID); - NTSTATUS Result; - PVOID StackFrame; - - /* - * Converting to a GUI thread safely updates ESP in-place as well as the - * current Thread->TrapFrame and EBP when KeSwitchKernelStack is called. - * - * However, PsConvertToGuiThread "helpfully" restores EBP to the original - * caller's value, since it is considered a nonvolatile register. As such, - * as soon as we're back after the conversion and we try to store the result - * which will probably be in some stack variable (EBP-based), we'll crash as - * we are touching the de-allocated non-expanded stack. - * - * Thus we need a way to update our EBP before EBP is touched, and the only - * way to guarantee this is to do the call itself in assembly, use the EAX - * register to store the result, fixup EBP, and then let the C code continue - * on its merry way. - * - */ - __asm__ __volatile__ - ( - "movl %%ebp, %1\n\t" - "subl %%esp, %1\n\t" - "call _PsConvertToGuiThread@0\n\t" - "addl %%esp, %1\n\t" - "movl %1, %%ebp" - : "=a"(Result), "=r"(StackFrame) - : "p"(PsConvertToGuiThread) - : "%esp", "%ecx", "%edx", "memory" - ); - return Result; -} -#elif defined(_MSC_VER) -NTSTATUS -NTAPI -KiConvertToGuiThread(VOID); -#else -#error Unknown Compiler -#endif - -// // Switches from boot loader to initial kernel stack // FORCEINLINE Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Sep 5 15:20:27 2015 @@ -177,12 +177,29 @@ KiTrapExitStub KiTrapReturnNoSegments, (KI_RESTORE_VOLATILES OR KI_EXIT_IRET) KiTrapExitStub KiTrapReturnNoSegmentsRet8,(KI_RESTORE_VOLATILES OR KI_RESTORE_EFLAGS OR KI_EXIT_RET8) -#ifdef _MSC_VER EXTERN _PsConvertToGuiThread@0:PROC PUBLIC _KiConvertToGuiThread@0 _KiConvertToGuiThread@0: - /* Safe ebx */ + + /* + * Converting to a GUI thread safely updates ESP in-place as well as the + * current Thread->TrapFrame and EBP when KeSwitchKernelStack is called. + * + * However, PsConvertToGuiThread "helpfully" restores EBP to the original + * caller's value, since it is considered a nonvolatile register. As such, + * as soon as we're back after the conversion and we try to store the result + * which will probably be in some stack variable (EBP-based), we'll crash as + * we are touching the de-allocated non-expanded stack. + * + * Thus we need a way to update our EBP before EBP is touched, and the only + * way to guarantee this is to do the call itself in assembly, use the EAX + * register to store the result, fixup EBP, and then let the C code continue + * on its merry way. + * + */ + + /* Save ebx */ push ebx /* Calculate the stack frame offset in ebx */ @@ -201,6 +218,5 @@ /* return to the caller */ ret -#endif END

1 0

[tfaber] 69031: [NTOS:MM] - Use MmExpansionLock to synchronize changes to MmProcessList. Should fix random crashes in MmDeleteProcessAddressSpace. CORE-10111 #resolve
by tfaber＠svn.reactos.org 05 Sep '15

05 Sep '15

Author: tfaber Date: Sat Sep 5 14:39:40 2015 New Revision: 69031 URL: http://svn.reactos.org/svn/reactos?rev=69031&view=rev Log: [NTOS:MM] - Use MmExpansionLock to synchronize changes to MmProcessList. Should fix random crashes in MmDeleteProcessAddressSpace. CORE-10111 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -634,6 +634,8 @@ extern ULONG_PTR MmSubsectionBase; extern LARGE_INTEGER MmCriticalSectionTimeout; extern LIST_ENTRY MmWorkingSetExpansionHead; +extern KSPIN_LOCK MmExpansionLock; +extern PETHREAD MiExpansionLockOwner; FORCEINLINE BOOLEAN @@ -1328,6 +1330,29 @@ /* Reacquire unsafely */ MiLockProcessWorkingSetUnsafe(Process, Thread); } +} + +FORCEINLINE +KIRQL +MiAcquireExpansionLock(VOID) +{ + KIRQL OldIrql; + + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + KeAcquireSpinLock(&MmExpansionLock, &OldIrql); + ASSERT(MiExpansionLockOwner == NULL); + MiExpansionLockOwner = PsGetCurrentThread(); + return OldIrql; +} + +FORCEINLINE +VOID +MiReleaseExpansionLock(KIRQL OldIrql) +{ + ASSERT(MiExpansionLockOwner == PsGetCurrentThread()); + MiExpansionLockOwner = NULL; + KeReleaseSpinLock(&MmExpansionLock, OldIrql); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -1178,7 +1178,9 @@ Pfn1->PteAddress = (PMMPTE)PDE_BASE; /* Insert us into the Mm process list */ + OldIrql = MiAcquireExpansionLock(); InsertTailList(&MmProcessList, &Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); /* Get a PTE to map the page directory */ PointerPte = MiReserveSystemPtes(1, SystemPteSpace); Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -34,29 +34,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ - -FORCEINLINE -KIRQL -MiAcquireExpansionLock(VOID) -{ - KIRQL OldIrql; - - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - KeAcquireSpinLock(&MmExpansionLock, &OldIrql); - ASSERT(MiExpansionLockOwner == NULL); - MiExpansionLockOwner = PsGetCurrentThread(); - return OldIrql; -} - -FORCEINLINE -VOID -MiReleaseExpansionLock(KIRQL OldIrql) -{ - ASSERT(MiExpansionLockOwner == PsGetCurrentThread()); - MiExpansionLockOwner = NULL; - KeReleaseSpinLock(&MmExpansionLock, OldIrql); - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); -} VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat Sep 5 14:39:40 2015 @@ -575,13 +575,16 @@ NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) { + KIRQL OldIrql; PVOID Address; DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, Process->ImageFileName); #ifndef _M_AMD64 + OldIrql = MiAcquireExpansionLock(); RemoveEntryList(&Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); #endif MmLockAddressSpace(&Process->Vm);

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015