Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32SS][NTUSER] Fix MENU_DrawScrollArrows (#1753)
by Katayama Hirofumi MZ 08 Aug '19

08 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65e4efd475e98b970fa5a… commit 65e4efd475e98b970fa5add48a13fd6360997d62 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 8 13:56:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 13:56:23 2019 +0900 [WIN32SS][NTUSER] Fix MENU_DrawScrollArrows (#1753) Fix drawing the menu scrolling arrows. CORE-13211 --- win32ss/user/ntuser/menu.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 3ff90e9e330..13af632520d 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2177,11 +2177,10 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd */ static void MENU_DrawScrollArrows(PMENU lppop, HDC hdc) { - UINT arrow_bitmap_width, arrow_bitmap_height; - RECT rect, dfcrc; + UINT arrow_bitmap_height; + RECT rect; UINT Flags = 0; - arrow_bitmap_width = gpsi->oembmi[OBI_DNARROW].cx; arrow_bitmap_height = gpsi->oembmi[OBI_DNARROW].cy; rect.left = 0; @@ -2189,22 +2188,14 @@ static void MENU_DrawScrollArrows(PMENU lppop, HDC hdc) rect.right = lppop->cxMenu; rect.bottom = arrow_bitmap_height; FillRect(hdc, &rect, IntGetSysColorBrush(COLOR_MENU)); - dfcrc.left = (lppop->cxMenu - arrow_bitmap_width) / 2; - dfcrc.top = 0; - dfcrc.right = arrow_bitmap_width; - dfcrc.bottom = arrow_bitmap_height; - DrawFrameControl(hdc, &dfcrc, DFC_MENU, (lppop->iTop ? 0 : DFCS_INACTIVE)|DFCS_MENUARROWUP); + DrawFrameControl(hdc, &rect, DFC_MENU, (lppop->iTop ? 0 : DFCS_INACTIVE)|DFCS_MENUARROWUP); rect.top = lppop->cyMenu - arrow_bitmap_height; rect.bottom = lppop->cyMenu; FillRect(hdc, &rect, IntGetSysColorBrush(COLOR_MENU)); if (!(lppop->iTop < lppop->iMaxTop - (MENU_GetMaxPopupHeight(lppop) - 2 * arrow_bitmap_height))) Flags = DFCS_INACTIVE; - dfcrc.left = (lppop->cxMenu - arrow_bitmap_width) / 2; - dfcrc.top = lppop->cyMenu - arrow_bitmap_height; - dfcrc.right = arrow_bitmap_width; - dfcrc.bottom = lppop->cyMenu; - DrawFrameControl(hdc, &dfcrc, DFC_MENU, Flags|DFCS_MENUARROWDOWN); + DrawFrameControl(hdc, &rect, DFC_MENU, Flags|DFCS_MENUARROWDOWN); } /***********************************************************************

1 0

[reactos] 01/01: [FREELDR] Verbose error output for FS errors
by Victor Perevertkin 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=304e2810995da20d53b5a… commit 304e2810995da20d53b5acf8f0b664274d0b895b Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Mon Jul 29 23:25:03 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Aug 8 02:33:10 2019 +0300 [FREELDR] Verbose error output for FS errors --- boot/freeldr/freeldr/lib/inifile/ini_init.c | 2 ++ boot/freeldr/freeldr/lib/peloader.c | 10 +++++---- boot/freeldr/freeldr/ntldr/winldr.c | 2 ++ boot/freeldr/freeldr/ntldr/wlregistry.c | 34 ++++++++++++++++++++++++++--- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index 4db18a42908..52a24bcdfdc 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -51,6 +51,7 @@ BOOLEAN IniFileInitialize(VOID) Status = IniOpenIniFile(&FileId); if (Status != ESUCCESS) { + ERR("Error while opening freeldr.ini, Status: %d\n", Status); UiMessageBoxCritical("Error opening freeldr.ini or file not found.\nYou need to re-install FreeLoader."); return FALSE; } @@ -83,6 +84,7 @@ BOOLEAN IniFileInitialize(VOID) Status = ArcRead(FileId, FreeLoaderIniFileData, FreeLoaderIniFileSize, &Count); if (Status != ESUCCESS || Count != FreeLoaderIniFileSize) { + ERR("Error while reading freeldr.ini, Status: %d\n", Status); UiMessageBoxCritical("Error while reading freeldr.ini."); ArcClose(FileId); FrLdrTempFree(FreeLoaderIniFileData, TAG_INI_FILE); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index ac61aba1a9f..7f913f1c8d6 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -287,7 +287,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - // UiMessageBox("Can not open the file."); + WARN("Error while opening '%s', Status: %u\n", FileName, Status); return FALSE; } @@ -295,6 +295,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; @@ -348,11 +349,12 @@ WinLdrLoadImage(IN PCHAR FileName, TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); /* Set to 0 position and fully load the file image */ - Position.HighPart = Position.LowPart = 0; + Position.QuadPart = 0; Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - UiMessageBox("Error seeking to start of file."); + WARN("Error while seeking '%s', Status: %u\n", FileName, Status); + UiMessageBox("Error seeking the start of a file."); ArcClose(FileId); return FALSE; } @@ -360,7 +362,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - // Print(L"Error reading headers %s\n", FileName); + WARN("Error while reading '%s', Status: %u\n", FileName, Status); UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE; diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 98de7f29922..47649d5c028 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -369,6 +369,7 @@ WinLdrLoadModule(PCSTR ModuleName, if (Status != ESUCCESS) { /* In case of errors, we just return, without complaining to the user */ + WARN("Error while opening '%s', Status: %u\n", ModuleName, Status); return NULL; } @@ -395,6 +396,7 @@ WinLdrLoadModule(PCSTR ModuleName, ArcClose(FileId); if (Status != ESUCCESS) { + WARN("Error while reading '%s', Status: %u\n", ModuleName, Status); return NULL; } diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 3f813819dfc..8c78e60608c 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -49,10 +49,11 @@ WinLdrLoadSystemHive( /* Concatenate path and filename to get the full name */ strcpy(FullHiveName, DirectoryPath); strcat(FullHiveName, HiveName); - //Print(L"Loading %s...\n", FullHiveName); + Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { + WARN("Error while opening '%s', Status: %u\n", FullHiveName, Status); UiMessageBox("Opening hive file failed!"); return FALSE; } @@ -91,6 +92,7 @@ WinLdrLoadSystemHive( if (Status != ESUCCESS) { ArcClose(FileId); + WARN("Error while reading '%s', Status: %u\n", FullHiveName, Status); UiMessageBox("Unable to read from hive file!"); return FALSE; } @@ -320,12 +322,14 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, AnsiEqualsOem = TRUE; /* Open file with ANSI and store its size */ - //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(AnsiFileId, &FileInfo); if (Status != ESUCCESS) @@ -346,7 +350,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(OemFileId, &FileInfo); if (Status != ESUCCESS) @@ -362,7 +369,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(LanguageFileId, &FileInfo); if (Status != ESUCCESS) @@ -403,11 +413,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(AnsiFileId); @@ -418,11 +434,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(OemFileId); } @@ -432,11 +454,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(LanguageFileId); @@ -841,7 +869,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) return FALSE; - // Insert entry into the list + // Insert entry into the list if (!InsertInBootDriverList(BootDriverListHead, BootDriverEntry)) { // It was already there, so delete our entry

1 0

[reactos] 01/01: [FREELDR] Better fix for x64. Addendum to 268cdf57.
by Hermès Bélusca-Maïto 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc3314d4aa64d58222e5a… commit bc3314d4aa64d58222e5a0941293f0447a16903d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 19:30:55 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 19:30:55 2019 +0200 [FREELDR] Better fix for x64. Addendum to 268cdf57. --- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/freeldr/freeldr/arch/i386/drivemap.c | 126 ++++++++++++---------- boot/freeldr/freeldr/include/arch/i386/drivemap.h | 27 +++-- boot/freeldr/freeldr/include/freeldr.h | 2 +- 4 files changed, 87 insertions(+), 70 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 05489b3bda6..d4263050ad4 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -154,7 +154,7 @@ elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_ARC_SOURCE lib/fs/pxe.c arch/i386/ntoskrnl.c - # arch/i386/drivemap.c + arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c diff --git a/boot/freeldr/freeldr/arch/i386/drivemap.c b/boot/freeldr/freeldr/arch/i386/drivemap.c index f03d14e783e..2d38f346e28 100644 --- a/boot/freeldr/freeldr/arch/i386/drivemap.c +++ b/boot/freeldr/freeldr/arch/i386/drivemap.c @@ -22,11 +22,76 @@ DBG_DEFAULT_CHANNEL(DISK); +#ifdef _M_IX86 + BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler +#endif // _M_IX86 + +BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) +{ + ULONG Index; + + // Now verify that the user has given us appropriate strings + if ((strlen(DriveString) < 3) || + ((DriveString[0] != 'f') && (DriveString[0] != 'F') && + (DriveString[0] != 'h') && (DriveString[0] != 'H')) || + ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) + { + return FALSE; + } + + // Now verify that the user has given us appropriate numbers + // Make sure that only numeric characters were given + for (Index = 2; Index < strlen(DriveString); Index++) + { + if (DriveString[Index] < '0' || DriveString[Index] > '9') + { + return FALSE; + } + } + + // Now make sure that they are not outrageous values (i.e. hd90874) + if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) + { + return FALSE; + } + + return TRUE; +} + +UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) +{ + UCHAR BiosDriveNumber = 0; + + TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName); + + // If they passed in a number string then just + // convert it to decimal and return it + if (DeviceName[0] >= '0' && DeviceName[0] <= '9') + { + return (UCHAR)strtoul(DeviceName, NULL, 0); + } + + // Convert the drive number string into a number + // 'hd1' = 1 + BiosDriveNumber = atoi(&DeviceName[2]); + + // If it's a hard disk then set the high bit + if ((DeviceName[0] == 'h' || DeviceName[0] == 'H') && + (DeviceName[1] == 'd' || DeviceName[1] == 'D')) + { + BiosDriveNumber |= 0x80; + } + + return BiosDriveNumber; +} + +#ifdef _M_IX86 + VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; @@ -111,65 +176,6 @@ VOID DriveMapMapDrivesInSection(PCSTR SectionName) } } -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) -{ - ULONG Index; - - // Now verify that the user has given us appropriate strings - if ((strlen(DriveString) < 3) || - ((DriveString[0] != 'f') && (DriveString[0] != 'F') && - (DriveString[0] != 'h') && (DriveString[0] != 'H')) || - ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) - { - return FALSE; - } - - // Now verify that the user has given us appropriate numbers - // Make sure that only numeric characters were given - for (Index = 2; Index < strlen(DriveString); Index++) - { - if (DriveString[Index] < '0' || DriveString[Index] > '9') - { - return FALSE; - } - } - - // Now make sure that they are not outrageous values (i.e. hd90874) - if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) - { - return FALSE; - } - - return TRUE; -} - -UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) -{ - UCHAR BiosDriveNumber = 0; - - TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName); - - // If they passed in a number string then just - // convert it to decimal and return it - if (DeviceName[0] >= '0' && DeviceName[0] <= '9') - { - return (UCHAR)strtoul(DeviceName, NULL, 0); - } - - // Convert the drive number string into a number - // 'hd1' = 1 - BiosDriveNumber = atoi(&DeviceName[2]); - - // If it's a hard disk then set the high bit - if ((DeviceName[0] == 'h' || DeviceName[0] == 'H') && - (DeviceName[1] == 'd' || DeviceName[1] == 'D')) - { - BiosDriveNumber |= 0x80; - } - - return BiosDriveNumber; -} - VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { ULONG* RealModeIVT = (ULONG*)UlongToPtr(0x00000000); @@ -225,3 +231,5 @@ VOID DriveMapRemoveInt13Handler(VOID) DriveMapInstalled = FALSE; } } + +#endif // _M_IX86 diff --git a/boot/freeldr/freeldr/include/arch/i386/drivemap.h b/boot/freeldr/freeldr/include/arch/i386/drivemap.h index c999649a746..8c1d1088523 100644 --- a/boot/freeldr/freeldr/include/arch/i386/drivemap.h +++ b/boot/freeldr/freeldr/include/arch/i386/drivemap.h @@ -19,21 +19,30 @@ #pragma once +#ifdef _M_IX86 + #include <pshpack1.h> typedef struct { - UCHAR DriveMapCount; // Count of drives currently mapped - CHAR DriveMap[8]; // Map of BIOS drives + UCHAR DriveMapCount; // Count of drives currently mapped + CHAR DriveMap[8]; // Map of BIOS drives } DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; #include <poppack.h> -VOID DriveMapMapDrivesInSection(PCSTR SectionName); -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity -UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') -VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper -VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler +#endif // _M_IX86 + +BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity +UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') + +#ifdef _M_IX86 + +VOID DriveMapMapDrivesInSection(PCSTR SectionName); +VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper +VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler extern PVOID DriveMapInt13HandlerStart; extern PVOID DriveMapInt13HandlerEnd; -extern ULONG DriveMapOldInt13HandlerAddress; -extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; +extern ULONG DriveMapOldInt13HandlerAddress; +extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; + +#endif // _M_IX86 diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index 0ef42e40595..841fd4c64ee 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -107,10 +107,10 @@ #include <arch/pc/machpc.h> #include <arch/pc/x86common.h> #include <arch/pc/pxe.h> +#include <arch/i386/drivemap.h> #endif #if defined(_M_IX86) #include <arch/i386/i386.h> -#include <arch/i386/drivemap.h> #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #elif defined(_M_AMD64)

1 0

[reactos] 01/01: [FREELDR] Fix EditBox initial string display length: do not count the NULL-terminator.
by Hermès Bélusca-Maïto 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15bf4d18d6aa54bc0050f… commit 15bf4d18d6aa54bc0050fde7f1ef69f49eb82173 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 19:18:04 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 19:18:04 2019 +0200 [FREELDR] Fix EditBox initial string display length: do not count the NULL-terminator. --- boot/freeldr/freeldr/ui/tui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index b39e6fbc36d..8fd16aabc72 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -877,8 +877,8 @@ BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) temp[j++] = MessageText[i]; } - EditBoxTextLength = (ULONG)strlen(EditTextBuffer) + 1; - EditBoxTextLength = min(EditBoxTextLength, Length); + EditBoxTextLength = (ULONG)strlen(EditTextBuffer); + EditBoxTextLength = min(EditBoxTextLength, Length - 1); EditBoxTextPosition = 0; EditBoxLine = y2 - 2; EditBoxStartX = x1 + 3;

1 0

[reactos] 03/03: [FREELDR] Add ReactOS Setup as a custom boot type. (#1763) CORE-9023 CORE-16260
by Yaroslav Kibysh 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc7c6894489cfa77b66ec… commit bc7c6894489cfa77b66ecc7303228a72cee53fee Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Mon Jul 29 00:17:03 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 18:50:26 2019 +0200 [FREELDR] Add ReactOS Setup as a custom boot type. (#1763) CORE-9023 CORE-16260 Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- boot/freeldr/freeldr/bootmgr.c | 24 +++++++++++++++++++----- boot/freeldr/freeldr/custom.c | 24 ++++++++++++++++++------ boot/freeldr/freeldr/include/custom.h | 5 ++++- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index d0ce314bb46..8c97eeaaa95 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -31,6 +31,20 @@ VOID (*EDIT_OS_ENTRY_PROC)( IN ULONG_PTR SectionId OPTIONAL); +static VOID +EditCustomBootReactOSSetup( + IN ULONG_PTR SectionId OPTIONAL) +{ + EditCustomBootReactOS(SectionId, TRUE); +} + +static VOID +EditCustomBootNTOS( + IN ULONG_PTR SectionId OPTIONAL) +{ + EditCustomBootReactOS(SectionId, FALSE); +} + static const struct { PCSTR BootType; @@ -38,18 +52,18 @@ static const struct ARC_ENTRY_POINT OsLoader; } OSLoadingMethods[] = { - {"ReactOSSetup", EditCustomBootReactOS, LoadReactOSSetup}, + {"ReactOSSetup", EditCustomBootReactOSSetup, LoadReactOSSetup}, #ifdef _M_IX86 {"Drive" , EditCustomBootDisk , LoadAndBootDrive }, {"Partition" , EditCustomBootPartition , LoadAndBootPartition }, {"BootSector" , EditCustomBootSectorFile, LoadAndBootBootSector}, - {"Linux" , EditCustomBootLinux , LoadAndBootLinux }, - {"WindowsNT40" , EditCustomBootReactOS, LoadAndBootWindows}, + {"Linux" , EditCustomBootLinux, LoadAndBootLinux }, + {"WindowsNT40" , EditCustomBootNTOS , LoadAndBootWindows}, #endif - {"Windows" , EditCustomBootReactOS, LoadAndBootWindows}, - {"Windows2003" , EditCustomBootReactOS, LoadAndBootWindows}, + {"Windows" , EditCustomBootNTOS , LoadAndBootWindows}, + {"Windows2003" , EditCustomBootNTOS , LoadAndBootWindows}, }; /* FUNCTIONS ******************************************************************/ diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 319cbcd61a7..dfeba3051e5 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -51,7 +51,8 @@ VOID OptionMenuCustomBoot(VOID) "Boot Sector File", "Linux", #endif - "ReactOS" + "ReactOS", + "ReactOS Setup" }; ULONG SelectedMenuItem; @@ -84,11 +85,19 @@ VOID OptionMenuCustomBoot(VOID) EditCustomBootLinux(0); break; case 4: // ReactOS + EditCustomBootReactOS(0, FALSE); + break; + case 5: // ReactOS Setup + EditCustomBootReactOS(0, TRUE); + break; #else - case 0: -#endif - EditCustomBootReactOS(0); + case 0: // ReactOS + EditCustomBootReactOS(0, FALSE); break; + case 1: // ReactOS Setup + EditCustomBootReactOS(0, TRUE); + break; +#endif } } @@ -386,7 +395,10 @@ VOID EditCustomBootLinux(IN ULONG_PTR SectionId OPTIONAL) #endif // _M_IX86 -VOID EditCustomBootReactOS(IN ULONG_PTR SectionId OPTIONAL) +VOID +EditCustomBootReactOS( + IN ULONG_PTR SectionId OPTIONAL, + IN BOOLEAN IsSetup) { TIMEINFO* TimeInfo; OperatingSystemItem OperatingSystem; @@ -452,7 +464,7 @@ VOID EditCustomBootReactOS(IN ULONG_PTR SectionId OPTIONAL) return; /* Add the BootType */ - if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) + if (!IniAddSettingValueToSection(SectionId, "BootType", IsSetup ? "ReactOSSetup" : "Windows2003")) return; /* Construct the ReactOS ARC system path */ diff --git a/boot/freeldr/freeldr/include/custom.h b/boot/freeldr/freeldr/include/custom.h index 0bf8d680f32..b38241f135e 100644 --- a/boot/freeldr/freeldr/include/custom.h +++ b/boot/freeldr/freeldr/include/custom.h @@ -36,7 +36,10 @@ VOID EditCustomBootLinux(IN ULONG_PTR SectionId OPTIONAL); VOID OptionMenuCustomBoot(VOID); #endif -VOID EditCustomBootReactOS(IN ULONG_PTR SectionId OPTIONAL); +VOID +EditCustomBootReactOS( + IN ULONG_PTR SectionId OPTIONAL, + IN BOOLEAN IsSetup); #ifdef HAS_OPTION_MENU_REBOOT VOID OptionMenuReboot(VOID);

1 0

[reactos] 02/03: [FREELDR] Add "Edit Boot Command Line" feature. (#1763) CORE-9023 CORE-16260
by Yaroslav Kibysh 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b34d516e814b841de4c54… commit b34d516e814b841de4c54d85c31c1ce9b8d1829c Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sun Jul 28 20:23:41 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 18:50:23 2019 +0200 [FREELDR] Add "Edit Boot Command Line" feature. (#1763) CORE-9023 CORE-16260 Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- boot/freeldr/freeldr/bootmgr.c | 77 +++++++++++--- boot/freeldr/freeldr/custom.c | 178 +++++++++++++++++++++++++-------- boot/freeldr/freeldr/include/custom.h | 24 +++-- boot/freeldr/freeldr/include/freeldr.h | 3 + boot/freeldr/freeldr/include/options.h | 6 +- boot/freeldr/freeldr/options.c | 14 ++- 6 files changed, 231 insertions(+), 71 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 756f74e69dd..d0ce314bb46 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -26,25 +26,30 @@ DBG_DEFAULT_CHANNEL(INIFILE); /* GLOBALS ********************************************************************/ +typedef +VOID +(*EDIT_OS_ENTRY_PROC)( + IN ULONG_PTR SectionId OPTIONAL); + static const struct { PCSTR BootType; + EDIT_OS_ENTRY_PROC EditOsEntry; ARC_ENTRY_POINT OsLoader; } OSLoadingMethods[] = { - {"ReactOSSetup", LoadReactOSSetup }, + {"ReactOSSetup", EditCustomBootReactOS, LoadReactOSSetup}, #ifdef _M_IX86 - {"BootSector" , LoadAndBootBootSector}, - {"Drive" , LoadAndBootDrive }, - {"Partition" , LoadAndBootPartition }, - - {"Linux" , LoadAndBootLinux }, + {"Drive" , EditCustomBootDisk , LoadAndBootDrive }, + {"Partition" , EditCustomBootPartition , LoadAndBootPartition }, + {"BootSector" , EditCustomBootSectorFile, LoadAndBootBootSector}, - {"Windows" , LoadAndBootWindows }, - {"WindowsNT40" , LoadAndBootWindows }, + {"Linux" , EditCustomBootLinux , LoadAndBootLinux }, + {"WindowsNT40" , EditCustomBootReactOS, LoadAndBootWindows}, #endif - {"Windows2003" , LoadAndBootWindows }, + {"Windows" , EditCustomBootReactOS, LoadAndBootWindows}, + {"Windows2003" , EditCustomBootReactOS, LoadAndBootWindows}, }; /* FUNCTIONS ******************************************************************/ @@ -185,6 +190,42 @@ VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem) } } +#ifdef HAS_OPTION_MENU_EDIT_CMDLINE + +VOID EditOperatingSystemEntry(IN OperatingSystemItem* OperatingSystem) +{ + ULONG_PTR SectionId; + PCSTR SectionName = OperatingSystem->SectionName; + ULONG i; + CHAR BootType[80]; + + /* Try to open the operating system section in the .ini file */ + if (!IniOpenSection(SectionName, &SectionId)) + { + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); + return; + } + + /* Try to read the boot type */ + *BootType = ANSI_NULL; + IniReadSettingByName(SectionId, "BootType", BootType, sizeof(BootType)); + + /* We must have the "BootType" value (it has been possibly added by InitOperatingSystemList()) */ + ASSERT(*BootType); + + /* Loop through the OS loading method table and find a suitable OS entry editor */ + for (i = 0; i < sizeof(OSLoadingMethods) / sizeof(OSLoadingMethods[0]); ++i) + { + if (_stricmp(BootType, OSLoadingMethods[i].BootType) == 0) + { + OSLoadingMethods[i].EditOsEntry(SectionId); + return; + } + } +} + +#endif // HAS_OPTION_MENU_EDIT_CMDLINE + LONG GetTimeOut(VOID) { CHAR TimeOutText[20]; @@ -212,14 +253,22 @@ MainBootMenuKeyPressFilter( IN ULONG SelectedMenuItem, IN PVOID Context OPTIONAL) { - if (KeyPress == KEY_F8) + switch (KeyPress) { - DoOptionsMenu(); + case KEY_F8: + DoOptionsMenu(&((OperatingSystemItem*)Context)[SelectedMenuItem]); return TRUE; - } - /* We didn't handle the key */ - return FALSE; +#ifdef HAS_OPTION_MENU_EDIT_CMDLINE + case KEY_F10: + EditOperatingSystemEntry(&((OperatingSystemItem*)Context)[SelectedMenuItem]); + return TRUE; +#endif + + default: + /* We didn't handle the key */ + return FALSE; + } } VOID RunLoader(VOID) diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 0ef5f5af160..319cbcd61a7 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -40,6 +40,8 @@ const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; /* FUNCTIONS ******************************************************************/ +#ifdef HAS_OPTION_MENU_CUSTOM_BOOT + VOID OptionMenuCustomBoot(VOID) { PCSTR CustomBootMenuList[] = { @@ -70,42 +72,56 @@ VOID OptionMenuCustomBoot(VOID) { #ifdef _M_IX86 case 0: // Disk - OptionMenuCustomBootDisk(); + EditCustomBootDisk(0); break; case 1: // Partition - OptionMenuCustomBootPartition(); + EditCustomBootPartition(0); break; case 2: // Boot Sector File - OptionMenuCustomBootBootSectorFile(); + EditCustomBootSectorFile(0); break; case 3: // Linux - OptionMenuCustomBootLinux(); + EditCustomBootLinux(0); break; case 4: // ReactOS #else case 0: #endif - OptionMenuCustomBootReactOS(); + EditCustomBootReactOS(0); break; } } +#endif // HAS_OPTION_MENU_CUSTOM_BOOT + #ifdef _M_IX86 -VOID OptionMenuCustomBootDisk(VOID) +VOID EditCustomBootDisk(IN ULONG_PTR SectionId OPTIONAL) { - ULONG_PTR SectionId; - CHAR SectionName[100]; - CHAR BootDriveString[20]; TIMEINFO* TimeInfo; OperatingSystemItem OperatingSystem; + CHAR SectionName[100]; + CHAR BootDriveString[20]; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + if (SectionId != 0) + { + /* Load the settings */ + IniReadSettingByName(SectionId, "BootDrive", BootDriveString, sizeof(BootDriveString)); + } + + if (!UiEditBox(BootDrivePrompt, BootDriveString, sizeof(BootDriveString))) return; + /* Modify the settings values and return if we were in edit mode */ + if (SectionId != 0) + { + IniModifySettingValue(SectionId, "BootDrive", BootDriveString); + return; + } + /* Generate a unique section name */ TimeInfo = ArcGetTime(); RtlStringCbPrintfA(SectionName, sizeof(SectionName), @@ -132,25 +148,39 @@ VOID OptionMenuCustomBootDisk(VOID) LoadOperatingSystem(&OperatingSystem); } -VOID OptionMenuCustomBootPartition(VOID) +VOID EditCustomBootPartition(IN ULONG_PTR SectionId OPTIONAL) { - ULONG_PTR SectionId; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; CHAR SectionName[100]; CHAR BootDriveString[20]; CHAR BootPartitionString[20]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + if (SectionId != 0) + { + /* Load the settings */ + IniReadSettingByName(SectionId, "BootDrive", BootDriveString, sizeof(BootDriveString)); + IniReadSettingByName(SectionId, "BootPartition", BootPartitionString, sizeof(BootPartitionString)); + } + + if (!UiEditBox(BootDrivePrompt, BootDriveString, sizeof(BootDriveString))) return; - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, sizeof(BootPartitionString))) return; + /* Modify the settings values and return if we were in edit mode */ + if (SectionId != 0) + { + IniModifySettingValue(SectionId, "BootDrive", BootDriveString); + IniModifySettingValue(SectionId, "BootPartition", BootPartitionString); + return; + } + /* Generate a unique section name */ TimeInfo = ArcGetTime(); RtlStringCbPrintfA(SectionName, sizeof(SectionName), @@ -181,29 +211,45 @@ VOID OptionMenuCustomBootPartition(VOID) LoadOperatingSystem(&OperatingSystem); } -VOID OptionMenuCustomBootBootSectorFile(VOID) +VOID EditCustomBootSectorFile(IN ULONG_PTR SectionId OPTIONAL) { - ULONG_PTR SectionId; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; CHAR SectionName[100]; CHAR BootDriveString[20]; CHAR BootPartitionString[20]; CHAR BootSectorFileString[200]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); RtlZeroMemory(BootSectorFileString, sizeof(BootSectorFileString)); - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + if (SectionId != 0) + { + /* Load the settings */ + IniReadSettingByName(SectionId, "BootDrive", BootDriveString, sizeof(BootDriveString)); + IniReadSettingByName(SectionId, "BootPartition", BootPartitionString, sizeof(BootPartitionString)); + IniReadSettingByName(SectionId, "BootSectorFile", BootSectorFileString, sizeof(BootSectorFileString)); + } + + if (!UiEditBox(BootDrivePrompt, BootDriveString, sizeof(BootDriveString))) + return; + + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, sizeof(BootPartitionString))) return; - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + if (!UiEditBox(BootSectorFilePrompt, BootSectorFileString, sizeof(BootSectorFileString))) return; - if (!UiEditBox(BootSectorFilePrompt, BootSectorFileString, 200)) + /* Modify the settings values and return if we were in edit mode */ + if (SectionId != 0) + { + IniModifySettingValue(SectionId, "BootDrive", BootDriveString); + IniModifySettingValue(SectionId, "BootPartition", BootPartitionString); + IniModifySettingValue(SectionId, "BootSectorFile", BootSectorFileString); return; + } /* Generate a unique section name */ TimeInfo = ArcGetTime(); @@ -239,17 +285,16 @@ VOID OptionMenuCustomBootBootSectorFile(VOID) LoadOperatingSystem(&OperatingSystem); } -VOID OptionMenuCustomBootLinux(VOID) +VOID EditCustomBootLinux(IN ULONG_PTR SectionId OPTIONAL) { - ULONG_PTR SectionId; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; CHAR SectionName[100]; CHAR BootDriveString[20]; CHAR BootPartitionString[20]; CHAR LinuxKernelString[200]; CHAR LinuxInitrdString[200]; CHAR LinuxCommandLineString[200]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -258,21 +303,42 @@ VOID OptionMenuCustomBootLinux(VOID) RtlZeroMemory(LinuxInitrdString, sizeof(LinuxInitrdString)); RtlZeroMemory(LinuxCommandLineString, sizeof(LinuxCommandLineString)); - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + if (SectionId != 0) + { + /* Load the settings */ + IniReadSettingByName(SectionId, "BootDrive", BootDriveString, sizeof(BootDriveString)); + IniReadSettingByName(SectionId, "BootPartition", BootPartitionString, sizeof(BootPartitionString)); + IniReadSettingByName(SectionId, "Kernel", LinuxKernelString, sizeof(LinuxKernelString)); + IniReadSettingByName(SectionId, "Initrd", LinuxInitrdString, sizeof(LinuxInitrdString)); + IniReadSettingByName(SectionId, "CommandLine", LinuxCommandLineString, sizeof(LinuxCommandLineString)); + } + + if (!UiEditBox(BootDrivePrompt, BootDriveString, sizeof(BootDriveString))) return; - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, sizeof(BootPartitionString))) return; - if (!UiEditBox(LinuxKernelPrompt, LinuxKernelString, 200)) + if (!UiEditBox(LinuxKernelPrompt, LinuxKernelString, sizeof(LinuxKernelString))) return; - if (!UiEditBox(LinuxInitrdPrompt, LinuxInitrdString, 200)) + if (!UiEditBox(LinuxInitrdPrompt, LinuxInitrdString, sizeof(LinuxInitrdString))) return; - if (!UiEditBox(LinuxCommandLinePrompt, LinuxCommandLineString, 200)) + if (!UiEditBox(LinuxCommandLinePrompt, LinuxCommandLineString, sizeof(LinuxCommandLineString))) return; + /* Modify the settings values and return if we were in edit mode */ + if (SectionId != 0) + { + IniModifySettingValue(SectionId, "BootDrive", BootDriveString); + IniModifySettingValue(SectionId, "BootPartition", BootPartitionString); + IniModifySettingValue(SectionId, "Kernel", LinuxKernelString); + IniModifySettingValue(SectionId, "Initrd", LinuxInitrdString); + IniModifySettingValue(SectionId, "CommandLine", LinuxCommandLineString); + return; + } + /* Generate a unique section name */ TimeInfo = ArcGetTime(); RtlStringCbPrintfA(SectionName, sizeof(SectionName), @@ -320,35 +386,59 @@ VOID OptionMenuCustomBootLinux(VOID) #endif // _M_IX86 -VOID OptionMenuCustomBootReactOS(VOID) +VOID EditCustomBootReactOS(IN ULONG_PTR SectionId OPTIONAL) { - ULONG_PTR SectionId; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; CHAR SectionName[100]; CHAR BootDriveString[20]; CHAR BootPartitionString[20]; CHAR ReactOSSystemPath[200]; CHAR ReactOSARCPath[200]; CHAR ReactOSOptions[200]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); + RtlZeroMemory(ReactOSARCPath, sizeof(ReactOSARCPath)); RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - return; + if (SectionId != 0) + { + /* Load the settings */ + // TODO? Maybe use DissectArcPath(CHAR *ArcPath, CHAR *BootPath, UCHAR* BootDrive, ULONG* BootPartition) to get back to the small elements. + IniReadSettingByName(SectionId, "SystemPath", ReactOSARCPath, sizeof(ReactOSARCPath)); + IniReadSettingByName(SectionId, "Options", ReactOSOptions, sizeof(ReactOSOptions)); + } - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - return; + if (SectionId == 0) + { + if (!UiEditBox(BootDrivePrompt, BootDriveString, sizeof(BootDriveString))) + return; - if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, sizeof(BootPartitionString))) + return; + + if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, sizeof(ReactOSSystemPath))) + return; + } + else + { + if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSARCPath, sizeof(ReactOSARCPath))) + return; + } + + if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, sizeof(ReactOSOptions))) return; - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) + /* Modify the settings values and return if we were in edit mode */ + if (SectionId != 0) + { + IniModifySettingValue(SectionId, "SystemPath", ReactOSARCPath); + IniModifySettingValue(SectionId, "Options", ReactOSOptions); return; + } /* Generate a unique section name */ TimeInfo = ArcGetTime(); @@ -383,6 +473,8 @@ VOID OptionMenuCustomBootReactOS(VOID) LoadOperatingSystem(&OperatingSystem); } +#ifdef HAS_OPTION_MENU_REBOOT + VOID OptionMenuReboot(VOID) { UiMessageBox("The system will now reboot."); @@ -392,3 +484,5 @@ VOID OptionMenuReboot(VOID) #endif Reboot(); } + +#endif // HAS_OPTION_MENU_REBOOT diff --git a/boot/freeldr/freeldr/include/custom.h b/boot/freeldr/freeldr/include/custom.h index c139d532004..0bf8d680f32 100644 --- a/boot/freeldr/freeldr/include/custom.h +++ b/boot/freeldr/freeldr/include/custom.h @@ -19,19 +19,25 @@ #pragma once -#ifdef _M_IX86 - +#define HAS_OPTION_MENU_EDIT_CMDLINE #define HAS_OPTION_MENU_CUSTOM_BOOT #define HAS_OPTION_MENU_REBOOT -VOID OptionMenuReboot(VOID); +#ifdef _M_IX86 -VOID OptionMenuCustomBoot(VOID); -VOID OptionMenuCustomBootDisk(VOID); -VOID OptionMenuCustomBootPartition(VOID); -VOID OptionMenuCustomBootBootSectorFile(VOID); -VOID OptionMenuCustomBootLinux(VOID); +VOID EditCustomBootDisk(IN ULONG_PTR SectionId OPTIONAL); +VOID EditCustomBootPartition(IN ULONG_PTR SectionId OPTIONAL); +VOID EditCustomBootSectorFile(IN ULONG_PTR SectionId OPTIONAL); +VOID EditCustomBootLinux(IN ULONG_PTR SectionId OPTIONAL); #endif // _M_IX86 -VOID OptionMenuCustomBootReactOS(VOID); +#ifdef HAS_OPTION_MENU_CUSTOM_BOOT +VOID OptionMenuCustomBoot(VOID); +#endif + +VOID EditCustomBootReactOS(IN ULONG_PTR SectionId OPTIONAL); + +#ifdef HAS_OPTION_MENU_REBOOT +VOID OptionMenuReboot(VOID); +#endif diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index d981dc2649a..0ef42e40595 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -126,6 +126,9 @@ VOID __cdecl BootMain(IN PCCH CmdLine); VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); +#ifdef HAS_OPTION_MENU_EDIT_CMDLINE +VOID EditOperatingSystemEntry(IN OperatingSystemItem* OperatingSystem); +#endif VOID RunLoader(VOID); VOID FrLdrCheckCpuCompatibility(VOID); diff --git a/boot/freeldr/freeldr/include/options.h b/boot/freeldr/freeldr/include/options.h index 5ff2a45f999..f7427798366 100644 --- a/boot/freeldr/freeldr/include/options.h +++ b/boot/freeldr/freeldr/include/options.h @@ -19,6 +19,6 @@ #pragma once -VOID DoOptionsMenu(VOID); -VOID DisplayBootTimeOptions(VOID); -VOID AppendBootTimeOptions(PCHAR BootOptions); +VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem); +VOID DisplayBootTimeOptions(VOID); +VOID AppendBootTimeOptions(PCHAR BootOptions); diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 701f8693893..ac302254bf5 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -42,6 +42,9 @@ PCSTR OptionsMenuList[] = NULL, "Start ReactOS normally", +#ifdef HAS_OPTION_MENU_EDIT_CMDLINE + "Edit Boot Command Line (F10)", +#endif #ifdef HAS_OPTION_MENU_CUSTOM_BOOT "Custom Boot", #endif @@ -86,7 +89,7 @@ static BOOLEAN DebuggingMode = FALSE; /* FUNCTIONS ******************************************************************/ -VOID DoOptionsMenu(VOID) +VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem) { ULONG SelectedMenuItem; CHAR DebugChannelString[100]; @@ -157,13 +160,18 @@ VOID DoOptionsMenu(VOID) VgaMode = FALSE; DebuggingMode = FALSE; break; +#ifdef HAS_OPTION_MENU_EDIT_CMDLINE + case 12: // Edit command line + EditOperatingSystemEntry(OperatingSystem); + break; +#endif #ifdef HAS_OPTION_MENU_CUSTOM_BOOT - case 12: // Custom Boot + case 13: // Custom Boot OptionMenuCustomBoot(); break; #endif #ifdef HAS_OPTION_MENU_REBOOT - case 13: // Reboot + case 14: // Reboot OptionMenuReboot(); break; #endif

1 0

[reactos] 01/03: [FREELDR] Some enhancements for the UI code. (#1763)
by Hermès Bélusca-Maïto 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d5b6a5600c73696fa8a4… commit 5d5b6a5600c73696fa8a42e980f156d2f771f683 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 2 21:35:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 18:50:20 2019 +0200 [FREELDR] Some enhancements for the UI code. (#1763) - EditBox: Display the initial contents of the text buffer. This allows modifying already existing text in the passed buffer. - Menu: * Make both MenuHeader and MenuFooter optional (but the latter is more "optional" than the former...). * Allow passing a user-provided "Context" structure to the key-press filter callback, and pass also the index of the menu item that has been selected. - Minor formatting fixes. --- boot/freeldr/freeldr/bootmgr.c | 9 +- boot/freeldr/freeldr/custom.c | 4 +- boot/freeldr/freeldr/include/ui.h | 64 ++++++++--- boot/freeldr/freeldr/include/ui/gui.h | 15 ++- boot/freeldr/freeldr/include/ui/noui.h | 15 ++- boot/freeldr/freeldr/include/ui/tui.h | 25 +++- boot/freeldr/freeldr/options.c | 4 +- boot/freeldr/freeldr/ui/directui.c | 197 ++++++++++++++++---------------- boot/freeldr/freeldr/ui/minitui.c | 22 ++-- boot/freeldr/freeldr/ui/noui.c | 14 ++- boot/freeldr/freeldr/ui/tui.c | 21 ++-- boot/freeldr/freeldr/ui/tuimenu.c | 203 ++++++++++++++++----------------- boot/freeldr/freeldr/ui/ui.c | 21 +++- 13 files changed, 358 insertions(+), 256 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 6a9cb569e29..756f74e69dd 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -206,7 +206,11 @@ LONG GetTimeOut(VOID) return TimeOut; } -BOOLEAN MainBootMenuKeyPressFilter(ULONG KeyPress) +BOOLEAN +MainBootMenuKeyPressFilter( + IN ULONG KeyPress, + IN ULONG SelectedMenuItem, + IN PVOID Context OPTIONAL) { if (KeyPress == KEY_F8) { @@ -309,7 +313,8 @@ VOID RunLoader(VOID) TimeOut, &SelectedOperatingSystem, FALSE, - MainBootMenuKeyPressFilter)) + MainBootMenuKeyPressFilter, + OperatingSystemList)) { UiMessageBox("Press ENTER to reboot."); goto Reboot; diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index 25fee60a4eb..0ef5f5af160 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -53,14 +53,14 @@ VOID OptionMenuCustomBoot(VOID) }; ULONG SelectedMenuItem; - if (!UiDisplayMenu("Please choose a boot method:", "", + if (!UiDisplayMenu("Please choose a boot method:", NULL, FALSE, CustomBootMenuList, sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]), 0, -1, &SelectedMenuItem, TRUE, - NULL)) + NULL, NULL)) { /* The user pressed ESC */ return; diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index 151c0af1d48..f773ae84540 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -97,24 +97,42 @@ VOID UiFadeOut(VOID); // Fades the scr typedef struct tagUI_MENU_INFO { - PCSTR MenuHeader; - PCSTR MenuFooter; - BOOLEAN ShowBootOptions; - - PCSTR* MenuItemList; - ULONG MenuItemCount; - LONG MenuTimeRemaining; - ULONG SelectedMenuItem; - - ULONG Left; - ULONG Top; - ULONG Right; - ULONG Bottom; + PCSTR MenuHeader; + PCSTR MenuFooter; + BOOLEAN ShowBootOptions; + + PCSTR* MenuItemList; + ULONG MenuItemCount; + LONG MenuTimeRemaining; + ULONG SelectedMenuItem; + PVOID Context; + + ULONG Left; + ULONG Top; + ULONG Right; + ULONG Bottom; } UI_MENU_INFO, *PUI_MENU_INFO; -typedef BOOLEAN (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); - -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +typedef +BOOLEAN +(*UiMenuKeyPressFilterCallback)( + IN ULONG KeyPress, + IN ULONG SelectedMenuItem, + IN PVOID Context OPTIONAL); + +BOOLEAN +UiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL); /////////////////////////////////////////////////////////////////////////////////////// // @@ -145,7 +163,19 @@ typedef struct tagUIVTBL VOID (*FadeInBackdrop)(VOID); VOID (*FadeOut)(VOID); - BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); + BOOLEAN (*DisplayMenu)( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL); + VOID (*DrawMenu)(PUI_MENU_INFO MenuInfo); } UIVTBL, *PUIVTBL; diff --git a/boot/freeldr/freeldr/include/ui/gui.h b/boot/freeldr/freeldr/include/ui/gui.h index 7ba6e3ce4d3..516394b0b8a 100644 --- a/boot/freeldr/freeldr/include/ui/gui.h +++ b/boot/freeldr/freeldr/include/ui/gui.h @@ -49,6 +49,19 @@ UCHAR GuiTextToFillStyle(PCSTR FillStyleText); // Converts the // Menu Functions // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); + +BOOLEAN +GuiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL); extern const UIVTBL GuiVtbl; diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index c619834c4be..4d26bc64a6d 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -42,5 +42,18 @@ VOID NoUiFadeOut(VOID); // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN +NoUiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL); + VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo); diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 2c08eaac9b2..6daf7c30c43 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -59,12 +59,25 @@ VOID TuiFadeOut(VOID); // Fades the sc // /////////////////////////////////////////////////////////////////////////////////////// -VOID NTAPI TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo); -VOID TuiDrawMenu(PUI_MENU_INFO MenuInfo); -VOID NTAPI TuiDrawMenuBox(PUI_MENU_INFO MenuInfo); -VOID NTAPI TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); -ULONG NTAPI TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); -BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +VOID TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo); +VOID TuiDrawMenu(PUI_MENU_INFO MenuInfo); +VOID TuiDrawMenuBox(PUI_MENU_INFO MenuInfo); +VOID TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); +ULONG TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); + +BOOLEAN +TuiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL); /* Definitions for corners, depending on HORIZ and VERT */ #define UL (0xda) diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 78338f2c5d5..701f8693893 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -91,7 +91,7 @@ VOID DoOptionsMenu(VOID) ULONG SelectedMenuItem; CHAR DebugChannelString[100]; - if (!UiDisplayMenu("Select an option:", "", + if (!UiDisplayMenu("Select an option:", NULL, TRUE, OptionsMenuList, sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]), @@ -99,7 +99,7 @@ VOID DoOptionsMenu(VOID) -1, &SelectedMenuItem, TRUE, - NULL)) + NULL, NULL)) { /* The user pressed ESC */ return; diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index b117cd3f5a4..519fd510dd0 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -274,7 +274,6 @@ UiTruncateStringEllipsis(IN PCHAR StringText, } VOID -NTAPI UiDrawMenuBox(IN PUI_MENU_INFO MenuInfo) { CHAR MenuLineText[80], TempString[80]; @@ -338,7 +337,6 @@ UiDrawMenuBox(IN PUI_MENU_INFO MenuInfo) } VOID -NTAPI UiDrawMenuItem(IN PUI_MENU_INFO MenuInfo, IN ULONG MenuItemNumber) { @@ -380,10 +378,13 @@ UiDrawMenu(IN PUI_MENU_INFO MenuInfo) ULONG i; /* No GUI status bar text, just minimal text. Show the menu header. */ - UiDrawText(0, - MenuInfo->Top - 2, - MenuInfo->MenuHeader, - ATTR(UiMenuFgColor, UiMenuBgColor)); + if (MenuInfo->MenuHeader) + { + UiDrawText(0, + MenuInfo->Top - 2, + MenuInfo->MenuHeader, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } /* Now tell the user how to choose */ UiDrawText(0, @@ -396,10 +397,13 @@ UiDrawMenu(IN PUI_MENU_INFO MenuInfo) ATTR(UiMenuFgColor, UiMenuBgColor)); /* And show the menu footer */ - UiDrawText(0, - UiScreenHeight - 4, - MenuInfo->MenuFooter, - ATTR(UiMenuFgColor, UiMenuBgColor)); + if (MenuInfo->MenuFooter) + { + UiDrawText(0, + UiScreenHeight - 4, + MenuInfo->MenuFooter, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } /* Draw the menu box */ UiDrawMenuBox(MenuInfo); @@ -418,7 +422,6 @@ UiDrawMenu(IN PUI_MENU_INFO MenuInfo) } ULONG -NTAPI UiProcessMenuKeyboardEvent(IN PUI_MENU_INFO MenuInfo, IN UiMenuKeyPressFilterCallback KeyPressFilter) { @@ -426,88 +429,88 @@ UiProcessMenuKeyboardEvent(IN PUI_MENU_INFO MenuInfo, ULONG Selected, Count; /* Check for a keypress */ - if (MachConsKbHit()) + if (!MachConsKbHit()) + return 0; // None, bail out + + /* Check if the timeout is not already complete */ + if (MenuInfo->MenuTimeRemaining != -1) { - /* Check if the timeout is not already complete */ - if (MenuInfo->MenuTimeRemaining != -1) - { - /* Cancel it and remove it */ - MenuInfo->MenuTimeRemaining = -1; - UiDrawMenuBox(MenuInfo); - } + /* Cancel it and remove it */ + MenuInfo->MenuTimeRemaining = -1; + UiDrawMenuBox(MenuInfo); + } - /* Get the key */ + /* Get the key (get the extended key if needed) */ + KeyEvent = MachConsGetCh(); + if (KeyEvent == KEY_EXTENDED) KeyEvent = MachConsGetCh(); - /* Is it extended? Then get the extended key */ - if (!KeyEvent) KeyEvent = MachConsGetCh(); + /* + * Call the supplied key filter callback function to see + * if it is going to handle this keypress. + */ + if (KeyPressFilter && + KeyPressFilter(KeyEvent, MenuInfo->SelectedMenuItem, MenuInfo->Context)) + { + /* It processed the key character, so redraw and exit */ + UiDrawMenu(MenuInfo); + return 0; + } - /* - * Call the supplied key filter callback function to see - * if it is going to handle this keypress. - */ - if ((KeyPressFilter) && (KeyPressFilter(KeyEvent))) - { - /* It processed the key character, so redraw and exit */ - UiDrawMenu(MenuInfo); - return 0; - } + /* Process the key */ + if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || + (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) + { + /* Get the current selected item and count */ + Selected = MenuInfo->SelectedMenuItem; + Count = MenuInfo->MenuItemCount - 1; - /* Process the key */ - if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || - (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) + /* Check the key and change the selected menu item */ + if ((KeyEvent == KEY_UP) && (Selected > 0)) { - /* Get the current selected item and count */ - Selected = MenuInfo->SelectedMenuItem; - Count = MenuInfo->MenuItemCount - 1; - - /* Check the key and change the selected menu item */ - if ((KeyEvent == KEY_UP) && (Selected > 0)) + /* Deselect previous item and go up */ + MenuInfo->SelectedMenuItem--; + UiDrawMenuItem(MenuInfo, Selected); + Selected--; + + // Skip past any separators + if ((Selected > 0) && + (MenuInfo->MenuItemList[Selected] == NULL)) { - /* Deselect previous item and go up */ MenuInfo->SelectedMenuItem--; - UiDrawMenuItem(MenuInfo, Selected); - Selected--; - - // Skip past any separators - if ((Selected > 0) && - (MenuInfo->MenuItemList[Selected] == NULL)) - { - MenuInfo->SelectedMenuItem--; - } } - else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || - (KeyEvent == KEY_END) ) - { - /* Go to the end */ - MenuInfo->SelectedMenuItem = Count; - UiDrawMenuItem(MenuInfo, Selected); - } - else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) + } + else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || + (KeyEvent == KEY_END) ) + { + /* Go to the end */ + MenuInfo->SelectedMenuItem = Count; + UiDrawMenuItem(MenuInfo, Selected); + } + else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) + { + /* Deselect previous item and go down */ + MenuInfo->SelectedMenuItem++; + UiDrawMenuItem(MenuInfo, Selected); + Selected++; + + // Skip past any separators + if ((Selected < Count) && + (MenuInfo->MenuItemList[Selected] == NULL)) { - /* Deselect previous item and go down */ MenuInfo->SelectedMenuItem++; - UiDrawMenuItem(MenuInfo, Selected); - Selected++; - - // Skip past any separators - if ((Selected < Count) && - (MenuInfo->MenuItemList[Selected] == NULL)) - { - MenuInfo->SelectedMenuItem++; - } - } - else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || - (KeyEvent == KEY_HOME) ) - { - /* Go to the beginning */ - MenuInfo->SelectedMenuItem = 0; - UiDrawMenuItem(MenuInfo, Selected); } - - /* Select new item and update video buffer */ - UiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); } + else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || + (KeyEvent == KEY_HOME) ) + { + /* Go to the beginning */ + MenuInfo->SelectedMenuItem = 0; + UiDrawMenuItem(MenuInfo, Selected); + } + + /* Select new item and update video buffer */ + UiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); } /* Return the pressed key */ @@ -515,7 +518,6 @@ UiProcessMenuKeyboardEvent(IN PUI_MENU_INFO MenuInfo, } VOID -NTAPI UiCalcMenuBoxSize(IN PUI_MENU_INFO MenuInfo) { ULONG i, Width = 0, Height, Length; @@ -548,16 +550,18 @@ UiCalcMenuBoxSize(IN PUI_MENU_INFO MenuInfo) } BOOLEAN -UiDisplayMenu(IN PCSTR MenuHeader, - IN PCSTR MenuFooter, - IN BOOLEAN ShowBootOptions, - IN PCSTR MenuItemList[], - IN ULONG MenuItemCount, - IN ULONG DefaultMenuItem, - IN LONG MenuTimeOut, - OUT PULONG SelectedMenuItem, - IN BOOLEAN CanEscape, - IN UiMenuKeyPressFilterCallback KeyPressFilter) +UiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL) { UI_MENU_INFO MenuInformation; ULONG LastClockSecond; @@ -572,17 +576,16 @@ UiDisplayMenu(IN PCSTR MenuHeader, */ if (!MenuTimeOut && KeyPressFilter && MachConsKbHit()) { - /* Get the key */ + /* Get the key (get the extended key if needed) */ KeyPress = MachConsGetCh(); - - /* Is it extended? Then get the extended key */ - if (!KeyPress) KeyPress = MachConsGetCh(); + if (KeyPress == KEY_EXTENDED) + KeyPress = MachConsGetCh(); /* * Call the supplied key filter callback function to see * if it is going to handle this keypress. */ - if (KeyPressFilter(KeyPress)) + if (KeyPressFilter(KeyPress, DefaultMenuItem, Context)) { /* It processed the key character, cancel the timeout */ MenuTimeOut = -1; @@ -605,6 +608,7 @@ UiDisplayMenu(IN PCSTR MenuHeader, MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; MenuInformation.SelectedMenuItem = DefaultMenuItem; + MenuInformation.Context = Context; /* Calculate the size of the menu box */ UiCalcMenuBoxSize(&MenuInformation); @@ -619,8 +623,7 @@ UiDisplayMenu(IN PCSTR MenuHeader, while (TRUE) { /* Process key presses */ - KeyPress = UiProcessMenuKeyboardEvent(&MenuInformation, - KeyPressFilter); + KeyPress = UiProcessMenuKeyboardEvent(&MenuInformation, KeyPressFilter); /* Check for ENTER or ESC */ if (KeyPress == KEY_ENTER) break; diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index e90e13d399b..97a0e2857b0 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -85,10 +85,13 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) // // No GUI status bar text, just minimal text. Show the menu header. // - UiVtbl.DrawText(0, - MenuInfo->Top - 2, - MenuInfo->MenuHeader, - ATTR(UiMenuFgColor, UiMenuBgColor)); + if (MenuInfo->MenuHeader) + { + UiVtbl.DrawText(0, + MenuInfo->Top - 2, + MenuInfo->MenuHeader, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } // // Now tell the user how to choose @@ -105,10 +108,13 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) // // And show the menu footer // - UiVtbl.DrawText(0, - UiScreenHeight - 4, - MenuInfo->MenuFooter, - ATTR(UiMenuFgColor, UiMenuBgColor)); + if (MenuInfo->MenuFooter) + { + UiVtbl.DrawText(0, + UiScreenHeight - 4, + MenuInfo->MenuFooter, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } // // Draw the menu box diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 3d16b04f5db..6f77cc4f4d6 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -113,7 +113,19 @@ VOID NoUiFadeOut(VOID) // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +BOOLEAN +NoUiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL) { *SelectedMenuItem = DefaultMenuItem; return TRUE; diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index c3e42295d19..b39e6fbc36d 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -628,14 +628,10 @@ VOID TuiMessageBoxCritical(PCSTR MessageText) if (MachConsKbHit()) { key = MachConsGetCh(); - if(key == KEY_EXTENDED) + if (key == KEY_EXTENDED) key = MachConsGetCh(); - if(key == KEY_ENTER) - break; - else if(key == KEY_SPACE) - break; - else if(key == KEY_ESC) + if ((key == KEY_ENTER) || (key == KEY_SPACE) || (key == KEY_ESC)) break; } @@ -645,7 +641,6 @@ VOID TuiMessageBoxCritical(PCSTR MessageText) MachHwIdle(); } - } VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) @@ -882,12 +877,16 @@ BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) temp[j++] = MessageText[i]; } - EditBoxTextLength = 0; + EditBoxTextLength = (ULONG)strlen(EditTextBuffer) + 1; + EditBoxTextLength = min(EditBoxTextLength, Length); EditBoxTextPosition = 0; EditBoxLine = y2 - 2; EditBoxStartX = x1 + 3; EditBoxEndX = x2 - 3; + + // Draw the edit box background and the text UiFillArea(EditBoxStartX, EditBoxLine, EditBoxEndX, EditBoxLine, ' ', ATTR(UiEditBoxTextColor, UiEditBoxBgColor)); + UiDrawText2(EditBoxStartX, EditBoxLine, EditBoxEndX - EditBoxStartX + 1, EditTextBuffer, ATTR(UiEditBoxTextColor, UiEditBoxBgColor)); // Show the cursor EditBoxCursorX = EditBoxStartX; @@ -910,18 +909,18 @@ BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) { Extended = FALSE; key = MachConsGetCh(); - if(key == KEY_EXTENDED) + if (key == KEY_EXTENDED) { Extended = TRUE; key = MachConsGetCh(); } - if(key == KEY_ENTER) + if (key == KEY_ENTER) { ReturnCode = TRUE; break; } - else if(key == KEY_ESC) + else if (key == KEY_ESC) { ReturnCode = FALSE; break; diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 86690af784d..9b173ac8b7a 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -14,16 +14,18 @@ /* FUNCTIONS *****************************************************************/ BOOLEAN -TuiDisplayMenu(PCSTR MenuHeader, - PCSTR MenuFooter, - BOOLEAN ShowBootOptions, - PCSTR MenuItemList[], - ULONG MenuItemCount, - ULONG DefaultMenuItem, - LONG MenuTimeOut, - ULONG* SelectedMenuItem, - BOOLEAN CanEscape, - UiMenuKeyPressFilterCallback KeyPressFilter) +TuiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL) { UI_MENU_INFO MenuInformation; ULONG LastClockSecond; @@ -39,20 +41,17 @@ TuiDisplayMenu(PCSTR MenuHeader, if (!MenuTimeOut && KeyPressFilter && MachConsKbHit()) { // - // Get the key + // Get the key (get the extended key if needed) // KeyPress = MachConsGetCh(); - - // - // Is it extended? Then get the extended key - // - if (!KeyPress) KeyPress = MachConsGetCh(); + if (KeyPress == KEY_EXTENDED) + KeyPress = MachConsGetCh(); // // Call the supplied key filter callback function to see // if it is going to handle this keypress. // - if (KeyPressFilter(KeyPress)) + if (KeyPressFilter(KeyPress, DefaultMenuItem, Context)) { // // It processed the key character, cancel the timeout @@ -83,6 +82,7 @@ TuiDisplayMenu(PCSTR MenuHeader, MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; MenuInformation.SelectedMenuItem = DefaultMenuItem; + MenuInformation.Context = Context; // // Calculate the size of the menu box @@ -107,8 +107,7 @@ TuiDisplayMenu(PCSTR MenuHeader, // // Process key presses // - KeyPress = TuiProcessMenuKeyboardEvent(&MenuInformation, - KeyPressFilter); + KeyPress = TuiProcessMenuKeyboardEvent(&MenuInformation, KeyPressFilter); // // Check for ENTER or ESC @@ -169,7 +168,6 @@ TuiDisplayMenu(PCSTR MenuHeader, } VOID -NTAPI TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo) { ULONG i; @@ -269,7 +267,6 @@ TuiDrawMenu(PUI_MENU_INFO MenuInfo) } VOID -NTAPI TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) { CHAR MenuLineText[80], TempString[80]; @@ -395,7 +392,6 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) } VOID -NTAPI TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber) { @@ -477,7 +473,6 @@ TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, } ULONG -NTAPI TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter) { @@ -487,115 +482,113 @@ TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, // // Check for a keypress // - if (MachConsKbHit()) + if (!MachConsKbHit()) + return 0; // None, bail out + + // + // Check if the timeout is not already complete + // + if (MenuInfo->MenuTimeRemaining != -1) { // - // Check if the timeout is not already complete + // Cancel it and remove it // - if (MenuInfo->MenuTimeRemaining != -1) - { - // - // Cancel it and remove it - // - MenuInfo->MenuTimeRemaining = -1; - TuiDrawMenuBox(MenuInfo); // FIXME: Remove for minimal UI too - } + MenuInfo->MenuTimeRemaining = -1; + TuiDrawMenuBox(MenuInfo); // FIXME: Remove for minimal UI too + } - // - // Get the key - // + // + // Get the key (get the extended key if needed) + // + KeyEvent = MachConsGetCh(); + if (KeyEvent == KEY_EXTENDED) KeyEvent = MachConsGetCh(); + // + // Call the supplied key filter callback function to see + // if it is going to handle this keypress. + // + if (KeyPressFilter && + KeyPressFilter(KeyEvent, MenuInfo->SelectedMenuItem, MenuInfo->Context)) + { // - // Is it extended? Then get the extended key + // It processed the key character, so redraw and exit // - if (!KeyEvent) KeyEvent = MachConsGetCh(); + UiVtbl.DrawMenu(MenuInfo); + return 0; + } + // + // Process the key + // + if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || + (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) + { // - // Call the supplied key filter callback function to see - // if it is going to handle this keypress. + // Get the current selected item and count // - if ((KeyPressFilter) && (KeyPressFilter(KeyEvent))) - { - // - // It processed the key character, so redraw and exit - // - UiVtbl.DrawMenu(MenuInfo); - return 0; - } + Selected = MenuInfo->SelectedMenuItem; + Count = MenuInfo->MenuItemCount - 1; // - // Process the key + // Check the key and change the selected menu item // - if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || - (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) + if ((KeyEvent == KEY_UP) && (Selected > 0)) { // - // Get the current selected item and count + // Deselect previous item and go up // - Selected = MenuInfo->SelectedMenuItem; - Count = MenuInfo->MenuItemCount - 1; + MenuInfo->SelectedMenuItem--; + TuiDrawMenuItem(MenuInfo, Selected); + Selected--; - // - // Check the key and change the selected menu item - // - if ((KeyEvent == KEY_UP) && (Selected > 0)) + // Skip past any separators + if ((Selected > 0) && + (MenuInfo->MenuItemList[Selected] == NULL)) { - // - // Deselect previous item and go up - // MenuInfo->SelectedMenuItem--; - TuiDrawMenuItem(MenuInfo, Selected); - Selected--; - - // Skip past any separators - if ((Selected > 0) && - (MenuInfo->MenuItemList[Selected] == NULL)) - { - MenuInfo->SelectedMenuItem--; - } - } - else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || - (KeyEvent == KEY_END) ) - { - // - // Go to the end - // - MenuInfo->SelectedMenuItem = Count; - TuiDrawMenuItem(MenuInfo, Selected); } - else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) + } + else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || + (KeyEvent == KEY_END) ) + { + // + // Go to the end + // + MenuInfo->SelectedMenuItem = Count; + TuiDrawMenuItem(MenuInfo, Selected); + } + else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) + { + // + // Deselect previous item and go down + // + MenuInfo->SelectedMenuItem++; + TuiDrawMenuItem(MenuInfo, Selected); + Selected++; + + // Skip past any separators + if ((Selected < Count) && + (MenuInfo->MenuItemList[Selected] == NULL)) { - // - // Deselect previous item and go down - // MenuInfo->SelectedMenuItem++; - TuiDrawMenuItem(MenuInfo, Selected); - Selected++; - - // Skip past any separators - if ((Selected < Count) && - (MenuInfo->MenuItemList[Selected] == NULL)) - { - MenuInfo->SelectedMenuItem++; - } - } - else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || - (KeyEvent == KEY_HOME) ) - { - // - // Go to the beginning - // - MenuInfo->SelectedMenuItem = 0; - TuiDrawMenuItem(MenuInfo, Selected); } - + } + else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || + (KeyEvent == KEY_HOME) ) + { // - // Select new item and update video buffer + // Go to the beginning // - TuiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); - VideoCopyOffScreenBufferToVRAM(); + MenuInfo->SelectedMenuItem = 0; + TuiDrawMenuItem(MenuInfo, Selected); } + + // + // Select new item and update video buffer + // + TuiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); + VideoCopyOffScreenBufferToVRAM(); } // diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 98035ee84b6..e9124fbe15e 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -438,7 +438,7 @@ UiShowMessageBoxesInArgv( ULONG LastIndex; PCSTR ArgValue; PCHAR MessageBoxText; - ULONG MessageBoxTextSize; + SIZE_T MessageBoxTextSize; /* Find all the message box settings and run them */ for (LastIndex = 0; @@ -493,9 +493,24 @@ VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars) } } -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +BOOLEAN +UiDisplayMenu( + IN PCSTR MenuHeader, + IN PCSTR MenuFooter OPTIONAL, + IN BOOLEAN ShowBootOptions, + IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, + IN PVOID Context OPTIONAL) { - return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, ShowBootOptions, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); + return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, ShowBootOptions, + MenuItemList, MenuItemCount, DefaultMenuItem, + MenuTimeOut, SelectedMenuItem, CanEscape, + KeyPressFilter, Context); } VOID UiFadeInBackdrop(VOID)

1 0

[reactos] 02/02: [FREELDR] Fix x64 build.
by Hermès Bélusca-Maïto 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=268cdf5702b7463a1ffbf… commit 268cdf5702b7463a1ffbf047c935c5ac183a33f7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 18:47:54 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 18:49:19 2019 +0200 [FREELDR] Fix x64 build. --- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/freeldr/freeldr/bootmgr.c | 2 +- boot/freeldr/freeldr/include/freeldr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index d4263050ad4..05489b3bda6 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -154,7 +154,7 @@ elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_ARC_SOURCE lib/fs/pxe.c arch/i386/ntoskrnl.c - arch/i386/drivemap.c + # arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index cdd370567c2..6a9cb569e29 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -164,7 +164,7 @@ VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem) /* We must have the "BootType" value (it has been possibly added by InitOperatingSystemList()) */ ASSERT(*BootType); -#if defined(_M_IX86) +#ifdef _M_IX86 /* Install the drive mapper according to this section drive mappings */ DriveMapMapDrivesInSection(SectionName); #endif diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index 71d47884402..d981dc2649a 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -107,10 +107,10 @@ #include <arch/pc/machpc.h> #include <arch/pc/x86common.h> #include <arch/pc/pxe.h> -#include <arch/i386/drivemap.h> #endif #if defined(_M_IX86) #include <arch/i386/i386.h> +#include <arch/i386/drivemap.h> #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #elif defined(_M_AMD64)

1 0

[reactos] 01/02: [FREELDR] Don't call twice strlen() implicitly (in the min() macro).
by Hermès Bélusca-Maïto 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b326e74cd23d2965ccfc… commit 5b326e74cd23d2965ccfc5ade3f6325e7e3c9e1d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 18:33:53 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 18:49:18 2019 +0200 [FREELDR] Don't call twice strlen() implicitly (in the min() macro). --- boot/freeldr/freeldr/linuxboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index 6ddc8b99c30..b1378df2fc0 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -248,7 +248,8 @@ LinuxParseIniSection( if (LinuxCommandLine) { RemoveQuotes(LinuxCommandLine); - LinuxCommandLineSize = min(strlen(LinuxCommandLine) + 1, 260); + LinuxCommandLineSize = (ULONG)strlen(LinuxCommandLine) + 1; + LinuxCommandLineSize = min(LinuxCommandLineSize, 260); } return TRUE;

1 0

[reactos] 01/01: [FREELDR] xboxmem: Fix array out-of-bounds access (#1775)
by Stanislav Motylkov 07 Aug '19

07 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2811d2f990fdadef5697a… commit 2811d2f990fdadef5697ac3927688b7447fdf177 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Aug 7 13:06:37 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 12:06:37 2019 +0200 [FREELDR] xboxmem: Fix array out-of-bounds access (#1775) Memory map array should be large enough to fit additional descriptors. CORE-16216 CORE-16267 --- boot/freeldr/freeldr/arch/i386/pcmem.c | 2 -- boot/freeldr/freeldr/arch/i386/xboxmem.c | 3 ++- boot/freeldr/freeldr/include/arch/pc/pcbios.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 2add4d918bf..4dd709b247c 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -35,8 +35,6 @@ DBG_DEFAULT_CHANNEL(MEMORY); #define ULONGLONG_ALIGN_UP_BY(size, align) \ (ULONGLONG_ALIGN_DOWN_BY(((ULONGLONG)(size) + align - 1), align)) -#define MAX_BIOS_DESCRIPTORS 80ul - BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; ULONG PcBiosMapCount; diff --git a/boot/freeldr/freeldr/arch/i386/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xboxmem.c index ee5da0fec1f..2d6890ea78e 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xboxmem.c @@ -89,12 +89,13 @@ XboxMemInit(VOID) AvailableMemoryMb = InstalledMemoryMb; } -FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[2]; +FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[MAX_BIOS_DESCRIPTORS + 1]; PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize) { TRACE("XboxMemGetMemoryMap()\n"); + /* FIXME: Obtain memory map via multiboot spec */ /* Synthesize memory map */ diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index 826a16854de..5ad273f0442 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -3,6 +3,8 @@ #ifndef __ASM__ +#define MAX_BIOS_DESCRIPTORS 80 + typedef enum { // ACPI 1.0.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs