[ros-diffs] [hbelusca] 71923: [BOOTLIB] - BiOpenKey is being feed with the wrong ElementHandle, it should be feed with ElementsHandle one. CID 1363670 . By Victor Martinez Calvo. CORE-11600 #resolve [BOOTMGR] ...

[hbelusca]

Author: hbelusca
Date: Wed Jul 13 15:43:08 2016
New Revision: 71923

URL: http://svn.reactos.org/svn/reactos?rev=71923&view=rev
Log:
[BOOTLIB]
- BiOpenKey is being feed with the wrong ElementHandle, it should be feed with 
ElementsHandle one. CID 1363670 . By Victor Martinez Calvo. CORE-11600 #resolve
[BOOTMGR]
- Fix an Assign vs Compare issue. CID 1363558 .  By Victor Martinez Calvo. 
CORE-11592 #resolve

Modified:
    trunk/reactos/boot/environ/app/bootmgr/bootmgr.c
    trunk/reactos/boot/environ/lib/misc/bcd.c

Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/bootmgr.c?rev=71923&r1=71922&r2=71923&view=diff
==============================================================================
--- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c    [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c    [iso-8859-1] Wed Jul 13 
15:43:08 2016
@@ -1403,7 +1403,7 @@
 
         /* Check if this is a real mode startup.com */
         if ((ObjectType.Application.ObjectCode == BCD_OBJECT_TYPE_APPLICATION) 
&&
-            (ObjectType.Application.ImageCode = BCD_IMAGE_TYPE_REAL_MODE) &&
+            (ObjectType.Application.ImageCode == BCD_IMAGE_TYPE_REAL_MODE) &&
             (ObjectType.Application.ApplicationCode == 
BCD_APPLICATION_TYPE_STARTUPCOM))
         {
             /* Check if PXE soft reboot will occur */

Modified: trunk/reactos/boot/environ/lib/misc/bcd.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.c?rev=71923&r1=71922&r2=71923&view=diff
==============================================================================
--- trunk/reactos/boot/environ/lib/misc/bcd.c   [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/lib/misc/bcd.c   [iso-8859-1] Wed Jul 13 
15:43:08 2016
@@ -579,7 +579,7 @@
         else
         {
             /* Open the element specifically */
-            Status = BiOpenKey(ElementHandle, TypeString, &ElementHandle);
+            Status = BiOpenKey(ElementsHandle, TypeString, &ElementHandle);
             if (NT_SUCCESS(Status))
             {
                 /* Delete it */
@@ -874,7 +874,7 @@
         {
             EfiPrintf(L"Value invalid\r\n");
             BiCloseKey(ElementHandle);
-            ElementHandle = 0;
+            ElementHandle = NULL;
             continue;
         }