MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / VariableExLib.c

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
index dc78f68fa9e05e9580ab043a0f58d866c3428666..e865a089d172ce805303666c572bce4bc0436d4a 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
@@ -56,8 +56,8 @@ VariableExLibFindVariable (
     return Status;\r
   }\r
 \r
-  AuthVariableInfo->DataSize        = DataSizeOfVariable (Variable.CurrPtr);\r
-  AuthVariableInfo->Data            = GetVariableDataPtr (Variable.CurrPtr);\r
+  AuthVariableInfo->DataSize        = DataSizeOfVariable (Variable.CurrPtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
+  AuthVariableInfo->Data            = GetVariableDataPtr (Variable.CurrPtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
   AuthVariableInfo->Attributes      = Variable.CurrPtr->Attributes;\r
   if (mVariableModuleGlobal->VariableGlobal.AuthFormat) {\r
     AuthVariable = (AUTHENTICATED_VARIABLE_HEADER *) Variable.CurrPtr;\r
@@ -98,11 +98,18 @@ VariableExLibFindNextVariable (
   EFI_STATUS                    Status;\r
   VARIABLE_HEADER               *VariablePtr;\r
   AUTHENTICATED_VARIABLE_HEADER *AuthVariablePtr;\r
+  VARIABLE_STORE_HEADER         *VariableStoreHeader[VariableStoreTypeMax];\r
+\r
+  VariableStoreHeader[VariableStoreTypeVolatile] = (VARIABLE_STORE_HEADER *) (UINTN) mVariableModuleGlobal->VariableGlobal.VolatileVariableBase;\r
+  VariableStoreHeader[VariableStoreTypeHob]      = (VARIABLE_STORE_HEADER *) (UINTN) mVariableModuleGlobal->VariableGlobal.HobVariableBase;\r
+  VariableStoreHeader[VariableStoreTypeNv]       = mNvVariableCache;\r
 \r
   Status = VariableServiceGetNextVariableInternal (\r
              VariableName,\r
              VendorGuid,\r
-             &VariablePtr\r
+             VariableStoreHeader,\r
+             &VariablePtr,\r
+             mVariableModuleGlobal->VariableGlobal.AuthFormat\r
              );\r
   if (EFI_ERROR (Status)) {\r
     AuthVariableInfo->VariableName = NULL;\r
@@ -116,10 +123,10 @@ VariableExLibFindNextVariable (
     return Status;\r
   }\r
 \r
-  AuthVariableInfo->VariableName    = GetVariableNamePtr (VariablePtr);\r
-  AuthVariableInfo->VendorGuid      = GetVendorGuidPtr (VariablePtr);\r
-  AuthVariableInfo->DataSize        = DataSizeOfVariable (VariablePtr);\r
-  AuthVariableInfo->Data            = GetVariableDataPtr (VariablePtr);\r
+  AuthVariableInfo->VariableName    = GetVariableNamePtr (VariablePtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
+  AuthVariableInfo->VendorGuid      = GetVendorGuidPtr (VariablePtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
+  AuthVariableInfo->DataSize        = DataSizeOfVariable (VariablePtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
+  AuthVariableInfo->Data            = GetVariableDataPtr (VariablePtr, mVariableModuleGlobal->VariableGlobal.AuthFormat);\r
   AuthVariableInfo->Attributes      = VariablePtr->Attributes;\r
   if (mVariableModuleGlobal->VariableGlobal.AuthFormat) {\r
     AuthVariablePtr = (AUTHENTICATED_VARIABLE_HEADER *) VariablePtr;\r