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

6 files changed, 17 insertions, 24 deletions

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
index d0295b731b..fffc93beab 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
@@ -1,7 +1,7 @@
 /** @file

   The functions to delete a user profile.

     

-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 

@@ -303,7 +303,7 @@ SelectUserToDelete (
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle, // HII handle

-    &mUserProfileManagerGuid, // Formset GUID

+    &gUserProfileManagerGuid, // Formset GUID

     FORMID_DEL_USER,          // Form ID

     StartOpCodeHandle,        // Label for where to insert opcodes

     EndOpCodeHandle           // Replace data

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
index c41fe973bd..83b391c546 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,

@@ -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

@@ -786,7 +785,7 @@ UserProfileManagerInit (
   // Publish HII data.

   //

   CallbackInfo->HiiHandle = HiiAddPackages (

-                              &mUserProfileManagerGuid,

+                              &gUserProfileManagerGuid,

                               CallbackInfo->DriverHandle,

                               UserProfileManagerStrings,

                               UserProfileManagerVfrBin,

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
index b7098dc7b6..bff9539602 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
@@ -1,7 +1,7 @@
 /** @file

   The header file for user profile manager 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 

@@ -113,11 +113,6 @@ extern UINT8                               UserProfileManagerVfrBin[];
 extern UINT8                               UserProfileManagerStrings[];

 

 //

-// Guid used in the form browse.

-//

-extern EFI_GUID                            mUserProfileManagerGuid;

-

-//

 // The user manager protocol, used in several function.

 //

 extern EFI_USER_MANAGER_PROTOCOL           *mUserManager;

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
index 58b6cb8c1e..4548c758b5 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
@@ -1,7 +1,7 @@
 /** @file

   The form data for user profile manager 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 __USER_PROFILE_MANAGER_DATA_H__

 #define __USER_PROFILE_MANAGER_DATA_H__

 

-#define USER_PROFILE_MANAGER_GUID \

-  { \

-    0xc35f272c, 0x97c2, 0x465a, { 0xa2, 0x16, 0x69, 0x6b, 0x66, 0x8a, 0x8c, 0xfe } \

-  }

+#include <Guid/UserProfileManagerHii.h>

 

 //

 // Form ID

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
index 27b3464dcf..b31c37e7b2 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
@@ -32,6 +32,7 @@
 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

+  SecurityPkg/SecurityPkg.dec

 

 [LibraryClasses]

   UefiRuntimeServicesTableLib

@@ -48,6 +49,7 @@
   gEfiUserInfoAccessSetupAdminGuid              ## CONSUMES ## Guid

   gEfiUserInfoAccessSetupNormalGuid             ## CONSUMES ## Guid

   gEfiUserInfoAccessSetupRestrictedGuid         ## CONSUMES ## Guid

+  gUserProfileManagerGuid                       ## PRODUCES ## Guid

 

 [Protocols]

   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
index 156c155c2c..9b0bfbd57a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c
@@ -1,7 +1,7 @@
 /** @file

   The functions to modify a user profile.

     

-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 

@@ -90,7 +90,7 @@ SelectUserToModify  (
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle, // HII handle

-    &mUserProfileManagerGuid, // Formset GUID

+    &gUserProfileManagerGuid, // Formset GUID

     FORMID_MODIFY_USER,       // Form ID

     StartOpCodeHandle,        // Label for where to insert opcodes

     EndOpCodeHandle           // Replace data

@@ -616,7 +616,7 @@ ModifyUserInfo (
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle,                             // HII handle

-    &mUserProfileManagerGuid,                             // Formset GUID

+    &gUserProfileManagerGuid,                             // Formset GUID

     FORMID_USER_INFO,                                     // Form ID

     StartOpCodeHandle,                                    // Label

     EndOpCodeHandle                                       // Replace data

@@ -1060,7 +1060,7 @@ ModidyAccessPolicy (
   //

   HiiUpdateForm (

     mCallbackInfo->HiiHandle,           // HII handle

-    &mUserProfileManagerGuid,           // Formset GUID

+    &gUserProfileManagerGuid,           // Formset GUID

     FORMID_MODIFY_AP,                   // Form ID

     StartOpCodeHandle,                  // Label for where to insert opcodes

     EndOpCodeHandle                     // Replace data

@@ -1560,7 +1560,7 @@ ModifyIdentityPolicy (
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle, // HII handle

-    &mUserProfileManagerGuid, // Formset GUID

+    &gUserProfileManagerGuid, // Formset GUID

     FORMID_MODIFY_IP,         // Form ID

     StartOpCodeHandle,        // Label for where to insert opcodes

     EndOpCodeHandle           // Replace data

@@ -2158,7 +2158,7 @@ DisplayLoadPermit(
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle, // HII handle

-    &mUserProfileManagerGuid, // Formset GUID

+    &gUserProfileManagerGuid, // Formset GUID

     FORMID_PERMIT_LOAD_DP,    // Form ID

     StartOpCodeHandle,        // Label for where to insert opcodes

     EndOpCodeHandle           // Replace data

@@ -2244,7 +2244,7 @@ DisplayLoadForbid (
 

   HiiUpdateForm (

     mCallbackInfo->HiiHandle, // HII handle

-    &mUserProfileManagerGuid, // Formset GUID

+    &gUserProfileManagerGuid, // Formset GUID

     FORMID_FORBID_LOAD_DP,    // Form ID

     StartOpCodeHandle,        // Label for where to insert opcodes

     EndOpCodeHandle           // Replace data