HiiLibGetCurrentLanguage returns the current UEFI variable "PlatformLang" (if this variable does not exist, a default value is returned). This function is called by HiiDatabase itself. Now, HiiLibGetCurrentLanguage is in HiiLib. Because of this, we can't add location of Hii protoocol in the library constructor of HiiLib. This cause Hii Database driver never get loaded (circular dependency).

By moving HiiLibGetCurrentLanguage to UefiLib, library constructor (depex) can be added back to HiiLib to make sure the execution order is correct.

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

MdeModulePkg/Universal/BdsDxe/FrontPage.c

@@ -332,7 +332,7 @@ InitializeFrontPage (
   //
   // Get current language setting
   //
-  HiiLibGetCurrentLanguage (CurrentLang);
+  GetCurrentLanguage (CurrentLang);
 
   //
   // Allocate space for creation of UpdateData Buffer

MdeModulePkg/Universal/HiiDatabaseDxe/Font.c

@@ -2086,7 +2086,7 @@ HiiStringIdToImage (
   if (Language != NULL) {
     AsciiStrCpy (CurrentLang, (CHAR8 *) Language);
   } else {
-    HiiLibGetCurrentLanguage (CurrentLang);
+    GetCurrentLanguage (CurrentLang);
   }
 
   //

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h

@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/IfrSupportLib.h>
-#include <Library/HiiLib.h>
+#include <Library/UefiLib.h>
 #include <Library/PcdLib.h>
 
 #define HII_DATABASE_NOTIFY_GUID \

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

@@ -58,7 +58,7 @@
   BaseMemoryLib
   DebugLib
   IfrSupportLib
-  HiiLib
+  UefiLib
 
 [Protocols]
   gEfiConsoleControlProtocolGuid