[BOOTLIB]

[reactos.git] / reactos / boot / environ / lib / misc / bcd.c

diff --git a/reactos/boot/environ/lib/misc/bcd.c b/reactos/boot/environ/lib/misc/bcd.c
index 7d32fa7..12a94ae 100644 (file)
--- 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,14 +874,13 @@ BiEnumerateElements (
         {
             EfiPrintf(L"Value invalid\r\n");
             BiCloseKey(ElementHandle);
-            ElementHandle = 0;
+            ElementHandle = NULL;
             continue;
         }
 
         /* Read the appropriate registry value type for this element */
         Status = BiGetRegistryValue(ElementHandle,
                                     L"Element",
-                                    NULL,
                                     BiConvertElementFormatToValueType(
                                     ElementType.Format),
                                     &RegistryElementData,
@@ -1176,6 +1175,69 @@ BiAddStoreFromFile (
     return Status;
 }
 
+NTSTATUS
+BiGetObjectDescription (
+    _In_ HANDLE ObjectHandle,
+    _Out_ PBCD_OBJECT_DESCRIPTION Description
+    )
+{
+    NTSTATUS Status;
+    HANDLE DescriptionHandle;
+    PULONG Data;
+    ULONG Length;
+
+    /* Initialize locals */
+    Data = NULL;
+    DescriptionHandle = NULL;
+
+    /* Open the description key */
+    Status = BiOpenKey(ObjectHandle, L"Description", &DescriptionHandle);
+    if (NT_SUCCESS(Status))
+    {
+        /* It exists */
+        Description->Valid = TRUE;
+
+        /* Read the type */
+        Length = 0;
+        Status = BiGetRegistryValue(DescriptionHandle,
+                                    L"Type", 
+                                    REG_DWORD,
+                                    (PVOID*)&Data,
+                                    &Length);
+        if (NT_SUCCESS(Status))
+        {
+            /* Make sure it's the length we expected it to be */
+            if (Length == sizeof(Data))
+            {
+                /* Return the type that is stored there */
+                Description->Type = *Data;
+            }
+            else
+            {
+                /* Invalid type value */
+                Status = STATUS_OBJECT_TYPE_MISMATCH;
+            }
+        }
+    }
+
+    /* Did we have a handle open? */
+    if (DescriptionHandle)
+    {
+        /* Close it */
+        BiCloseKey(DescriptionHandle);
+    }
+
+    /* Did we have data allocated? */
+    if (Data)
+    {
+        /* Free it */
+        BlMmFreeHeap(Data);
+    }
+
+    /* Return back to caller */
+    return Status;
+}
+
 NTSTATUS
 BcdEnumerateAndUnpackElements (
     _In_ HANDLE BcdHandle,