From f01b91ae42edcf979a52ba08b515d3b4525b55fa Mon Sep 17 00:00:00 2001 From: ydong10 Date: Thu, 31 May 2012 08:35:48 +0000 Subject: [PATCH] Fixed build failed. Signed-off-by: Eric Dong git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13406 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c | 2 +- .../Library/GenericBdsLib/BdsBoot.c | 4 ++-- .../Universal/BdsDxe/DeviceMngr/DeviceManager.c | 2 +- IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c | 4 ++-- MdeModulePkg/Library/UefiHiiLib/HiiString.c | 2 +- MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c | 6 +++--- MdeModulePkg/Universal/HiiDatabaseDxe/Font.c | 2 +- .../Universal/Network/Ip4ConfigDxe/NicIp4Variable.c | 4 ++-- .../PlatformDriOverrideDxe/PlatDriOverrideDxe.c | 2 +- NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 2 +- NetworkPkg/IScsiDxe/IScsiMisc.c | 2 +- .../MiscNumberOfInstallableLanguagesFunction.c | 2 +- PerformancePkg/Dp_App/DpUtilities.c | 2 +- .../DxeDeferImageLoadLib/DxeDeferImageLoadLib.c | 2 +- .../DxeImageVerificationLib/DxeImageVerificationLib.c | 8 ++++---- .../UserProfileManagerDxe/ModifyAccessPolicy.c | 4 ++-- .../SecureBootConfigDxe/SecureBootConfigImpl.c | 10 +++++----- .../MiscNumberOfInstallableLanguagesFunction.c | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c index 3b14c75df5..f246c08b5f 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c @@ -349,7 +349,7 @@ HiiThunkGetString ( // // Get the current platform language setting // - GetEfiGlobalVariable2 (L"PlatformLang", &PlatformLanguage, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL); // // Get the best matching language from SupportedLanguages diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c index 91dc6def4e..9a8b687529 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c @@ -1513,8 +1513,8 @@ BdsLibEnumerateAllBootOption ( // device from the boot order variable // if (mEnumBootDevice) { - GetVariable2 (LAST_ENUM_LANGUAGE_VARIABLE_NAME, &gLastEnumLangGuid, &LastLang, NULL); - GetEfiGlobalVariable2 (L"PlatformLang", &PlatLang, NULL); + GetVariable2 (LAST_ENUM_LANGUAGE_VARIABLE_NAME, &gLastEnumLangGuid, (VOID**)&LastLang, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatLang, NULL); ASSERT (PlatLang != NULL); if ((LastLang != NULL) && (AsciiStrCmp (LastLang, PlatLang) == 0)) { Status = BdsLibBuildOptionFromVar (BdsBootOptionList, L"BootOrder"); diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 0dddba7077..d9ec1f2f1b 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -2167,7 +2167,7 @@ DriverHealthSelectBestLanguage ( CHAR8 *LanguageVariable; CHAR8 *BestLanguage; - GetEfiGlobalVariable2 (Iso639Language ? L"Lang" : L"PlatformLang", &LanguageVariable, NULL); + GetEfiGlobalVariable2 (Iso639Language ? L"Lang" : L"PlatformLang", (VOID**)&LanguageVariable, NULL); BestLanguage = GetBestLanguage( SupportedLanguages, diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c index 30e43e81c7..7856edcb32 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c @@ -232,7 +232,7 @@ FrontPageCallback ( Index++; } - GetEfiGlobalVariable2 (L"PlatformLangCodes", &PlatformSupportedLanguages, NULL); + GetEfiGlobalVariable2 (L"PlatformLangCodes", (VOID**)&PlatformSupportedLanguages, NULL); if (PlatformSupportedLanguages == NULL) { PlatformSupportedLanguages = AllocateCopyPool ( AsciiStrSize ((CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)), @@ -430,7 +430,7 @@ InitializeFrontPage ( Lang = AllocatePool (AsciiStrSize (LanguageString)); ASSERT (Lang != NULL); - GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLang, NULL); // // Select the best language in LanguageString as the default one. // diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c index 4cc7b802c6..bfca2062c2 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c @@ -250,7 +250,7 @@ HiiGetString ( // // Get the current platform language setting // - GetEfiGlobalVariable2 (L"PlatformLang", &PlatformLanguage, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL); // // If Languag is NULL, then set it to an empty string, so it will be diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c index 008e746b33..14f49ee755 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c @@ -358,7 +358,7 @@ IsTerminalInConsoleVariable ( // // Get global variable and its size according to the name given. // - GetEfiGlobalVariable2 (VariableName, &Variable, NULL); + GetEfiGlobalVariable2 (VariableName, (VOID**)&Variable, NULL); if (Variable == NULL) { return FALSE; } @@ -1431,7 +1431,7 @@ TerminalUpdateConsoleDevVariable ( // // Get global variable and its size according to the name given. // - GetEfiGlobalVariable2 (VariableName, &Variable, NULL); + GetEfiGlobalVariable2 (VariableName, (VOID**)&Variable, NULL); if (Variable == NULL) { return; } @@ -1500,7 +1500,7 @@ TerminalRemoveConsoleDevVariable ( // // Get global variable and its size according to the name given. // - GetEfiGlobalVariable2 (VariableName, &Variable, NULL); + GetEfiGlobalVariable2 (VariableName, (VOID**)&Variable, NULL); if (Variable == NULL) { return ; } diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c index 93857bd11b..f6f784e733 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c @@ -2368,7 +2368,7 @@ HiiStringIdToImage ( if (Language == NULL) { Language = ""; } - GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLanguage, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLanguage, NULL); BestLanguage = GetBestLanguage ( SupportedLanguages, FALSE, diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c index 27ee99219b..f0e03af900 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c @@ -91,7 +91,7 @@ Ip4ConfigReadVariable ( { NIC_IP4_CONFIG_INFO *NicConfig; - GetVariable2 (Instance->MacString, &gEfiNicIp4ConfigVariableGuid, &NicConfig, NULL); + GetVariable2 (Instance->MacString, &gEfiNicIp4ConfigVariableGuid, (VOID**)&NicConfig, NULL); if (NicConfig != NULL) { Ip4ConfigFixRouteTablePointer (&NicConfig->Ip4Info); } @@ -255,7 +255,7 @@ Check: continue; } - GetVariable2 (VariableName, &gEfiNicIp4ConfigVariableGuid, &NicConfig, NULL); + GetVariable2 (VariableName, &gEfiNicIp4ConfigVariableGuid, (VOID**)&NicConfig, NULL); if (NicConfig == NULL) { break; } diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c index 1c2b02f5a9..9c0064df29 100644 --- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c +++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c @@ -185,7 +185,7 @@ GetComponentNameWorker ( // // Find the best matching language. // - GetEfiGlobalVariable2 (VariableName, &Language, NULL); + GetEfiGlobalVariable2 (VariableName, (VOID**)&Language, NULL); BestLanguage = GetBestLanguage ( ComponentName->SupportedLanguages, (BOOLEAN) (ProtocolGuid == &gEfiComponentNameProtocolGuid), diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c index 479eb143d8..6bf96a1996 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c @@ -41,7 +41,7 @@ Dhcp6GenerateClientId ( // Attempt to get client Id from variable to keep it constant. // See details in section-9 of rfc-3315. // - GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, &Duid, NULL); + GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, (VOID**)&Duid, NULL); if (Duid != NULL) { return Duid; } diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c index 46e97a9fcd..971011eac5 100644 --- a/NetworkPkg/IScsiDxe/IScsiMisc.c +++ b/NetworkPkg/IScsiDxe/IScsiMisc.c @@ -1079,7 +1079,7 @@ IScsiGetConfigData ( GetVariable2 ( mPrivate->PortString, &gEfiIScsiInitiatorNameProtocolGuid, - &AttemptConfigData, + (VOID**)&AttemptConfigData, NULL ); diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c index 1968d07ec2..87aa6758e9 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c @@ -43,7 +43,7 @@ CurrentLanguageMatch ( return; } - GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLang, NULL); DefaultLang = (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang); BestLanguage = GetBestLanguage ( Languages, diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c index f44745fd1d..5e160708b8 100644 --- a/PerformancePkg/Dp_App/DpUtilities.c +++ b/PerformancePkg/Dp_App/DpUtilities.c @@ -270,7 +270,7 @@ GetNameFromHandle ( // // Get the current platform language setting // - GetEfiGlobalVariable2 (L"PlatformLang", &PlatformLanguage, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&PlatformLanguage, NULL); Status = ComponentName2->GetDriverName ( ComponentName2, PlatformLanguage != NULL ? PlatformLanguage : "en-US", diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c index b5b51b4ed2..84b8cf7884 100644 --- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c +++ b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c @@ -532,7 +532,7 @@ IsBootOption ( // Try to find the DevicePath in BootOption // UnicodeSPrint (StrTemp, sizeof (StrTemp), L"Boot%04x", Index); - GetEfiGlobalVariable2 (StrTemp, &OptionBuffer, NULL); + GetEfiGlobalVariable2 (StrTemp, (VOID**)&OptionBuffer, NULL); if (OptionBuffer == NULL) { continue; } diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c index ec18a1b523..79d2261251 100644 --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c @@ -1065,7 +1065,7 @@ VerifyCertUefiGuid ( // // Get KEK database variable. // - GetEfiGlobalVariable2 (EFI_KEY_EXCHANGE_KEY_NAME, &KekList, NULL); + GetEfiGlobalVariable2 (EFI_KEY_EXCHANGE_KEY_NAME, (VOID**)&KekList, NULL); if (KekList == NULL) { return EFI_SECURITY_VIOLATION; } @@ -1260,7 +1260,7 @@ DxeImageVerificationHandler ( return EFI_ACCESS_DENIED; } - GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL); + GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL); // // Skip verification if SecureBootEnable variable doesn't exist. // @@ -1278,7 +1278,7 @@ DxeImageVerificationHandler ( FreePool (SecureBootEnable); - GetEfiGlobalVariable2 (EFI_SETUP_MODE_NAME, &SetupMode, NULL); + GetEfiGlobalVariable2 (EFI_SETUP_MODE_NAME, (VOID**)&SetupMode, NULL); // // SetupMode doesn't exist means no AuthVar driver is dispatched, @@ -1544,7 +1544,7 @@ VariableWriteCallBack ( // If this library is built-in, it means firmware has capability to perform // driver signing verification. // - GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, &SecureBootModePtr, NULL); + GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, (VOID**)&SecureBootModePtr, NULL); if (SecureBootModePtr == NULL) { SecureBootMode = SECURE_BOOT_MODE_DISABLE; // diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c index 8585c72712..97bb077e2e 100644 --- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c +++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c @@ -410,7 +410,7 @@ DisplayLoadPermit( // Get driver device path. // UnicodeSPrint (VarName, sizeof (VarName), L"Driver%04x", Order[Index]); - GetEfiGlobalVariable2 (VarName, &Var, NULL); + GetEfiGlobalVariable2 (VarName, (VOID**)&Var, NULL); if (Var == NULL) { continue; } @@ -655,7 +655,7 @@ AddToForbidLoad ( // Get loadable driver device path. // UnicodeSPrint (VarName, sizeof (VarName), L"Driver%04x", DriverIndex); - GetEfiGlobalVariable2 (VarName, &Var, NULL); + GetEfiGlobalVariable2 (VarName, (VOID**)&Var, NULL); if (Var == NULL) { return; } diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c index 0dc9c2b22d..904a210338 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c @@ -2064,7 +2064,7 @@ SecureBootExtractConfigFromVariable ( // // Get the SecureBootEnable Variable // - GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL); + GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL); // // If the SecureBootEnable Variable doesn't exist, hide the SecureBoot Enable/Disable @@ -2088,7 +2088,7 @@ SecureBootExtractConfigFromVariable ( // // If there is no PK then the Delete Pk button will be gray. // - GetVariable2 (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid, &SetupMode, NULL); + GetVariable2 (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid, (VOID**)&SetupMode, NULL); if (SetupMode == NULL || (*SetupMode) == 1) { ConfigData->HasPk = FALSE; } else { @@ -2098,7 +2098,7 @@ SecureBootExtractConfigFromVariable ( // // Get the SecureBootMode from CustomMode variable. // - GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, &SecureBootMode, NULL); + GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, (VOID**)&SecureBootMode, NULL); if (SecureBootMode == NULL) { ConfigData->SecureBootMode = STANDARD_SECURE_BOOT_MODE; } else { @@ -2329,7 +2329,7 @@ SecureBootCallback ( switch (QuestionId) { case KEY_SECURE_BOOT_ENABLE: - GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, &SecureBootEnable, NULL); + GetVariable2 (EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, (VOID**)&SecureBootEnable, NULL); if (NULL != SecureBootEnable) { if (EFI_ERROR (SaveSecureBootVariable (Value->u8))) { CreatePopUp ( @@ -2517,7 +2517,7 @@ SecureBootCallback ( break; case KEY_SECURE_BOOT_MODE: - GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, &SecureBootEnable, NULL); + GetVariable2 (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid, (VOID**)&SecureBootEnable, NULL); if (NULL != SecureBootEnable) { Status = gRT->SetVariable ( EFI_CUSTOM_MODE_NAME, diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c index 600f2ee9ae..6eff73e450 100644 --- a/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c +++ b/UnixPkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesFunction.c @@ -45,7 +45,7 @@ CurrentLanguageMatch ( return; } - GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL); + GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLang, NULL); DefaultLang = (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang); BestLanguage = GetBestLanguage ( Languages,