X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FUserIdentification%2FUserProfileManagerDxe%2FUserProfileManager.c;h=6e5bd06502140399f023c3c1c5f348c54e6b9978;hp=74c979d58eec49f712ad57248abd44d27cfffa62;hb=639a76d1912f8eb07e26b1a8f2393b682be65f2c;hpb=0c18794ea4289f03fefc7117b56740414cc0536c

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
index 74c979d58e..6e5bd06502 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "UserProfileManager.h"
 
-EFI_GUID                  mUserProfileManagerGuid = USER_PROFILE_MANAGER_GUID;
 EFI_USER_MANAGER_PROTOCOL *mUserManager           = NULL;
 CREDENTIAL_PROVIDER_INFO  *mProviderInfo          = NULL;
 UINT8                     mProviderChoice;
@@ -35,7 +34,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
       }
     },
-    {0xad2e3474, 0x93e6, 0x488b, {0x93, 0x19, 0x64, 0x88, 0xfc, 0x68, 0x1f, 0x16}}
+    USER_PROFILE_MANAGER_GUID
   },
   {
     END_DEVICE_PATH_TYPE,
@@ -95,7 +94,7 @@ InitProviderInfo (
   HandleBuf   = NULL;
   Status = gBS->LocateHandleBuffer (
                   ByProtocol,
-                  &gEfiUserCredentialProtocolGuid,
+                  &gEfiUserCredential2ProtocolGuid,
                   NULL,
                   &HandleCount,
                   &HandleBuf
@@ -112,8 +111,8 @@ InitProviderInfo (
   }
   mProviderInfo = AllocateZeroPool (
                     sizeof (CREDENTIAL_PROVIDER_INFO) - 
-                    sizeof (EFI_USER_CREDENTIAL_PROTOCOL *) +
-                    HandleCount * sizeof (EFI_USER_CREDENTIAL_PROTOCOL *)
+                    sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *) +
+                    HandleCount * sizeof (EFI_USER_CREDENTIAL2_PROTOCOL *)
                     );
   if (mProviderInfo == NULL) {
     FreePool (HandleBuf);
@@ -124,7 +123,7 @@ InitProviderInfo (
   for (Index = 0; Index < HandleCount; Index++) {
     Status = gBS->HandleProtocol (
                     HandleBuf[Index],
-                    &gEfiUserCredentialProtocolGuid,
+                    &gEfiUserCredential2ProtocolGuid,
                     (VOID **) &mProviderInfo->Provider[Index]
                     );
     if (EFI_ERROR (Status)) {
@@ -293,7 +292,7 @@ UserProfileManagerCallback (
   
       HiiUpdateForm (
         mCallbackInfo->HiiHandle,               // HII handle
-        &mUserProfileManagerGuid,               // Formset GUID
+        &gUserProfileManagerGuid,               // Formset GUID
         FORMID_USER_MANAGE,                     // Form ID
         StartOpCodeHandle,                      // Label for where to insert opcodes
         EndOpCodeHandle                         // Replace data
@@ -422,7 +421,6 @@ UserProfileManagerCallback (
           //
           case KEY_MODIFY_PROV:         
             mProviderChoice = Value->u8;
-            *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
             break;
 
           //
@@ -430,7 +428,6 @@ UserProfileManagerCallback (
           //
           case KEY_MODIFY_CONN:
             mConncetLogical = Value->u8;
-            *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
             break;
 
           //
@@ -445,7 +442,7 @@ UserProfileManagerCallback (
           //
           case KEY_IP_RETURN_UIF:
             SaveIdentityPolicy ();
-            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
             break;
 
           default:
@@ -473,7 +470,6 @@ UserProfileManagerCallback (
           //
           case KEY_MODIFY_RIGHT:
             mAccessInfo.AccessRight = Value->u8;
-            *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
             break;
 
           //
@@ -481,7 +477,6 @@ UserProfileManagerCallback (
           //
           case KEY_MODIFY_SETUP:
             mAccessInfo.AccessSetup= Value->u8;
-            *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
             break;
 
           //
@@ -489,7 +484,6 @@ UserProfileManagerCallback (
           //
           case KEY_MODIFY_BOOT:
             mAccessInfo.AccessBootOrder = Value->u32;
-            *ActionRequest  = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
             break;
 
           //
@@ -551,7 +545,7 @@ UserProfileManagerCallback (
           //
           case KEY_AP_RETURN_UIF:
             SaveAccessPolicy ();
-            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
             break;
 
           default:
@@ -791,7 +785,7 @@ UserProfileManagerInit (
   // Publish HII data.
   //
   CallbackInfo->HiiHandle = HiiAddPackages (
-                              &mUserProfileManagerGuid,
+                              &gUserProfileManagerGuid,
                               CallbackInfo->DriverHandle,
                               UserProfileManagerStrings,
                               UserProfileManagerVfrBin,