[ros-diffs] [ion] 70625: [HIVEBCD/BOOTMGR]: Prep work

Author: ion
Date: Wed Jan 20 03:53:59 2016
New Revision: 70625

URL: http://svn.reactos.org/svn/reactos?rev=70625&view=rev
Log:
[HIVEBCD/BOOTMGR]: Prep work

Modified:
    trunk/reactos/boot/bootdata/hivebcd.inf
    trunk/reactos/boot/environ/app/bootmgr/bootmgr.c

Modified: trunk/reactos/boot/bootdata/hivebcd.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivebcd.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivebcd.inf	[iso-8859-1] Wed Jan 20 03:53:59 2016
@@ -31,34 +31,15 @@
     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

Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b…
==============================================================================
--- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c	[iso-8859-1] Wed Jan 20 03:53:59
2016
@@ -2862,7 +2862,7 @@
         goto Failure;
     }
     XmlLoaded = TRUE;
-
+    EfiStall(100000000);
     /* Check if there's an active bitmap visible */
     if (!BlDisplayValidOemBitmap())
     {
@@ -2951,6 +2951,8 @@
         Status = STATUS_NOT_IMPLEMENTED;
         goto Failure;
     }
+
+    //BlResourceFindMessage(BM_MSG_TEST);
 
     /* At last, enter the boot selection stage */
     SequenceId = 0;