Adding upstream version 7.0.14-dfsg.upstream/7.0.14-dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 132 insertions, 0 deletions

diff --git a/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c b/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
new file mode 100644
index 00000000..c581dd9d
--- /dev/null
+++ b/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.c
@@ -0,0 +1,93 @@
+/** @file
+  Provides application point extension for "C" style main function
+
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Base.h>
+
+#include <Protocol/SimpleFileSystem.h>
+#include <Protocol/LoadedImage.h>
+#include <Protocol/EfiShellInterface.h>
+#include <Protocol/ShellParameters.h>
+
+#include <Library/ShellCEntryLib.h>
+#include <Library/DebugLib.h>
+
+/**
+  UEFI entry point for an application that will in turn call the
+  ShellAppMain function which has parameters similar to a standard C
+  main function.
+
+  An application that uses UefiShellCEntryLib must have a ShellAppMain
+  function as prototyped in Include/Library/ShellCEntryLib.h.
+
+  Note that the Shell uses POSITIVE integers for error values, while UEFI
+  uses NEGATIVE values.  If the application is to be used within a script,
+  it needs to return one of the SHELL_STATUS values defined in Protocol/Shell.h.
+
+  @param  ImageHandle  The image handle of the UEFI Application.
+  @param  SystemTable  A pointer to the EFI System Table.
+
+  @retval  EFI_SUCCESS               The application exited normally.
+  @retval  Other                     An error occurred.
+
+**/
+EFI_STATUS
+EFIAPI
+ShellCEntryLib (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
+  )
+{
+  INTN                           ReturnFromMain;
+  EFI_SHELL_PARAMETERS_PROTOCOL *EfiShellParametersProtocol;
+  EFI_SHELL_INTERFACE           *EfiShellInterface;
+  EFI_STATUS                    Status;
+
+  ReturnFromMain = -1;
+  EfiShellParametersProtocol = NULL;
+  EfiShellInterface = NULL;
+
+  Status = SystemTable->BootServices->OpenProtocol(ImageHandle,
+                             &gEfiShellParametersProtocolGuid,
+                             (VOID **)&EfiShellParametersProtocol,
+                             ImageHandle,
+                             NULL,
+                             EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                            );
+  if (!EFI_ERROR(Status)) {
+    //
+    // use shell 2.0 interface
+    //
+    ReturnFromMain = ShellAppMain (
+                       EfiShellParametersProtocol->Argc,
+                       EfiShellParametersProtocol->Argv
+                      );
+  } else {
+    //
+    // try to get shell 1.0 interface instead.
+    //
+    Status = SystemTable->BootServices->OpenProtocol(ImageHandle,
+                               &gEfiShellInterfaceGuid,
+                               (VOID **)&EfiShellInterface,
+                               ImageHandle,
+                               NULL,
+                               EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                              );
+    if (!EFI_ERROR(Status)) {
+      //
+      // use shell 1.0 interface
+      //
+      ReturnFromMain = ShellAppMain (
+                         EfiShellInterface->Argc,
+                         EfiShellInterface->Argv
+                        );
+    } else {
+      ASSERT(FALSE);
+    }
+  }
+  return ReturnFromMain;
+}
diff --git a/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf b/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
new file mode 100644
index 00000000..9c1cabd4
--- /dev/null
+++ b/src/VBox/Devices/EFI/Firmware/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
@@ -0,0 +1,39 @@
+##  @file
+#  Provides interface to shell functionality for shell commands and applications.
+#
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010006
+  BASE_NAME                      = UefiShellCEntryLib
+  FILE_GUID                      = 0e205c8a-8586-4dec-9f5c-4f9e394aefe8
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = ShellCEntryLib|UEFI_APPLICATION UEFI_DRIVER
+
+#
+#  VALID_ARCHITECTURES           = IA32 X64 EBC
+#
+
+[Sources.common]
+  UefiShellCEntryLib.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  ShellPkg/ShellPkg.dec
+
+[LibraryClasses]
+  UefiApplicationEntryPoint
+  DebugLib
+
+
+[Protocols]
+  gEfiShellParametersProtocolGuid                         ## CONSUMES
+  gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES
+
+