tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove console control protocol consuming in DrawImage(), caller should make sure current mode is graphics mode. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7568 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2009-02-23 03:02:07 +00:00
parent bc6b5892b0
commit 3f57706fa9
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
View File

@ -59,7 +59,6 @@
UefiRuntimeServicesTableLib UefiRuntimeServicesTableLib
[Protocols] [Protocols]
gEfiConsoleControlProtocolGuid ## CONSUMES
gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES
gEfiHiiStringProtocolGuid ## PRODUCES gEfiHiiStringProtocolGuid ## PRODUCES
gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol ## PRODUCES gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol ## PRODUCES

14
MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
View File

@ -1233,7 +1233,6 @@ HiiDrawImage (
UINTN OffsetY2; UINTN OffsetY2;
EFI_FONT_DISPLAY_INFO *FontInfo; EFI_FONT_DISPLAY_INFO *FontInfo;
UINTN Index; UINTN Index;
EFI_CONSOLE_CONTROL_PROTOCOL *Console;
if (This == NULL || Image == NULL || Blt == NULL) { if (This == NULL || Image == NULL || Blt == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -1323,17 +1322,10 @@ HiiDrawImage (
// Draw the image to existing bitmap or screen depending on flag. // Draw the image to existing bitmap or screen depending on flag.
// //
if ((Flags & EFI_HII_DIRECT_TO_SCREEN) == EFI_HII_DIRECT_TO_SCREEN) { if ((Flags & EFI_HII_DIRECT_TO_SCREEN) == EFI_HII_DIRECT_TO_SCREEN) {
Status = gBS->LocateProtocol ( //
&gEfiConsoleControlProtocolGuid, // Caller should make sure the current UGA console is grarphic mode.
NULL, //
(VOID **) &Console
);
if (EFI_ERROR (Status)) {
return Status;
}
Console->SetMode (Console, EfiConsoleControlScreenGraphics);
// //
// Write the image directly to the output device specified by Screen. // Write the image directly to the output device specified by Screen.
// //