From 380484c985b9b4a457d20e1ff88d8ba3107835be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 13 Jul 2016 15:43:08 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=71923 --- reactos/boot/environ/app/bootmgr/bootmgr.c | 2 +- reactos/boot/environ/lib/misc/bcd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/boot/environ/app/bootmgr/bootmgr.c b/reactos/boot/environ/app/bootmgr/bootmgr.c index cfc9952a0ab..46df5ceeaf7 100644 --- a/reactos/boot/environ/app/bootmgr/bootmgr.c +++ b/reactos/boot/environ/app/bootmgr/bootmgr.c @@ -1403,7 +1403,7 @@ BmpPopulateBootEntryList ( /* 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 */ diff --git a/reactos/boot/environ/lib/misc/bcd.c b/reactos/boot/environ/lib/misc/bcd.c index 786c55d1fa5..12a94ae8210 100644 --- a/reactos/boot/environ/lib/misc/bcd.c +++ b/reactos/boot/environ/lib/misc/bcd.c @@ -579,7 +579,7 @@ BcdDeleteElement ( 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 @@ BiEnumerateElements ( { EfiPrintf(L"Value invalid\r\n"); BiCloseKey(ElementHandle); - ElementHandle = 0; + ElementHandle = NULL; continue; } -- 2.17.1