Add in code to support the deletion of opcode from a form.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5153 6f19259b-4bc3-4df7-8a09-765794883524

EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c

@@ -435,7 +435,6 @@ Returns:
     }
   }
 
-  if (Data->DataCount != 0) {
   if (HandleMapEntry->IsPackageListWithOnlyStringPackages) {
     UefiHiiHandle = TagGuidToUefiIfrHiiHandle (Private, &HandleMapEntry->TagGuid);
   
@@ -448,6 +447,9 @@ Returns:
 
   UefiHiiUpdateData = NULL;
 
+  if (AddData) {
+    if (Data->DataCount != 0) {
+      
       Status = ThunkFrameworkUpdateDataToUefiUpdateData (Data, AddData, &UefiHiiUpdateData);
       ASSERT_EFI_ERROR (Status);
 
@@ -457,11 +459,27 @@ Returns:
       Status = IfrLibUpdateForm (UefiHiiHandle, &FormsetGuid, FormId, Label, AddData, UefiHiiUpdateData);
       ASSERT_EFI_ERROR (Status);
       
+    } else {
+      ASSERT (FALSE);
+      return EFI_INVALID_PARAMETER;
+    }
+    
+  } else {
+    Status = ThunkLocateFormId (UefiHiiHandle, Label, &FormsetGuid, &FormId);
+    ASSERT_EFI_ERROR (Status);
+
+    //
+    // Delete Opcode starting from Labe in FormId found
+    //
+    
+    Status = IfrLibUpdateForm (UefiHiiHandle, &FormsetGuid, FormId, Label, FALSE, NULL);
+    ASSERT_EFI_ERROR (Status);
+  }
+
   if (UefiHiiUpdateData != NULL) {
     SafeFreePool (UefiHiiUpdateData->Data);
     SafeFreePool (UefiHiiUpdateData);
   }
-  }
 
   return Status;
 }

EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c

@@ -595,7 +595,7 @@ F2UCreateNumericOpCode (
   }
 
   //
-  // We need to create a default 
+  // We need to create a default value.
   //
   if (FwOpcode->Default != 0) {
     ZeroMem (&UOpcodeDefault, sizeof (UOpcodeDefault));