Changeset 37145 in vbox for trunk/src/VBox

Timestamp:

May 19, 2011 2:02:10 AM (14 years ago)

Author:

vboxsync

Message:

EFI: BDS styled boot option enumeration.

File:

• trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c

@@ -973 +973 @@
 }
 
+static BOOLEAN bdsCheckFileName(EFI_IMAGE_OPTIONAL_HEADER_UNION *pHdrData, EFI_HANDLE FileSystemHandle, CHAR16 *pu16FileName, CHAR16 **ppNewFileName)
+{
+    EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;
+    BOOLEAN fNeedDelete = TRUE;
+    CHAR16 *NewFileName;
+    EFI_STATUS Status;
+    Hdr.Union = pHdrData;
+    EFI_IMAGE_DOS_HEADER          DosHeader;
+    Status     = BdsLibGetImageHeader (
+                   FileSystemHandle,
+                   pu16FileName,
+                   &DosHeader,
+                   Hdr,
+                   &NewFileName
+                   );
+    if (!EFI_ERROR (Status)
+#ifndef VBOX
+        && EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
+        Hdr.Pe32->OptionalHeader.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION
+#endif
+        ) {
+      fNeedDelete = FALSE;
+    }
+    if (ppNewFileName)
+        *ppNewFileName = NewFileName;
+    return fNeedDelete;
+}
 
 /**
@@ -1050 +1077 @@
   UINTN                         NumberFileSystemHandles;
   BOOLEAN                       NeedDelete;
-  EFI_IMAGE_DOS_HEADER          DosHeader;
   EFI_IMAGE_OPTIONAL_HEADER_UNION       HdrData;
-  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;
-  CHAR16 *NewFileName;
+  //EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;
 
   FloppyNumber  = 0;
@@ -1189 +1214 @@
     //  machinename is ia32, ia64, x64, ...
     //
-    Hdr.Union = &HdrData;
+    //Hdr.Union = &HdrData;
     NeedDelete = TRUE;
-    Status     = BdsLibGetImageHeader (
-                   FileSystemHandles[Index],
-                   EFI_REMOVABLE_MEDIA_FILE_NAME,
-                   &DosHeader,
-                   Hdr,
-                   &NewFileName
-                   );
-    if (!EFI_ERROR (Status)
-#ifndef VBOX
-        && EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
-        Hdr.Pe32->OptionalHeader.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION
-#endif
-        ) {
-      NeedDelete = FALSE;
-    }
-      Status = BdsLibGetImageHeader (
-                 FileSystemHandles[Index],
-                 L"\\System\\Library\\CoreServices\\boot.efi",
-                 &DosHeader,
-                 Hdr,
-                 &NewFileName
-                 );
-      /* Here should be Mac Specific checks */
-      if (!EFI_ERROR (Status)) {
-            NeedDelete = FALSE;
-      }
-
+    NeedDelete = bdsCheckFileName(&HdrData, FileSystemHandles[Index], EFI_REMOVABLE_MEDIA_FILE_NAME, NULL);
+    if (NeedDelete)
+        NeedDelete = bdsCheckFileName(&HdrData, FileSystemHandles[Index], L"\\System\\Library\\CoreServices\\boot.efi", NULL);
+    if (NeedDelete)
+        NeedDelete = bdsCheckFileName(&HdrData, FileSystemHandles[Index], L"\\Mac OS X Install Data\\boot.efi", NULL);
     if (NeedDelete) {
       //
@@ -1455 +1458 @@
   UINTN                           NumberSimpleFileSystemHandles;
   UINTN                           Index;
-  EFI_IMAGE_DOS_HEADER            DosHeader;
+  //EFI_IMAGE_DOS_HEADER            DosHeader;
   EFI_IMAGE_OPTIONAL_HEADER_UNION       HdrData;
-  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;
+  //EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;
 
   UpdatedDevicePath = DevicePath;
@@ -1557 +1560 @@
       //  machinename is ia32, ia64, x64, ...
       //
-      Hdr.Union = &HdrData;
-      Status = BdsLibGetImageHeader (
-                 SimpleFileSystemHandles[Index],
-                 EFI_REMOVABLE_MEDIA_FILE_NAME,
-                 &DosHeader,
-                 Hdr,
-                 NewFileName
-                 );
-      if (!EFI_ERROR (Status)
-#ifndef VBOX
-        && EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
-        Hdr.Pe32->OptionalHeader.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION
-#endif
-      ) {
-        ReturnHandle = SimpleFileSystemHandles[Index];
-        break;
-      }
-      Status = BdsLibGetImageHeader (
-                 SimpleFileSystemHandles[Index],
-                 L"\\System\\Library\\CoreServices\\boot.efi",
-                 &DosHeader,
-                 Hdr,
-                 NewFileName
-                 );
-      /* Here should be Mac Specific checks */
-      if (!EFI_ERROR (Status)
-#ifndef VBOX
-        && EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
-        Hdr.Pe32->OptionalHeader.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION
-#endif
-        ) {
-        DEBUG((DEBUG_INFO, "%a:%d clear the timer \n", __FILE__, __LINE__));
-        ReturnHandle = SimpleFileSystemHandles[Index];
-        break;
+      BOOLEAN fNotFound = bdsCheckFileName(&HdrData, SimpleFileSystemHandles[Index], EFI_REMOVABLE_MEDIA_FILE_NAME, NewFileName);
+      if (fNotFound)
+          fNotFound = bdsCheckFileName(&HdrData, SimpleFileSystemHandles[Index], L"\\System\\Library\\CoreServices\\boot.efi", NewFileName);
+      if (fNotFound)
+          fNotFound = bdsCheckFileName(&HdrData, SimpleFileSystemHandles[Index], L"\\Mac OS X Install Data\\boot.efi", NewFileName);
+      if (!fNotFound)
+      {
+         ReturnHandle = SimpleFileSystemHandles[Index];
+         break;
       }
     }