Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Whitespace, minor code styles and comments fixes only.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2019-08-04 17:29:07 +02:00
parent e79e7bf53c
commit b978d42bd9
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
boot/freeldr/freeldr/ntldr/setupldr.c
View file

@ -73,7 +73,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR
return; return;
} }
TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); TRACE("NLS data '%s' '%s' '%s'\n", AnsiName, OemName, LangName);
#if DBG #if DBG
{ {
@ -130,7 +130,7 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR S
ServiceName); ServiceName);
if (!Success) if (!Success)
{ {
ERR("could not add boot driver %s, %s\n", SearchPath, DriverName); ERR("Could not add boot driver '%s', '%s'\n", SearchPath, DriverName);
return; return;
} }
} }
@ -191,8 +191,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem,
UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup...");
/* Read the system path is set in the .ini file */ /* Read the system path is set in the .ini file */
if (!HasSection || if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath)))
!IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath)))
{ {
/* /*
* IMPROVE: I don't want to call MachDiskGetBootPath here as a * IMPROVE: I don't want to call MachDiskGetBootPath here as a
@ -203,7 +202,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem,
*/ */
// MachDiskGetBootPath(BootPath, sizeof(BootPath)); // MachDiskGetBootPath(BootPath, sizeof(BootPath));
// strcpy(BootPath, SectionName); // strcpy(BootPath, SectionName);
BootPath[0] = '\0'; BootPath[0] = ANSI_NULL;
} }
/* /*

23
boot/freeldr/freeldr/ntldr/winldr.c
View file

@ -99,9 +99,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
strncpy(ArcBoot, BootPath, PathSeparator); strncpy(ArcBoot, BootPath, PathSeparator);
ArcBoot[PathSeparator] = ANSI_NULL; ArcBoot[PathSeparator] = ANSI_NULL;
TRACE("ArcBoot: %s\n", ArcBoot); TRACE("ArcBoot: '%s'\n", ArcBoot);
TRACE("SystemRoot: %s\n", SystemRoot); TRACE("SystemRoot: '%s'\n", SystemRoot);
TRACE("Options: %s\n", Options); TRACE("Options: '%s'\n", Options);
/* Fill ARC BootDevice */ /* Fill ARC BootDevice */
LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName;
@ -122,7 +122,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH); strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH);
LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName);
/* Fill LoadOptions and strip the '/' commutator symbol in front of each option */ /* Fill LoadOptions and strip the '/' switch symbol in front of each option */
NewLoadOptions = LoadOptions = LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; NewLoadOptions = LoadOptions = LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions;
strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH); strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH);
@ -252,7 +252,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
DriverPath[0] = ANSI_NULL; DriverPath[0] = ANSI_NULL;
} }
TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); TRACE("DriverPath: '%s', DllName: '%s', LPB\n", DriverPath, DllName);
// Check if driver is already loaded // Check if driver is already loaded
Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE);
@ -506,7 +506,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
/* Skip possible initial whitespace */ /* Skip possible initial whitespace */
Options += strspn(Options, " \t"); Options += strspn(Options, " \t");
/* Check whether a new commutator starts and it is either KERNEL or HAL */ /* Check whether a new option starts and it is either KERNEL or HAL */
if (*Options != '/' || (++Options, if (*Options != '/' || (++Options,
!(_strnicmp(Options, "KERNEL=", 7) == 0 || !(_strnicmp(Options, "KERNEL=", 7) == 0 ||
_strnicmp(Options, "HAL=", 4) == 0)) ) _strnicmp(Options, "HAL=", 4) == 0)) )
@ -524,7 +524,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
break; break;
} }
/* We have found either KERNEL or HAL commutator */ /* We have found either KERNEL or HAL options */
if (_strnicmp(Options, "KERNEL=", 7) == 0) if (_strnicmp(Options, "KERNEL=", 7) == 0)
{ {
Options += 7; i -= 7; Options += 7; i -= 7;
@ -589,7 +589,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
/* Skip possible initial whitespace */ /* Skip possible initial whitespace */
Options += strspn(Options, " \t"); Options += strspn(Options, " \t");
/* Check whether a new commutator starts and it is the DEBUGPORT one */ /* Check whether a new option starts and it is the DEBUGPORT one */
if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0)
{ {
/* Search for another whitespace */ /* Search for another whitespace */
@ -598,7 +598,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
} }
else else
{ {
/* We found the DEBUGPORT commutator. Move to the port name. */ /* We found the DEBUGPORT option. Move to the port name. */
Options += 10; Options += 10;
break; break;
} }
@ -607,7 +607,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
if (Options) if (Options)
{ {
/* /*
* We have found the DEBUGPORT commutator. Parse the port name. * We have found the DEBUGPORT option. Parse the port name.
* Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO * Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO
* If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM".
*/ */
@ -673,8 +673,7 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem,
UiDrawProgressBarCenter(1, 100, "Loading NT..."); UiDrawProgressBarCenter(1, 100, "Loading NT...");
/* Read the system path is set in the .ini file */ /* Read the system path is set in the .ini file */
if (!HasSection || if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath)))
!IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath)))
{ {
strcpy(BootPath, SectionName); strcpy(BootPath, SectionName);
} }