#include <freeldr.h>
#include <ndk/ldrtypes.h>
#include "winldr.h"
+#include "ntldropts.h"
#include "registry.h"
#include <debug.h>
IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE)
{
BOOLEAN Success;
- PCSTR Options;
+ PCSTR Option;
+ ULONG OptionLength;
+ PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL;
CHAR DirPath[MAX_PATH];
CHAR HalFileName[MAX_PATH];
CHAR KernelFileName[MAX_PATH];
CHAR KdTransportDllName[MAX_PATH];
- PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL;
if (!KernelDTE) return FALSE;
RtlStringCbCopyA(HalFileName , sizeof(HalFileName) , "hal.dll");
RtlStringCbCopyA(KernelFileName, sizeof(KernelFileName), "ntoskrnl.exe");
- /* Find any "/HAL=" or "/KERNEL=" switch in the boot options */
- Options = BootOptions;
- while (Options)
- {
- /* Skip possible initial whitespace */
- Options += strspn(Options, " \t");
+ /* Check for any "/HAL=" or "/KERNEL=" override option */
- /* Check whether a new option starts and it is either HAL or KERNEL */
- if (*Options != '/' || (++Options,
- !(_strnicmp(Options, "HAL=", 4) == 0 ||
- _strnicmp(Options, "KERNEL=", 7) == 0)) )
- {
- /* Search for another whitespace */
- Options = strpbrk(Options, " \t");
- continue;
- }
- else
- {
- size_t i = strcspn(Options, " \t"); /* Skip whitespace */
- if (i == 0)
- {
- /* Use the default values */
- break;
- }
+ Option = NtLdrGetOptionEx(BootOptions, "HAL=", &OptionLength);
+ if (Option && (OptionLength > 4))
+ {
+ /* Retrieve the HAL file name */
+ Option += 4; OptionLength -= 4;
+ RtlStringCbCopyNA(HalFileName, sizeof(HalFileName), Option, OptionLength);
+ _strupr(HalFileName);
+ }
- /* We have found either HAL or KERNEL options */
- if (_strnicmp(Options, "HAL=", 4) == 0)
- {
- Options += 4; i -= 4;
- RtlStringCbCopyNA(HalFileName, sizeof(HalFileName), Options, i);
- _strupr(HalFileName);
- }
- else if (_strnicmp(Options, "KERNEL=", 7) == 0)
- {
- Options += 7; i -= 7;
- RtlStringCbCopyNA(KernelFileName, sizeof(KernelFileName), Options, i);
- _strupr(KernelFileName);
- }
- }
+ Option = NtLdrGetOptionEx(BootOptions, "KERNEL=", &OptionLength);
+ if (Option && (OptionLength > 7))
+ {
+ /* Retrieve the KERNEL file name */
+ Option += 7; OptionLength -= 7;
+ RtlStringCbCopyNA(KernelFileName, sizeof(KernelFileName), Option, OptionLength);
+ _strupr(KernelFileName);
}
TRACE("HAL file = '%s' ; Kernel file = '%s'\n", HalFileName, KernelFileName);
* the name "kdcom.dll". [...]"
*/
- /*
- * This loop replaces a dumb call to strstr(..., "DEBUGPORT=").
- * Indeed I want it to be case-insensitive to allow "debugport="
- * or "DeBuGpOrT=" or... , and I don't want it to match malformed
- * command-line options, such as:
- *
- * "...foo DEBUGPORT=xxx bar..."
- * "...foo/DEBUGPORT=xxx bar..."
- * "...foo/DEBUGPORT=bar..."
- *
- * i.e. the "DEBUGPORT=" switch must start with a slash and be separated
- * from the rest by whitespace, unless it begins the command-line, e.g.:
- *
- * "/DEBUGPORT=COM1 foo...bar..."
- * "...foo /DEBUGPORT=USB bar..."
- * or:
- * "...foo /DEBUGPORT= bar..."
- * (in that case, we default the port to COM).
- */
- Options = BootOptions;
- while (Options)
+ /* Check whether there is a DEBUGPORT option */
+ Option = NtLdrGetOptionEx(BootOptions, "DEBUGPORT=", &OptionLength);
+ if (Option && (OptionLength > 10))
{
- /* Skip possible initial whitespace */
- Options += strspn(Options, " \t");
+ /* Move to the debug port name */
+ Option += 10; OptionLength -= 10;
+ ASSERT(OptionLength > 0);
- /* Check whether a new option starts and it is the DEBUGPORT one */
- if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0)
- {
- /* Search for another whitespace */
- Options = strpbrk(Options, " \t");
- continue;
- }
- else
- {
- /* We found the DEBUGPORT option. Move to the port name. */
- Options += 10;
- break;
- }
- }
-
- if (Options)
- {
/*
- * We have found the DEBUGPORT option. Parse the port name.
- * 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".
+ * Parse the port name.
+ * Format: /DEBUGPORT=COM[1-9]
+ * 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".
*/
RtlStringCbCopyA(KdTransportDllName, sizeof(KdTransportDllName), "KD");
- if (_strnicmp(Options, "COM", 3) == 0 && '0' <= Options[3] && Options[3] <= '9')
+ if (_strnicmp(Option, "COM", 3) == 0 && '0' <= Option[3] && Option[3] <= '9')
{
- RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Options, 3);
+ RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Option, 3);
}
else
{
- size_t i = strcspn(Options, " \t:"); /* Skip valid separators: whitespace or colon */
- if (i == 0)
+ /* Get the actual length of the debug port
+ * until the next whitespace or colon. */
+ OptionLength = (ULONG)strcspn(Option, " \t:");
+ if (OptionLength == 0)
RtlStringCbCatA(KdTransportDllName, sizeof(KdTransportDllName), "COM");
else
- RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Options, i);
+ RtlStringCbCatNA(KdTransportDllName, sizeof(KdTransportDllName), Option, OptionLength);
}
RtlStringCbCatA(KdTransportDllName, sizeof(KdTransportDllName), ".DLL");
_strupr(KdTransportDllName);
}
/* Parse the boot options */
- Options = BootOptions;
TRACE("LoadWindowsCore: BootOptions '%s'\n", BootOptions);
- while (Options)
+
+ if (NtLdrGetOption(BootOptions, "3GB"))
+ {
+ /* We found the 3GB option. */
+ FIXME("LoadWindowsCore: 3GB - TRUE (not implemented)\n");
+ VirtualBias = TRUE;
+ }
+ if (NtLdrGetOption(BootOptions, "SOS"))
{
- /* Skip possible initial whitespace */
- Options += strspn(Options, " \t");
+ /* We found the SOS option. */
+ FIXME("LoadWindowsCore: SOS - TRUE (not implemented)\n");
+ SosEnabled = TRUE;
+ }
- /* Check whether a new option starts */
- if (*Options == '/')
+ if (OperatingSystemVersion > _WIN32_WINNT_NT4)
+ {
+ if (NtLdrGetOption(BootOptions, "SAFEBOOT"))
+ {
+ /* We found the SAFEBOOT option. */
+ FIXME("LoadWindowsCore: SAFEBOOT - TRUE (not implemented)\n");
+ SafeBoot = TRUE;
+ }
+ if (NtLdrGetOption(BootOptions, "PAE"))
{
- Options++;
+ /* We found the PAE option. */
+ FIXME("LoadWindowsCore: PAE - TRUE (not implemented)\n");
+ PaeEnabled = TRUE;
+ }
+ }
- if (_strnicmp(Options, "3GB", 3) == 0)
- {
- /* We found the 3GB option. */
- FIXME("LoadWindowsCore: 3GB - TRUE (not implemented)\n");
- VirtualBias = TRUE;
- }
- if (_strnicmp(Options, "SOS", 3) == 0)
+ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K)
+ {
+ if (NtLdrGetOption(BootOptions, "NOPAE"))
+ {
+ /* We found the NOPAE option. */
+ FIXME("LoadWindowsCore: NOPAE - TRUE (not implemented)\n");
+ PaeDisabled = TRUE;
+ }
+ if (NtLdrGetOption(BootOptions, "BOOTLOGO"))
+ {
+ /* We found the BOOTLOGO option. */
+ FIXME("LoadWindowsCore: BOOTLOGO - TRUE (not implemented)\n");
+ BootLogo = TRUE;
+ }
+
+ if (!LoaderBlock->SetupLdrBlock)
+ {
+ if (NtLdrGetOption(BootOptions, "EXECUTE"))
{
- /* We found the SOS option. */
- FIXME("LoadWindowsCore: SOS - TRUE (not implemented)\n");
- SosEnabled = TRUE;
+ /* We found the EXECUTE option. */
+ FIXME("LoadWindowsCore: EXECUTE - TRUE (not implemented)\n");
+ NoexecuteDisabled = TRUE;
}
- if (OperatingSystemVersion > _WIN32_WINNT_NT4)
+ if (NtLdrGetOption(BootOptions, "NOEXECUTE=ALWAYSOFF"))
{
- if (_strnicmp(Options, "SAFEBOOT", 8) == 0)
- {
- /* We found the SAFEBOOT option. */
- FIXME("LoadWindowsCore: SAFEBOOT - TRUE (not implemented)\n");
- SafeBoot = TRUE;
- }
- if (_strnicmp(Options, "PAE", 3) == 0)
- {
- /* We found the PAE option. */
- FIXME("LoadWindowsCore: PAE - TRUE (not implemented)\n");
- PaeEnabled = TRUE;
- }
+ /* We found the NOEXECUTE=ALWAYSOFF option. */
+ FIXME("LoadWindowsCore: NOEXECUTE=ALWAYSOFF - TRUE (not implemented)\n");
+ NoexecuteDisabled = TRUE;
}
- if (OperatingSystemVersion > _WIN32_WINNT_WIN2K)
+ if (NtLdrGetOption(BootOptions, "NOEXECUTE"))
{
- if (_strnicmp(Options, "NOPAE", 5) == 0)
- {
- /* We found the NOPAE option. */
- FIXME("LoadWindowsCore: NOPAE - TRUE (not implemented)\n");
- PaeDisabled = TRUE;
- }
- if (_strnicmp(Options, "BOOTLOGO", 8) == 0)
- {
- /* We found the BOOTLOGO option. */
- FIXME("LoadWindowsCore: BOOTLOGO - TRUE (not implemented)\n");
- BootLogo = TRUE;
- }
- if (!LoaderBlock->SetupLdrBlock)
- {
- if (_strnicmp(Options, "NOEXECUTE=ALWAYSOFF", 19) == 0)
- {
- /* We found the NOEXECUTE=ALWAYSOFF option. */
- FIXME("LoadWindowsCore: NOEXECUTE=ALWAYSOFF - TRUE (not implemented)\n");
- NoexecuteDisabled = TRUE;
- }
- else if (_strnicmp(Options, "NOEXECUTE", 9) == 0)
- {
- /* We found the NOEXECUTE option. */
- FIXME("LoadWindowsCore: NOEXECUTE - TRUE (not implemented)\n");
- NoexecuteEnabled = TRUE;
- }
-
- if (_strnicmp(Options, "EXECUTE", 7) == 0)
- {
- /* We found the EXECUTE option. */
- FIXME("LoadWindowsCore: EXECUTE - TRUE (not implemented)\n");
- NoexecuteDisabled = TRUE;
- }
- }
+ /* We found the NOEXECUTE option. */
+ FIXME("LoadWindowsCore: NOEXECUTE - TRUE (not implemented)\n");
+ NoexecuteEnabled = TRUE;
}
}
-
- /* Search for another whitespace */
- Options = strpbrk(Options, " \t");
}
if (SafeBoot)
PCSTR ArgValue;
PCSTR SystemPartition;
PCSTR FileName;
+ ULONG FileNameLength;
BOOLEAN Success;
USHORT OperatingSystemVersion;
PLOADER_PARAMETER_BLOCK LoaderBlock;
AppendBootTimeOptions(BootOptions);
/*
- * Set "/HAL=" and "/KERNEL=" options if needed.
+ * Set the "/HAL=" and "/KERNEL=" options if needed.
* If already present on the standard "Options=" option line, they take
* precedence over those passed via the separate "Hal=" and "Kernel="
* options.
*/
- if (strstr(BootOptions, "/HAL=") != 0)
+ if (!NtLdrGetOption(BootOptions, "HAL="))
{
/*
* Not found in the options, try to retrieve the
RtlStringCbCatA(BootOptions, sizeof(BootOptions), ArgValue);
}
}
- if (strstr(BootOptions, "/KERNEL=") != 0)
+ if (!NtLdrGetOption(BootOptions, "KERNEL="))
{
/*
* Not found in the options, try to retrieve the
TRACE("BootOptions: '%s'\n", BootOptions);
/* Check if a RAM disk file was given */
- FileName = strstr(BootOptions, "/RDPATH=");
- if (FileName)
+ FileName = NtLdrGetOptionEx(BootOptions, "RDPATH=", &FileNameLength);
+ if (FileName && (FileNameLength > 7))
{
/* Load the RAM disk */
Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition);
if (Status != ESUCCESS)
{
- FileName += 8;
+ FileName += 7; FileNameLength -= 7;
UiMessageBox("Failed to load RAM disk file '%.*s'",
- strcspn(FileName, " \t"), FileName);
+ FileNameLength, FileName);
return Status;
}
}
projects / reactos.git / blobdiff