c44501b313
The UefiShell*CommandsLib instances have constructor functions that do something like: gHiiHandle = HiiAddPackages (...); ... ShellCommandRegisterCommandName (..., gHiiHandle, ...); and destructor functions that implement the following pattern: HiiRemovePackages (gHiiHandle); The -- semantic, not functional -- problem is that "gHiiHandle" is declared with type EFI_HANDLE, and not EFI_HII_HANDLE, in all of these library instances, even though HiiAddPackages() correctly returns EFI_HII_HANDLE, and HiiRemovePackages() takes EFI_HII_HANDLE. Once we fix the type of "gHiiHandle", it causes sort of a butterfly effect, because it is passed around widely. Track down and update all of those locations. The DynamicCommand lib instances use a similar pattern, so they are affected too. NOTE: in practice, this patch is a no-op, as both EFI_HII_HANDLE and EFI_HANDLE are typedefs to (VOID*). However, we shouldn't use EFI_HANDLE where semantically EFI_HII_HANDLE is passed around. Cc: Jaben Carsey <jaben.carsey@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Zhichao Gao <zhichao.gao@intel.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com> Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
66 lines
1.8 KiB
C
66 lines
1.8 KiB
C
/** @file
|
|
Provides interface to shell internal functions for shell commands.
|
|
|
|
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. <BR>
|
|
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
|
|
SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
|
**/
|
|
|
|
#ifndef _UEFI_COMMAND_LIB_INTERNAL_HEADER_
|
|
#define _UEFI_COMMAND_LIB_INTERNAL_HEADER_
|
|
|
|
#include <Uefi.h>
|
|
|
|
#include <Guid/FileInfo.h>
|
|
#include <Guid/GlobalVariable.h>
|
|
|
|
#include <Protocol/SimpleFileSystem.h>
|
|
#include <Protocol/LoadedImage.h>
|
|
#include <Protocol/EfiShellInterface.h>
|
|
#include <Protocol/EfiShellEnvironment2.h>
|
|
#include <Protocol/Shell.h>
|
|
#include <Protocol/ShellParameters.h>
|
|
#include <Protocol/UnicodeCollation.h>
|
|
#include <Protocol/BlockIo.h>
|
|
#include <Protocol/ShellDynamicCommand.h>
|
|
|
|
#include <Library/DevicePathLib.h>
|
|
#include <Library/SortLib.h>
|
|
#include <Library/HandleParsingLib.h>
|
|
#include <Library/BaseLib.h>
|
|
#include <Library/BaseMemoryLib.h>
|
|
#include <Library/DebugLib.h>
|
|
#include <Library/MemoryAllocationLib.h>
|
|
#include <Library/PcdLib.h>
|
|
#include <Library/ShellCommandLib.h>
|
|
#include <Library/PrintLib.h>
|
|
#include <Library/ShellLib.h>
|
|
#include <Library/HiiLib.h>
|
|
#include <Library/UefiBootServicesTableLib.h>
|
|
#include <Library/UefiLib.h>
|
|
|
|
typedef struct{
|
|
LIST_ENTRY Link;
|
|
CHAR16 *CommandString;
|
|
SHELL_GET_MAN_FILENAME GetManFileName;
|
|
SHELL_RUN_COMMAND CommandHandler;
|
|
BOOLEAN LastError;
|
|
EFI_HII_HANDLE HiiHandle;
|
|
EFI_STRING_ID ManFormatHelp;
|
|
} SHELL_COMMAND_INTERNAL_LIST_ENTRY;
|
|
|
|
typedef struct {
|
|
LIST_ENTRY Link;
|
|
SCRIPT_FILE *Data;
|
|
} SCRIPT_FILE_LIST;
|
|
|
|
typedef struct {
|
|
EFI_FILE_PROTOCOL *FileHandle;
|
|
CHAR16 *Path;
|
|
} SHELL_COMMAND_FILE_HANDLE;
|
|
|
|
|
|
#endif //_UEFI_COMMAND_LIB_INTERNAL_HEADER_
|
|
|