fix the HiiStrIdToImage sct failure, which is caused by wrong algorithm of finding...

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

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 4bb72c81d417cc2cf094b2100d32965049a03e02..2fd355029d33f6c9067e651a8da9d8f5c5e41c50 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -1766,6 +1766,7 @@ HiiStringToImage (
         // It forces a line break that ends this row.\r
         //\r
         Index++;\r
+        LineBreak = TRUE;\r
         break;\r
       }\r
 \r
@@ -1842,6 +1843,12 @@ HiiStringToImage (
             Index = Index1 + 1;\r
             break;\r
           }\r
+          //\r
+          // If don't find a line break opportunity from EndIndex to StartIndex,\r
+          // then jump out.\r
+          //\r
+          if (Index1 == RowInfo[RowIndex].StartIndex)\r
+            break;\r
         }\r
       }\r
       //\r
@@ -1968,9 +1975,9 @@ HiiStringToImage (
     Index++;\r
     RowIndex++;\r
 \r
-    if (Flags & EFI_HII_IGNORE_LINE_BREAK) {\r
+    if (!LineBreak) {\r
       //\r
-      // If setting IGNORE_LINE_BREAK attribute, only render one line to image\r
+      // If there is not a mandatory line break or line break opportunity, only render one line to image\r
       //\r
       break;\r
     }\r