Remove the auto conversion for the first varstore name to "Setup".

And fix a bug that return status is not set.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 3efda6703a7b223d7cf7f437270be29727840e18..a96ca84272536deb8a17698b594a98510396ef62 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -343,11 +343,11 @@ CallFormCallBack (
     }\r
 \r
     *Data = AllocateZeroPool (*DataSize);\r
-    if (Data == NULL) {\r
+    if (*Data == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    FwFormCallBack->NvRead (\r
+    Status = FwFormCallBack->NvRead (\r
                   FwFormCallBack,  \r
                   BufferStorage->Name,\r
                   &BufferStorage->Guid,\r
@@ -403,7 +403,7 @@ GetUefiVariable (
     }\r
 \r
     *Data = AllocateZeroPool (*DataSize);\r
-    if (Data == NULL) {\r
+    if (*Data == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -611,7 +611,7 @@ ThunkRouteConfig (
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
-\r
+  \r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     if (ConfigAccess->FormCallbackProtocol == NULL ||\r
         ConfigAccess->FormCallbackProtocol->NvWrite == NULL) {\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index f05bf0c3fa405f3cf6c85a47a153b3bd2798c2b8..9e4679cb9ef5c6a81c81bead97d7905dd714eb08 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -665,19 +665,7 @@ GetFormsetDefaultVarstoreId (
 \r
   if (FormSet->DefaultVarStoreId == 0) {\r
     DEBUG ((EFI_D_INFO, "FormSet %g: No Varstore Found\n", &FormSet->Guid));\r
-  } else {\r
-    //    The name of default VARSTORE with a Explicit declaration statement will be updated to L"Setup" to make sure\r
-    //    the Framework HII Setup module will run correctly. Framework HII Setup module always assumed that default\r
-    //    VARSTORE to have L"Setup" as name, Formset GUID as GUID. \r
-\r
-    DEBUG ((EFI_D_INFO, "FormSet %g: Default Varstore ID (0x%x) N(%s) G(%g)\n", &FormSet->Guid, FormSet->DefaultVarStoreId, DefaultStorage->Name, &DefaultStorage->Guid));\r
-\r
-    if (StrCmp (DefaultStorage->Name, FrameworkReservedVarstoreName) != 0) {\r
-      DEBUG ((EFI_D_INFO, "          : Name is updated from %s to %s.\n", DefaultStorage->Name, FrameworkReservedVarstoreName));\r
-      FormSet->OriginalDefaultVarStoreName = DefaultStorage->Name;\r
-      DefaultStorage->Name = AllocateCopyPool (StrSize (FrameworkReservedVarstoreName), FrameworkReservedVarstoreName);\r
-    }\r
-  }\r
+  } \r
   \r
   return;\r
 }\r