Clean up the private GUID definition in module Level.

[mirror_edk2.git] / SecurityPkg / UserIdentification / PwdCredentialProviderDxe / PwdCredentialProvider.c

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
index 9d2e622f1338effee846aafc66faefe7c914fa22..b8513e9515dbeb1085b28076960316528b92833f 100644 (file)
--- 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;\r
 PASSWORD_CREDENTIAL_INFO    *mPwdInfoHandle = NULL;\r
 \r
-//\r
-// Used for save password credential and form browser.\r
-// Also used as provider identifier.\r
-//\r
-EFI_GUID  mPwdCredentialGuid = PWD_CREDENTIAL_PROVIDER_GUID;\r
-\r
 HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {\r
   {\r
     {\r
@@ -34,7 +28,7 @@ HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    { 0xeba7fc2b, 0xa465, 0x4d96, { 0x85, 0xa9, 0xd2, 0xf6, 0x64, 0xdf, 0x9b, 0x45 } }   \r
+    PWD_CREDENTIAL_PROVIDER_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -180,7 +174,7 @@ ModifyTable (
   //\r
   Status = gRT->SetVariable (\r
                   L"PwdCredential",\r
-                  &mPwdCredentialGuid,\r
+                  &gPwdCredentialProviderGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   mPwdTable->Count * sizeof (PASSWORD_INFO),\r
                   &mPwdTable->UserInfo\r
@@ -212,7 +206,7 @@ InitCredentialTable (
   Var     = NULL;\r
   Status  = gRT->GetVariable (\r
                    L"PwdCredential", \r
-                   &mPwdCredentialGuid, \r
+                   &gPwdCredentialProviderGuid, \r
                    NULL, \r
                    &VarSize,\r
                    Var\r
@@ -224,7 +218,7 @@ InitCredentialTable (
     }\r
     Status = gRT->GetVariable (\r
                     L"PwdCredential", \r
-                    &mPwdCredentialGuid, \r
+                    &gPwdCredentialProviderGuid, \r
                     NULL, \r
                     &VarSize,\r
                     Var\r
@@ -693,7 +687,7 @@ InitFormBrowser (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mPwdCredentialGuid,\r
+                              &gPwdCredentialProviderGuid,\r
                               CallbackInfo->DriverHandle,\r
                               PwdCredentialProviderStrings,\r
                               PwdCredentialProviderVfrBin,\r
@@ -888,7 +882,7 @@ CredentialForm (
 \r
   *Hii       = mCallbackInfo->HiiHandle;\r
   *FormId    = FORMID_GET_PASSWORD_FORM;\r
-  CopyGuid (FormSetId, &mPwdCredentialGuid);\r
+  CopyGuid (FormSetId, &gPwdCredentialProviderGuid);\r
   \r
   return EFI_SUCCESS;\r
 }\r
@@ -1269,8 +1263,8 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);\r
-    CopyGuid ((EFI_GUID *)(Info + 1), &mPwdCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);\r
+    CopyGuid ((EFI_GUID *)(Info + 1), &gPwdCredentialProviderGuid);\r
     \r
     mPwdInfoHandle->Info[0] = Info;\r
     mPwdInfoHandle->Count++;\r
@@ -1287,7 +1281,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
 \r
@@ -1304,7 +1298,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_TYPE_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);\r
     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassPasswordGuid);\r
     \r
     mPwdInfoHandle->Info[2] = Info;\r
@@ -1322,7 +1316,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mPwdCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gPwdCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
     \r