mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[winldr]
- Load and use debug boot options if built with DBG (mimics old reactos setupldr behaviour). svn path=/trunk/; revision=43142
This commit is contained in:
parent
5519bfc73a
commit
f57d3a98b7
|
@ -157,7 +157,7 @@ VOID LoadReactOSSetup2(VOID)
|
|||
CHAR SystemPath[512], SearchPath[512];
|
||||
CHAR FileName[512];
|
||||
CHAR BootPath[512];
|
||||
LPCSTR BootOptions;
|
||||
LPCSTR LoadOptions, DbgOptions, BootOptions;
|
||||
PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL;
|
||||
BOOLEAN Status;
|
||||
ULONG i, ErrorLine;
|
||||
|
@ -204,7 +204,7 @@ VOID LoadReactOSSetup2(VOID)
|
|||
}
|
||||
}
|
||||
|
||||
/* Load options */
|
||||
/* Get Load options - debug and non-debug */
|
||||
if (!InfFindFirstLine(InfHandle,
|
||||
"SetupData",
|
||||
"OsLoadOptions",
|
||||
|
@ -214,12 +214,30 @@ VOID LoadReactOSSetup2(VOID)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!InfGetDataField (&InfContext, 1, &BootOptions))
|
||||
if (!InfGetDataField (&InfContext, 1, &LoadOptions))
|
||||
{
|
||||
printf("Failed to get load options\n");
|
||||
return;
|
||||
}
|
||||
|
||||
BootOptions = LoadOptions;
|
||||
|
||||
#if DBG
|
||||
/* Get debug load options and use them */
|
||||
if (InfFindFirstLine(InfHandle,
|
||||
"SetupData",
|
||||
"DbgOsLoadOptions",
|
||||
&InfContext))
|
||||
{
|
||||
if (!InfGetDataField(&InfContext, 1, &DbgOptions))
|
||||
DbgOptions = "";
|
||||
else
|
||||
BootOptions = DbgOptions;
|
||||
}
|
||||
#endif
|
||||
|
||||
DPRINTM(DPRINT_WINDOWS,"BootOptions: '%s'\n", BootOptions);
|
||||
|
||||
SetupUiInitialize();
|
||||
UiDrawStatusText("");
|
||||
UiDrawStatusText("Detecting Hardware...");
|
||||
|
|
Loading…
Reference in a new issue