Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[winldr]

Browse source 
- 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:
Aleksey Bragin 2009-09-25 09:28:37 +00:00
parent 5519bfc73a
commit f57d3a98b7
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/boot/freeldr/freeldr/windows/setupldr2.c
View file

@ -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...");