For UNI file, some String may not be defined for a language. This has been true for...

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
index 85124c0316132899acd01a27d5b85d1ec0f00dd6..6907718b33c9768a190ad2b8b3140ca63a2106cf 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
@@ -133,6 +133,7 @@ HiiThunkNewStringForAllStringPackages (
     *Reference = StringId1;\r
     Status = EFI_SUCCESS;\r
   } else {\r
+    ASSERT (FALSE);\r
     Status = EFI_NOT_FOUND;\r
   }\r
   \r
@@ -173,9 +174,14 @@ Returns:
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = HiiThunkNewStringForAllStringPackages (Private, &TagGuid, Language, Reference, NewString);\r
-  ASSERT_EFI_ERROR (Status);  \r
+  //\r
+  // For UNI file, some String may not be defined for a language. This has been true for a lot of platform code.\r
+  // For this case, EFI_NOT_FOUND will be returned. To allow the old code to be run without porting, we don't assert \r
+  // on EFI_NOT_FOUND. The missing String will be declared if user select differnt languages for the platform.\r
+  //\r
+  ASSERT_EFI_ERROR (EFI_ERROR (Status) && Status != EFI_NOT_FOUND);  \r
 \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 EFI_STATUS\r