Clean up the private GUID definition in module Level.

0. Remove the unused private GUID from module source files.
1. Use gEfiCallerIdGuid replace of the private module GUID.
2. Add the public header files to define HII FormSet and PackageList GUID used in every HII driver.

Signed-off-by: lgao4
Reviewed-by: ydong10 gdong1 tye jfan12 wli12 rsun3 jyao1 ftian



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

4 files changed, 15 insertions, 24 deletions

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
index 9d2e622f13..b8513e9515 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
@@ -18,12 +18,6 @@ CREDENTIAL_TABLE            *mPwdTable      = NULL;
 PWD_PROVIDER_CALLBACK_INFO  *mCallbackInfo  = NULL;

 PASSWORD_CREDENTIAL_INFO    *mPwdInfoHandle = NULL;

 

-//

-// Used for save password credential and form browser.

-// Also used as provider identifier.

-//

-EFI_GUID  mPwdCredentialGuid = PWD_CREDENTIAL_PROVIDER_GUID;

-

 HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {

   {

     {

@@ -34,7 +28,7 @@ HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

-    { 0xeba7fc2b, 0xa465, 0x4d96, { 0x85, 0xa9, 0xd2, 0xf6, 0x64, 0xdf, 0x9b, 0x45 } }   

+    PWD_CREDENTIAL_PROVIDER_GUID

   },

   {

     END_DEVICE_PATH_TYPE,

@@ -180,7 +174,7 @@ ModifyTable (
   //

   Status = gRT->SetVariable (

                   L"PwdCredential",

-                  &mPwdCredentialGuid,

+                  &gPwdCredentialProviderGuid,

                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

                   mPwdTable->Count * sizeof (PASSWORD_INFO),

                   &mPwdTable->UserInfo

@@ -212,7 +206,7 @@ InitCredentialTable (
   Var     = NULL;

   Status  = gRT->GetVariable (

                    L"PwdCredential", 

-                   &mPwdCredentialGuid, 

+                   &gPwdCredentialProviderGuid, 

                    NULL, 

                    &VarSize,

                    Var

@@ -224,7 +218,7 @@ InitCredentialTable (
     }

     Status = gRT->GetVariable (

                     L"PwdCredential", 

-                    &mPwdCredentialGuid, 

+                    &gPwdCredentialProviderGuid, 

                     NULL, 

                     &VarSize,

                     Var

@@ -693,7 +687,7 @@ InitFormBrowser (
   // Publish HII data.

   //

   CallbackInfo->HiiHandle = HiiAddPackages (

-                              &mPwdCredentialGuid,

+                              &gPwdCredentialProviderGuid,

                               CallbackInfo->DriverHandle,

                               PwdCredentialProviderStrings,

                               PwdCredentialProviderVfrBin,

@@ -888,7 +882,7 @@ CredentialForm (
 

   *Hii       = mCallbackInfo->HiiHandle;

   *FormId    = FORMID_GET_PASSWORD_FORM;

-  CopyGuid (FormSetId, &mPwdCredentialGuid);

+  CopyGuid (FormSetId, &gPwdCredentialProviderGuid);

   

   return EFI_SUCCESS;

 }

@@ -1269,8 +1263,8 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD;

     Info->InfoSize    = (UINT32) InfoLen;

     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;

-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);

-    CopyGuid ((EFI_GUID *)(Info + 1), &mPwdCredentialGuid);

+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);

+    CopyGuid ((EFI_GUID *)(Info + 1), &gPwdCredentialProviderGuid);

     

     mPwdInfoHandle->Info[0] = Info;

     mPwdInfoHandle->Count++;

@@ -1287,7 +1281,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;

     Info->InfoSize    = (UINT32) InfoLen;

     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;

-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);

+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);

     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);

     FreePool (ProvNameStr);

 

@@ -1304,7 +1298,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_TYPE_RECORD;

     Info->InfoSize    = (UINT32) InfoLen;

     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;

-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);

+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);

     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassPasswordGuid);

     

     mPwdInfoHandle->Info[2] = Info;

@@ -1322,7 +1316,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;

     Info->InfoSize    = (UINT32) InfoLen;

     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;

-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);

+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);

     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);

     FreePool (ProvNameStr);

     

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
index 9b5e7768ba..c9ef33b8ac 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Uefi.h>

 

 #include <Guid/GlobalVariable.h>

-#include <Guid/MdeModuleHii.h>

 

 #include <Protocol/HiiConfigAccess.h>

 #include <Protocol/UserCredential.h>

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
index ffe0adea20..feeffcc6df 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
@@ -1,7 +1,7 @@
 /** @file

   Data structure used by the Password Credential Provider driver.

     

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PWD_CREDENTIAL_PROVIDER_DATA_H_

 #define _PWD_CREDENTIAL_PROVIDER_DATA_H_

 

-#define PWD_CREDENTIAL_PROVIDER_GUID \

-  { \

-    0x78b9ec8b, 0xc000, 0x46c5, { 0xac, 0x93, 0x24, 0xa0, 0xc1, 0xbb, 0x0, 0xce } \

-  }

+#include <Guid/PwdCredentialProviderHii.h>

 

 //

 // Forms definition

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
index 0ffc24e076..3b32fbb962 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   CryptoPkg/CryptoPkg.dec

+  SecurityPkg/SecurityPkg.dec

 

 [LibraryClasses]

   UefiRuntimeServicesTableLib

@@ -43,8 +44,8 @@
   BaseCryptLib

   

 [Guids]

-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid

   gEfiUserCredentialClassPasswordGuid           ## CONSUMES ## Guid

+  gPwdCredentialProviderGuid                    ## PRODUCES ## Guid

 

 [Protocols]

   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED