From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 20 Jan 2016 03:53:59 +0000 (+0000)
Subject: [HIVEBCD/BOOTMGR]: Prep work
X-Git-Tag: ReactOS-0.4.1~569
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5126de14b6a9d13081fdc0ed8e134d45fa1ca03b

[HIVEBCD/BOOTMGR]: Prep work

svn path=/trunk/; revision=70625
---

diff --git a/reactos/boot/bootdata/hivebcd.inf b/reactos/boot/bootdata/hivebcd.inf
index c8f14a0cc13..a7d904a3c63 100644
--- a/reactos/boot/bootdata/hivebcd.inf
+++ b/reactos/boot/bootdata/hivebcd.inf
@@ -31,35 +31,16 @@ BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\1100000
     00,00,00,00,\
     00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
     00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
-BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000002","Element",,"\windows\system32\boot\winload.efi"              ; path
+BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000002","Element",,"\reactos\system32\boot\rosload.efi"              ; path
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000004","Element",,"ReactOS Setup"                                   ; description
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000005","Element",,"en-US"                                           ; locale="en-US"
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\14000006","Element",0x10000,"{6efb52bf-1766-41db-a6b3-0ee5eff72bd7}"   ; inherit={bootloadersettings}
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\16000060","Element",0x1,0x01                                           ; isolatedcontext=Yes
-BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\22000002","Element",,"\windows"                                        ; systemroot=\Windows
+BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\22000002","Element",,"\reactos"                                        ; systemroot=\Windows
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\26000010","Element",0x1,0x01                                           ; detecthal=Yes
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\26000022","Element",0x1,0x01                                           ; winpe=Yes
 BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\260000b0","Element",0x1,0x01                                           ; ems=Yes
 
-;
-; ReactOS Memory Tester
-;
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Description","Type",0x00010001,0x10200005                                       ; identifier={memdiag}
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\11000001","Element",0x1,\                                              ; device=boot
-    00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
-    05,00,00,00,\
-    00,00,00,00,\
-    48,00,00,00,\
-    00,00,00,00,\
-    00,00,00,00,\
-    00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
-    00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000002","Element",,"\EFI\BOOT\MEMTEST.EFI"                           ; path
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000004","Element",,"ReactOS Memory Diagnostics"                      ; description
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000005","Element",,"en-US"                                           ; locale="en-US"
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\14000006","Element",0x10000,"{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}"   ; inherit={globalsettings}
-BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\1600000b","Element",0x1,0x01                                           ; allowbadmemoryaccess=Yes
-
 ;
 ; Global Settings
 ;
diff --git a/reactos/boot/environ/app/bootmgr/bootmgr.c b/reactos/boot/environ/app/bootmgr/bootmgr.c
index c34af5aefb7..6fcdfd7a55b 100644
--- a/reactos/boot/environ/app/bootmgr/bootmgr.c
+++ b/reactos/boot/environ/app/bootmgr/bootmgr.c
@@ -2862,7 +2862,7 @@ BmMain (
         goto Failure;
     }
     XmlLoaded = TRUE;
-
+    EfiStall(100000000);
     /* Check if there's an active bitmap visible */
     if (!BlDisplayValidOemBitmap())
     {
@@ -2952,6 +2952,8 @@ BmMain (
         goto Failure;
     }
 
+    //BlResourceFindMessage(BM_MSG_TEST);
+
     /* At last, enter the boot selection stage */
     SequenceId = 0;
     GetEntry = FALSE;