Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
2010-11-26 01:54:49 +00:00
parent 68bb5ce77e
commit 3e99020dbf
183 changed files with 15250 additions and 2636 deletions
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
@@ -555,20 +555,37 @@ IfrLibNewString (
  if (Languages == NULL) {
    return EFI_NOT_FOUND;
  }
+  
+  if (StringId == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  *StringId = 0;

  LangStrings = Languages;
  while (*LangStrings != 0) {
    GetNextLanguage (&LangStrings, Lang);

-    Status = gIfrLibHiiString->NewString (
-                                 gIfrLibHiiString,
-                                 PackageList,
-                                 StringId,
-                                 Lang,
-                                 NULL,
-                                 String,
-                                 NULL
-                                 );
+    if (*StringId == 0) {
+      Status = gIfrLibHiiString->NewString (
+                                   gIfrLibHiiString,
+                                   PackageList,
+                                   StringId,
+                                   Lang,
+                                   NULL,
+                                   String,
+                                   NULL
+                                   );
+    } else {
+      Status = gIfrLibHiiString->SetString (
+                                   gIfrLibHiiString,
+                                   PackageList,
+                                   *StringId,
+                                   Lang,
+                                   String,
+                                   NULL
+                                   );
+    }
+
    if (EFI_ERROR (Status)) {
      break;
    }