HiiLibGetCurrentLanguage returns the current UEFI variable "PlatformLang" (if this...

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

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 3eb4a53ff1ad9cf776df3de966795c363a2137cb..570dcd8754e4086adef48dfa4a04a8e77836a42f 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -332,7 +332,7 @@ InitializeFrontPage (
   //\r
   // Get current language setting\r
   //\r
-  HiiLibGetCurrentLanguage (CurrentLang);\r
+  GetCurrentLanguage (CurrentLang);\r
 \r
   //\r
   // Allocate space for creation of UpdateData Buffer\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 23b15475dac488582fb0d0c983307495fc01517b..e3444148d9a5c80c3d10fd0b6b971c15b819fd46 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2086,7 +2086,7 @@ HiiStringIdToImage (
   if (Language != NULL) {\r
     AsciiStrCpy (CurrentLang, (CHAR8 *) Language);\r
   } else {\r
-    HiiLibGetCurrentLanguage (CurrentLang);\r
+    GetCurrentLanguage (CurrentLang);\r
   }\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 4b53e8762dfdcef6cfc48451e106f01b8de68948..bbddd0369d3116d978ef120255d9dd0d5af1cc11 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/IfrSupportLib.h>\r
-#include <Library/HiiLib.h>\r
+#include <Library/UefiLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
 #define HII_DATABASE_NOTIFY_GUID \\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 29cd5b4cc79403f242fe4112d03a84bdafd49070..d64a3f22cb3cd63aa9569ff51b869c51695057cb 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -58,7 +58,7 @@
   BaseMemoryLib\r
   DebugLib\r
   IfrSupportLib\r
-  HiiLib\r
+  UefiLib\r
 \r
 [Protocols]\r
   gEfiConsoleControlProtocolGuid                \r