-Index: hexedit/libInputBar.c
-===================================================================
---- hexedit/libInputBar.c (revision 64)
-+++ hexedit/libInputBar.c (working copy)
-@@ -169,8 +169,6 @@
- UINTN Size;
- EFI_STATUS Status;
- BOOLEAN NoDisplay;
-- UINTN Limit;
-- UINTN PromptLen;
-
- //
- // variable initialization
-@@ -190,6 +188,7 @@
- // back up the old screen attributes
- //
- Orig = HMainEditor.ColorAttributes;
-+ New.Data = 0;
- New.Colors.Foreground = Orig.Colors.Background;
- New.Colors.Background = Orig.Colors.Foreground;
-
-@@ -201,15 +200,9 @@
- HEditorClearLine (INPUT_BAR_LOCATION);
-
- Out->SetCursorPosition (Out, 0, INPUT_BAR_LOCATION - 1);
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), HiiHandle, HMainInputBar.Prompt);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBINPUTBAR_MAININPUTBAR), gHexEditHiiHandle, HMainInputBar.Prompt);
-
- //
-- // that's the maximum input length that can be displayed on screen
-- //
-- PromptLen = StrLen (HMainInputBar.Prompt);
-- Limit = HMainEditor.ScreenSize.Column - PromptLen;
--
-- //
- // this is a selection prompt, cursor will stay in edit area
- // actually this is for search , search/replace
- //
-Index: hexedit/libmemimage.h
-===================================================================
---- hexedit/libmemimage.h (revision 64)
-+++ hexedit/libmemimage.h (working copy)
-@@ -55,3 +55,4 @@
- );
-
- #endif
-+
-Index: hexedit/libEditor.c
-===================================================================
---- hexedit/libEditor.c (revision 64)
-+++ hexedit/libEditor.c (working copy)
-@@ -20,7 +20,7 @@
-
- --*/
-
--#include "Heditor.h"
-+#include "heditor.h"
-
- HEFI_EDITOR_COLOR_ATTRIBUTES HOriginalColors;
- INTN HOriginalMode;
-@@ -136,7 +136,7 @@
- Status = BS->HandleProtocol (
- In,
- &gEfiSimplePointerProtocolGuid,
-- &HMainEditor.MouseInterface
-+ (VOID**)&HMainEditor.MouseInterface
- );
- if (EFI_ERROR (Status)) {
- //
-@@ -159,7 +159,7 @@
- Status = BS->HandleProtocol (
- HandleBuffer[Index],
- &gEfiSimplePointerProtocolGuid,
-- &HMainEditor.MouseInterface
-+ (VOID**)&HMainEditor.MouseInterface
- );
- if (!EFI_ERROR (Status)) {
- break;
-@@ -182,37 +182,37 @@
- //
- Status = HMainTitleBarInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_TITLE), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
-
- Status = HMainMenuBarInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_MAINMENU), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
-
- Status = HMainStatusBarInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_STATUS), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
-
- Status = HMainInputBarInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_INPUTBAR), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
-
- Status = HBufferImageInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_BUFFERIMAGE), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
-
- Status = HClipBoardInit ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MAINEDITOR_CLIPBOARD), gHexEditHiiHandle);
- return EFI_LOAD_ERROR;
- }
- //
-@@ -259,32 +259,32 @@
- //
- Status = HMainTitleBarCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_TITLEBAR_CLEAN), gHexEditHiiHandle);
- }
-
- Status = HMainMenuBarCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_MENUBAR_CLEAN), gHexEditHiiHandle);
- }
-
- Status = HMainStatusBarCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_STATUSBAR_CLEAN), gHexEditHiiHandle);
- }
-
- Status = HMainInputBarCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_INPUTBAR_CLEAN), gHexEditHiiHandle);
- }
-
- Status = HBufferImageCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_BUFFERIMAGE_CLEAN), gHexEditHiiHandle);
- }
-
- Status = HClipBoardCleanup ();
- if (EFI_ERROR (Status)) {
-- PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), HiiHandle);
-+ PrintToken (STRING_TOKEN (STR_HEXEDIT_LIBEDITOR_CLIPBOARD_CLEAN), gHexEditHiiHandle);
- }
- //
- // restore old mode
-@@ -732,6 +732,9 @@
- case MEM_BUFFER:
- OldSize = HBufferImage.MemImage->Size;
- break;
-+
-+ default:
-+ break;
- }
-
- if (LengthChange == FALSE) {
-Index: hexedit/libfileimage.h
-===================================================================
---- hexedit/libfileimage.h (revision 64)
-+++ hexedit/libfileimage.h (working copy)
-@@ -59,3 +59,4 @@
- );
-
- #endif
-+
-Index: hexedit/libinputbar.h
-===================================================================
---- hexedit/libinputbar.h (revision 64)
-+++ hexedit/libinputbar.h (working copy)
-@@ -44,3 +44,4 @@
- );
-
- #endif
-+
-Index: hexedit/libMenuBar.c
-===================================================================
---- hexedit/libMenuBar.c (revision 64)
-+++ hexedit/libMenuBar.c (working copy)
-@@ -222,7 +222,6 @@
- CHAR16 *NameString;
- CHAR16 *FunctionKeyString;
- UINTN BufferSize;
-- EFI_STATUS Status;
-
- //
- // variable initialization
-@@ -255,9 +254,9 @@
- FunctionKeyString = AllocatePool (BufferSize);
-
- #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
-- Status = Hii->GetString (Hii, HiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
-+ Hii->GetString (Hii, gHexEditHiiHandle, Item->NameToken, FALSE, NULL, &BufferSize, NameString);
- #else
-- Status = LibGetString (HiiHandle, Item->NameToken, NameString, &BufferSize);
-+ LibGetString (gHexEditHiiHandle, Item->NameToken, NameString, &BufferSize);
- #endif
-
- Width = max ((StrLen (NameString) + 6), 18);
-@@ -267,9 +266,9 @@
- }
-
- #if (EFI_SPECIFICATION_VERSION < 0x0002000A)
-- Status = Hii->GetString (Hii, HiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
-+ Hii->GetString (Hii, gHexEditHiiHandle, Item->FunctionKeyToken, FALSE, NULL, &BufferSize, FunctionKeyString);
- #else
-- Status = LibGetString (HiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
-+ LibGetString (gHexEditHiiHandle, Item->FunctionKeyToken, FunctionKeyString, &BufferSize);
- #endif
- if (Index >= 10) {
- PrintAt (Col - 1, Row - 1, L"%E%s%N %H%s%N ", FunctionKeyString, NameString);
-@@ -1138,7 +1137,6 @@
- // the file won't be saved
- //
- return EFI_SUCCESS;
-- break;
-
- case L'c':
- case L'C':
-@@ -1567,7 +1565,6 @@
- --*/
- {
- UINTN Index;
-- HEFI_EDITOR_LINE *Line;
- EFI_LIST_ENTRY *Link;
- UINT8 *Buffer;
- UINTN Count;
-@@ -1592,8 +1589,6 @@
- Link = Link->Flink;
- }
-
-- Line = CR (Link, HEFI_EDITOR_LINE, Link, EFI_EDITOR_LINE_LIST);
--
- Count = HMainEditor.SelectEnd - HMainEditor.SelectStart + 1;
- Buffer = AllocatePool (Count);
- if (Buffer == NULL) {
-Index: hexedit/libeditor.h
-===================================================================
---- hexedit/libeditor.h (revision 64)
-+++ hexedit/libeditor.h (working copy)
-@@ -47,3 +47,4 @@
- );
-
- #endif
-+
-Index: hexedit/hexedit.inf
-===================================================================
---- hexedit/hexedit.inf (revision 64)
-+++ hexedit/hexedit.inf (working copy)
-@@ -25,7 +25,7 @@
- COMPONENT_TYPE = APPLICATION