Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 03/03: [FREELDR] Add ReactOS Setup as a custom boot type. (#1763) CORE-9023 CORE-16260

by Yaroslav Kibysh

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);

5 years, 4 months

[reactos] 02/03: [FREELDR] Add "Edit Boot Command Line" feature. (#1763) CORE-9023 CORE-16260

by Yaroslav Kibysh

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

5 years, 4 months

[reactos] 01/03: [FREELDR] Some enhancements for the UI code. (#1763)

by Hermès Bélusca-Maïto

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)

5 years, 4 months

[reactos] 02/02: [FREELDR] Fix x64 build.

by Hermès Bélusca-Maïto

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)

5 years, 4 months

[reactos] 01/02: [FREELDR] Don't call twice strlen() implicitly (in the min() macro).

by Hermès Bélusca-Maïto

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;

5 years, 4 months

[reactos] 01/01: [FREELDR] xboxmem: Fix array out-of-bounds access (#1775)

by Stanislav Motylkov

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.

5 years, 4 months

[reactos] 01/01: [SETUP][BOOTDATA][INF] Helvetica-to-Arial substitutes (#1809)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c08e1d62705a3ac59d6… commit 10c08e1d62705a3ac59d6c8050280bfbd96540ed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 7 19:02:38 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 19:02:38 2019 +0900 [SETUP][BOOTDATA][INF] Helvetica-to-Arial substitutes (#1809) Set the destinations of "Helvetica" font substitutes to "Arial". CORE-16264 --- base/setup/lib/muifonts.h | 4 ++-- boot/bootdata/livecd.inf | 2 +- media/inf/font.inf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index dfad8981a9a..45cca3f03eb 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -111,7 +111,7 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, - { L"Helvetica", L"Tahoma" }, + { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -355,7 +355,7 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, - { L"Helvetica", L"DejaVu Sans" }, + { L"Helvetica", L"Arial" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 3e33d8a2bad..eae91147fa4 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -51,7 +51,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","Pagin HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" diff --git a/media/inf/font.inf b/media/inf/font.inf index a8c201ad5f5..611728168f0 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -65,7 +65,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" @@ -99,7 +99,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"DejaVu Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans"

5 years, 4 months

[reactos] 01/01: [SETUP][BOOTDATA][INF] Delete Tahoma-to-Tahoma substitutes (#1808)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257aed0e690b4cbf443c3… commit 257aed0e690b4cbf443c3c26a458079f9bbcfd36 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 7 19:01:25 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 19:01:25 2019 +0900 [SETUP][BOOTDATA][INF] Delete Tahoma-to-Tahoma substitutes (#1808) Delete loopy Tahoma-to-Tahoma font substitutes. CORE-16264 --- base/setup/lib/muifonts.h | 3 --- boot/bootdata/livecd.inf | 1 - media/inf/font.inf | 3 --- 3 files changed, 7 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index abf76017c9d..dfad8981a9a 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -21,7 +21,6 @@ MUI_SUBFONT LatinFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, @@ -53,7 +52,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, @@ -118,7 +116,6 @@ MUI_SUBFONT HebrewFonts[] = { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, { L"System", L"FreeSans" }, - { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, { L"Times New Roman", L"DejaVu Serif" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index ab19610c8b0..3e33d8a2bad 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -55,7 +55,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" diff --git a/media/inf/font.inf b/media/inf/font.inf index 8c23423b3c5..a8c201ad5f5 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -31,7 +31,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -44,7 +43,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -71,7 +69,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif"

5 years, 4 months

[reactos] 01/01: [WIN32K:NTGDI] Fix ASSERTS in REGION_bXformRgn. CORE-15992

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1ec0d92e24c9a27eb5ed… commit c1ec0d92e24c9a27eb5ed2eae78268dda06626ad Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Aug 4 18:43:49 2019 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Aug 7 07:47:47 2019 +0200 [WIN32K:NTGDI] Fix ASSERTS in REGION_bXformRgn. CORE-15992 --- win32ss/gdi/ntgdi/region.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/ntgdi/region.c b/win32ss/gdi/ntgdi/region.c index 1456602852d..38bf3d377fa 100644 --- a/win32ss/gdi/ntgdi/region.c +++ b/win32ss/gdi/ntgdi/region.c @@ -2084,7 +2084,7 @@ REGION_bXformRgn( _In_ PMATRIX pmx) { XFORMOBJ xo; - ULONG i, j, cjSize; + ULONG i, cjSize; PPOINT ppt; PULONG pcPoints; RECT rect; @@ -2149,11 +2149,8 @@ REGION_bXformRgn( /* Loop all rects in the region */ for (i = 0; i < prgn->rdh.nCount - 1; i++) { - for (j = i; i < prgn->rdh.nCount; i++) - { - NT_ASSERT(prgn->Buffer[i].top < prgn->Buffer[i].bottom); - NT_ASSERT(prgn->Buffer[j].top >= prgn->Buffer[i].top); - } + NT_ASSERT(prgn->Buffer[i].top <= prgn->Buffer[i].bottom); + NT_ASSERT(prgn->Buffer[i + 1].top >= prgn->Buffer[i].top); } return TRUE;

5 years, 4 months

[reactos] 01/01: [MEDIA][FONTS] Add Microsoft Sans Serif font (#1805)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eefc54420294eda81665f… commit eefc54420294eda81665fb6eb8f6b4bb92b2d20a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 7 12:31:13 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 12:31:13 2019 +0900 [MEDIA][FONTS] Add Microsoft Sans Serif font (#1805) Add "Microsoft Sans Serif" fonts. CORE-16264 - Add "Microsoft Sans Serif" font by duplicating "Liberation Sans" font and renaming it. - Add LICENSE file. I made these font files by using FontForge. Its family name is "Microsoft Sans Serif". Its display name is "Microsoft Sans Serif". Its font filename is micross.ttf. The Underline Position is hacked by adding an integer value for workaround of FontForge's bug. --- media/fonts/CMakeLists.txt | 1 + media/fonts/doc/MicrosoftSansSerif/LICENSE.txt | 104 +++++++++++++++++++++++++ media/fonts/doc/MicrosoftSansSerif/README.txt | 6 ++ media/fonts/micross.ttf | Bin 0 -> 183332 bytes 4 files changed, 111 insertions(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 9ca0aa22509..2d24e46f4d8 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -89,6 +89,7 @@ list(APPEND FONT_FILES LibreFranklin-ThinItalic.ttf lucon.ttf Marlett.ttf + micross.ttf OpenSans-Bold.ttf OpenSans-BoldItalic.ttf OpenSans-CondBold.ttf diff --git a/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt b/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt new file mode 100644 index 00000000000..cb6c5ce9cfd --- /dev/null +++ b/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt @@ -0,0 +1,104 @@ +Digitized data copyright (c) 2010 Google Corporation + with Reserved Font Arimo, Tinos and Cousine. +Copyright (c) 2012 Red Hat, Inc. + with Reserved Font Name Liberation. +Copyright (c) 2019 Katayama Hirofumi MZ + with renaming as "Microsoft Sans Serif". + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to provide +a free and open framework in which fonts may be shared and improved in +partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. +The fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + + + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. +This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components +as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting ? in part or in whole ? +any of the components of the Original Version, by changing formats or +by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer +or other person who contributed to the Font Software. + + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + + + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + + + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. + diff --git a/media/fonts/doc/MicrosoftSansSerif/README.txt b/media/fonts/doc/MicrosoftSansSerif/README.txt new file mode 100644 index 00000000000..9e07f116ff5 --- /dev/null +++ b/media/fonts/doc/MicrosoftSansSerif/README.txt @@ -0,0 +1,6 @@ +ReactOS "Microsoft Sans Serif" font is based on "Liberation Sans". + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +Please read file "LICENSE" for details. diff --git a/media/fonts/micross.ttf b/media/fonts/micross.ttf new file mode 100644 index 00000000000..fd6b1f36bc8 Binary files /dev/null and b/media/fonts/micross.ttf differ

5 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019