[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 ed0dc36..12a94ae 100644 (file)
--- a/reactos/boot/environ/lib/misc/bcd.c
+++ b/reactos/boot/environ/lib/misc/bcd.c
@@ -24,7 +24,7 @@ BiNotifyEnumerationError (
     UNREFERENCED_PARAMETER(ObjectHandle);
     UNREFERENCED_PARAMETER(ElementName);
     UNREFERENCED_PARAMETER(Status);
-    EfiPrintf(L"Error in BiNotify\r\n");
+    EfiPrintf(L"Error in BiNotify: %lx for element %s\r\n", Status, ElementName);
 }
 
 ULONG
@@ -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 */
@@ -818,7 +818,7 @@ BiEnumerateElements (
     ULONG i;
     PVOID ElementData, SubObjectList, RegistryElementData;
     BcdElementType ElementType;
-    PBCD_PACKED_ELEMENT PreviousElement;
+    PBCD_PACKED_ELEMENT PreviousElement, ElementsStart;
     ULONG SubElementCount, SubKeyCount, SubObjectCount, ElementDataLength;
     PWCHAR ElementName;
     PWCHAR* SubKeys;
@@ -839,6 +839,7 @@ BiEnumerateElements (
     ElementDataLength = 0;
     SubObjectCount = 0;
     RemainingLength = 0;
+    ElementsStart = Elements;
 
     /* Open the root object key's elements */
     Status = BiOpenKey(ObjectHandle, L"Elements", &ElementsHandle);
@@ -862,6 +863,8 @@ BiEnumerateElements (
         Status = BiOpenKey(ElementsHandle, ElementName, &ElementHandle);
         if (!NT_SUCCESS(Status))
         {
+            EfiPrintf(L"ELEMENT ERROR: %lx\r\n", Status);
+            EfiStall(100000);
             break;
         }
 
@@ -869,22 +872,22 @@ BiEnumerateElements (
         ElementType.PackedValue = wcstoul(SubKeys[i], NULL, 16);
         if (!(ElementType.PackedValue) || (ElementType.PackedValue == -1))
         {
-            EfiPrintf(L"Value invald\r\n");
+            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,
                                     &RegistryElementDataLength);
         if (!NT_SUCCESS(Status))
         {
+            EfiPrintf(L"Element invalid\r\n");
             break;
         }
 
@@ -945,7 +948,7 @@ BiEnumerateElements (
         if (RemainingLength >= TotalLength)
         {
             /* Set the next pointer */
-            Elements->NextEntry = (PBCD_PACKED_ELEMENT)((ULONG_PTR)Elements + TotalLength);
+            Elements->NextEntry = (PBCD_PACKED_ELEMENT)((ULONG_PTR)ElementsStart + TotalLength);
 
             /* Fill this one out */
             Elements->RootType.PackedValue = RootElementType;
@@ -1005,7 +1008,7 @@ BiEnumerateElements (
                         /* Link the subelements into the chain */
                         PreviousElement = Elements;
                         PreviousElement->NextEntry =
-                            (PBCD_PACKED_ELEMENT)((ULONG_PTR)Elements +
+                            (PBCD_PACKED_ELEMENT)((ULONG_PTR)ElementsStart +
                                                   TotalLength);
                         Elements = PreviousElement->NextEntry;
                     }
@@ -1172,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,