[FREELDR]

- Move inXfile and rtl code into a lib subdir,
- Minor comment formatting.

svn path=/trunk/; revision=65963

reactos/boot/freeldr/freeldr/CMakeLists.txt

@@ -53,9 +53,9 @@ list(APPEND FREELDR_COMMON_SOURCE
     fs/fs.c
     fs/iso.c
     fs/ntfs.c
-    inifile/ini_init.c
-    inifile/inifile.c
-    inifile/parse.c
+    lib/inifile/ini_init.c
+    lib/inifile/inifile.c
+    lib/inifile/parse.c
     mm/meminit.c
     mm/mm.c
     mm/heap.c
@@ -177,8 +177,8 @@ endif()
 list(APPEND FREELDR_BASE_SOURCE
     bootmgr.c # This file is compiled with custom definitions
     freeldr.c
-    inffile/inffile.c
-    rtl/libsupp.c)
+    lib/inffile/inffile.c
+    lib/rtl/libsupp.c)
 
 if(NOT MSVC)
     list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)

reactos/boot/freeldr/freeldr/windows/setupldr.c

@@ -296,7 +296,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem,
     /* Close the inf file */
     InfCloseFile(InfHandle);
 
-    /* Load ReactOS */
+    /* Load ReactOS Setup */
     LoadAndBootWindowsCommon(_WIN32_WINNT_WS03,
                              LoaderBlock,
                              BootOptions,

reactos/boot/freeldr/freeldr/windows/winldr.c

@@ -603,13 +603,12 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem,
     BOOLEAN Status;
     PLOADER_PARAMETER_BLOCK LoaderBlock;
 
-    // Get OS setting value
+    /* Get OS setting value */
     SettingsValue[0] = ANSI_NULL;
     IniOpenSection("Operating Systems", &SectionId);
     IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue));
 
-    // Open the operating system section
-    // specified in the .ini file
+    /* Open the operating system section specified in the .ini file */
     HasSection = IniOpenSection(SectionName, &SectionId);
 
     UiDrawBackdrop();
@@ -781,13 +780,6 @@ LoadAndBootWindowsCommon(
     WinLdrpDumpArcDisks(LoaderBlockVA);
 #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 */
     (*KiSystemStartup)(LoaderBlockVA);
 }