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>
		
			
				
	
	
		
			70 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/** @file
 | 
						|
  Header file for 'tftp' command functions.
 | 
						|
 | 
						|
  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved. <BR>
 | 
						|
  Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
 | 
						|
 | 
						|
  SPDX-License-Identifier: BSD-2-Clause-Patent
 | 
						|
 | 
						|
**/
 | 
						|
 | 
						|
#ifndef _TFTP_H_
 | 
						|
#define _TFTP_H_
 | 
						|
 | 
						|
#include <Uefi.h>
 | 
						|
 | 
						|
#include <Protocol/HiiPackageList.h>
 | 
						|
#include <Protocol/ServiceBinding.h>
 | 
						|
#include <Protocol/Mtftp4.h>
 | 
						|
 | 
						|
#include <Library/BaseLib.h>
 | 
						|
#include <Library/BaseMemoryLib.h>
 | 
						|
#include <Library/DebugLib.h>
 | 
						|
#include <Library/MemoryAllocationLib.h>
 | 
						|
#include <Library/ShellLib.h>
 | 
						|
#include <Library/UefiLib.h>
 | 
						|
#include <Library/UefiRuntimeServicesTableLib.h>
 | 
						|
#include <Library/UefiBootServicesTableLib.h>
 | 
						|
#include <Library/HiiLib.h>
 | 
						|
#include <Library/NetLib.h>
 | 
						|
#include <Library/PrintLib.h>
 | 
						|
#include <Library/UefiHiiServicesLib.h>
 | 
						|
 | 
						|
extern EFI_HII_HANDLE mTftpHiiHandle;
 | 
						|
 | 
						|
typedef struct {
 | 
						|
  UINTN  FileSize;
 | 
						|
  UINTN  DownloadedNbOfBytes;
 | 
						|
  UINTN  LastReportedNbOfBytes;
 | 
						|
} DOWNLOAD_CONTEXT;
 | 
						|
 | 
						|
/**
 | 
						|
  Function for 'tftp' command.
 | 
						|
 | 
						|
  @param[in]  ImageHandle     The image handle.
 | 
						|
  @param[in]  SystemTable     The system table.
 | 
						|
 | 
						|
  @retval SHELL_SUCCESS            Command completed successfully.
 | 
						|
  @retval SHELL_INVALID_PARAMETER  Command usage error.
 | 
						|
  @retval SHELL_ABORTED            The user aborts the operation.
 | 
						|
  @retval value                    Unknown error.
 | 
						|
**/
 | 
						|
SHELL_STATUS
 | 
						|
RunTftp (
 | 
						|
  IN EFI_HANDLE        ImageHandle,
 | 
						|
  IN EFI_SYSTEM_TABLE  *SystemTable
 | 
						|
  );
 | 
						|
 | 
						|
/**
 | 
						|
  Retrive HII package list from ImageHandle and publish to HII database.
 | 
						|
 | 
						|
  @param ImageHandle            The image handle of the process.
 | 
						|
 | 
						|
  @return HII handle.
 | 
						|
**/
 | 
						|
EFI_HII_HANDLE
 | 
						|
InitializeHiiPackage (
 | 
						|
  EFI_HANDLE                  ImageHandle
 | 
						|
  );
 | 
						|
#endif // _TFTP_H_
 |