mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 17:01:28 +00:00
[FREELDR]
- Move inXfile and rtl code into a lib subdir, - Minor comment formatting. svn path=/trunk/; revision=65963
This commit is contained in:
parent
a5c4f052be
commit
66ef750fba
|
@ -53,9 +53,9 @@ list(APPEND FREELDR_COMMON_SOURCE
|
||||||
fs/fs.c
|
fs/fs.c
|
||||||
fs/iso.c
|
fs/iso.c
|
||||||
fs/ntfs.c
|
fs/ntfs.c
|
||||||
inifile/ini_init.c
|
lib/inifile/ini_init.c
|
||||||
inifile/inifile.c
|
lib/inifile/inifile.c
|
||||||
inifile/parse.c
|
lib/inifile/parse.c
|
||||||
mm/meminit.c
|
mm/meminit.c
|
||||||
mm/mm.c
|
mm/mm.c
|
||||||
mm/heap.c
|
mm/heap.c
|
||||||
|
@ -177,8 +177,8 @@ endif()
|
||||||
list(APPEND FREELDR_BASE_SOURCE
|
list(APPEND FREELDR_BASE_SOURCE
|
||||||
bootmgr.c # This file is compiled with custom definitions
|
bootmgr.c # This file is compiled with custom definitions
|
||||||
freeldr.c
|
freeldr.c
|
||||||
inffile/inffile.c
|
lib/inffile/inffile.c
|
||||||
rtl/libsupp.c)
|
lib/rtl/libsupp.c)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
|
list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
|
||||||
|
|
|
@ -296,7 +296,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem,
|
||||||
/* Close the inf file */
|
/* Close the inf file */
|
||||||
InfCloseFile(InfHandle);
|
InfCloseFile(InfHandle);
|
||||||
|
|
||||||
/* Load ReactOS */
|
/* Load ReactOS Setup */
|
||||||
LoadAndBootWindowsCommon(_WIN32_WINNT_WS03,
|
LoadAndBootWindowsCommon(_WIN32_WINNT_WS03,
|
||||||
LoaderBlock,
|
LoaderBlock,
|
||||||
BootOptions,
|
BootOptions,
|
||||||
|
|
|
@ -603,13 +603,12 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem,
|
||||||
BOOLEAN Status;
|
BOOLEAN Status;
|
||||||
PLOADER_PARAMETER_BLOCK LoaderBlock;
|
PLOADER_PARAMETER_BLOCK LoaderBlock;
|
||||||
|
|
||||||
// Get OS setting value
|
/* Get OS setting value */
|
||||||
SettingsValue[0] = ANSI_NULL;
|
SettingsValue[0] = ANSI_NULL;
|
||||||
IniOpenSection("Operating Systems", &SectionId);
|
IniOpenSection("Operating Systems", &SectionId);
|
||||||
IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue));
|
IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue));
|
||||||
|
|
||||||
// Open the operating system section
|
/* Open the operating system section specified in the .ini file */
|
||||||
// specified in the .ini file
|
|
||||||
HasSection = IniOpenSection(SectionName, &SectionId);
|
HasSection = IniOpenSection(SectionName, &SectionId);
|
||||||
|
|
||||||
UiDrawBackdrop();
|
UiDrawBackdrop();
|
||||||
|
@ -781,13 +780,6 @@ LoadAndBootWindowsCommon(
|
||||||
WinLdrpDumpArcDisks(LoaderBlockVA);
|
WinLdrpDumpArcDisks(LoaderBlockVA);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below
|
|
||||||
//while (1) {};
|
|
||||||
/*asm(".intel_syntax noprefix\n");
|
|
||||||
asm("test1:\n");
|
|
||||||
asm("jmp test1\n");
|
|
||||||
asm(".att_syntax\n");*/
|
|
||||||
|
|
||||||
/* Pass control */
|
/* Pass control */
|
||||||
(*KiSystemStartup)(LoaderBlockVA);
|
(*KiSystemStartup)(LoaderBlockVA);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue