Update for NetworkPkg.

[mirror_edk2.git] / SecurityPkg / UserIdentification / UserProfileManagerDxe / UserProfileManager.c

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