update Bcfg to correctly remove by option index not variable name and add driver...

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / HexEdit / MainHexEditor.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
index ccd73a98825e4c4a9a477384db1a041a0abead7d..83b31992d2dab7ec06e3a96d8e2adb53f2cca2eb 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/MainHexEditor.c
@@ -1704,12 +1704,28 @@ HMainEditorRefresh (
   NameChange = FALSE;\r
   ReadChange = FALSE;\r
 \r
-  if ( HMainEditor.BufferImage->FileImage != NULL && \r
-       HMainEditor.BufferImage->FileImage->FileName != NULL && \r
-       HBufferImageBackupVar.FileImage != NULL && \r
-       HBufferImageBackupVar.FileImage->FileName != NULL && \r
-       StrCmp (HMainEditor.BufferImage->FileImage->FileName, HBufferImageBackupVar.FileImage->FileName) != 0 ) {\r
-    NameChange = TRUE;\r
+  if (HMainEditor.BufferImage->BufferType == FileTypeDiskBuffer) {\r
+    if (HMainEditor.BufferImage->DiskImage != NULL &&\r
+        HBufferImageBackupVar.DiskImage != NULL &&\r
+        (HMainEditor.BufferImage->DiskImage->Offset != HBufferImageBackupVar.DiskImage->Offset || \r
+           HMainEditor.BufferImage->DiskImage->Size != HBufferImageBackupVar.DiskImage->Size) ){\r
+      NameChange = TRUE;\r
+    }\r
+  } else if (HMainEditor.BufferImage->BufferType == FileTypeMemBuffer) {\r
+    if (HMainEditor.BufferImage->MemImage != NULL &&\r
+        HBufferImageBackupVar.MemImage != NULL &&\r
+        (HMainEditor.BufferImage->MemImage->Offset != HBufferImageBackupVar.MemImage->Offset || \r
+           HMainEditor.BufferImage->MemImage->Size != HBufferImageBackupVar.MemImage->Size) ){\r
+      NameChange = TRUE;\r
+    }\r
+  } else if (HMainEditor.BufferImage->BufferType == FileTypeFileBuffer) {\r
+    if ( HMainEditor.BufferImage->FileImage != NULL && \r
+         HMainEditor.BufferImage->FileImage->FileName != NULL && \r
+         HBufferImageBackupVar.FileImage != NULL && \r
+         HBufferImageBackupVar.FileImage->FileName != NULL && \r
+         StrCmp (HMainEditor.BufferImage->FileImage->FileName, HBufferImageBackupVar.FileImage->FileName) != 0 ) {\r
+      NameChange = TRUE;\r
+    }\r
   }\r
   if ( HMainEditor.BufferImage->FileImage != NULL && \r
        HBufferImageBackupVar.FileImage != NULL && \r
@@ -1753,9 +1769,9 @@ HMainEditorRefresh (
       HEditorFirst,\r
       HMainEditor.ScreenSize.Row,\r
       HMainEditor.ScreenSize.Column,\r
-      0,\r
-      0,\r
-      TRUE\r
+      (UINTN)(-1),\r
+      (UINTN)(-1),\r
+      FALSE\r
       );\r
     HBufferImageRefresh ();\r
   }\r