Clean up the private GUID definition in module Level.
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Sun, 18 Sep 2011 12:25:27 +0000 (12:25 +0000)
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Sun, 18 Sep 2011 12:25:27 +0000 (12:25 +0000)
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

29 files changed:
SecurityPkg/Application/VariableInfo/VariableInfo.c
SecurityPkg/Application/VariableInfo/VariableInfo.inf
SecurityPkg/Include/Guid/PwdCredentialProviderHii.h [new file with mode: 0644]
SecurityPkg/Include/Guid/TcgConfigHii.h [new file with mode: 0644]
SecurityPkg/Include/Guid/UsbCredentialProviderHii.h [new file with mode: 0644]
SecurityPkg/Include/Guid/UserIdentifyManagerHii.h [new file with mode: 0644]
SecurityPkg/Include/Guid/UserProfileManagerHii.h [new file with mode: 0644]
SecurityPkg/SecurityPkg.dec
SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.h
SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderData.h
SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.h
SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerData.h
SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileDelete.c
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.c
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerData.h
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileModify.c

index 418cec3..0c1ee4b 100644 (file)
@@ -29,10 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SmmCommunication.h>\r
 #include <Protocol/SmmVariable.h>\r
 \r
-#define EFI_VARIABLE_GUID \\r
-  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d } }\r
-\r
-EFI_GUID                        mEfiVariableGuid   = EFI_VARIABLE_GUID;\r
+extern EFI_GUID gEfiVariableGuid;\r
 EFI_SMM_COMMUNICATION_PROTOCOL  *mSmmCommunication = NULL;\r
 \r
 /**\r
@@ -208,7 +205,7 @@ UefiMain (
   VARIABLE_INFO_ENTRY   *VariableInfo;\r
   VARIABLE_INFO_ENTRY   *Entry;\r
 \r
-  Status = EfiGetSystemConfigurationTable (&mEfiVariableGuid, (VOID **)&Entry);\r
+  Status = EfiGetSystemConfigurationTable (&gEfiVariableGuid, (VOID **)&Entry);\r
   if (EFI_ERROR (Status) || (Entry == NULL)) {\r
     Status = EfiGetSystemConfigurationTable (&gEfiAuthenticatedVariableGuid, (VOID **)&Entry);\r
   }\r
index a247d53..902ed7f 100644 (file)
@@ -51,4 +51,4 @@
   \r
 [Guids]\r
   gEfiAuthenticatedVariableGuid        ## CONSUMES ## Configuration Table Guid\r
-  \r
+  gEfiVariableGuid                     ## CONSUMES ## Configuration Table Guid\r
diff --git a/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h b/SecurityPkg/Include/Guid/PwdCredentialProviderHii.h
new file mode 100644 (file)
index 0000000..007144a
--- /dev/null
@@ -0,0 +1,29 @@
+/** @file\r
+  GUID used as HII FormSet and HII Package list GUID in PwdCredentialProviderDxe driver.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials \r
+are licensed and made available under the terms and conditions of the BSD License \r
+which accompanies this distribution.  The full text of the license may be found at \r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __PWD_CREDENTIAL_PROVIDER_HII_H__\r
+#define __PWD_CREDENTIAL_PROVIDER_HII_H__\r
+\r
+//\r
+// Used for save password credential and form browser.\r
+// Also used as provider identifier.\r
+//\r
+#define PWD_CREDENTIAL_PROVIDER_GUID \\r
+  { \\r
+    0x78b9ec8b, 0xc000, 0x46c5, { 0xac, 0x93, 0x24, 0xa0, 0xc1, 0xbb, 0x0, 0xce } \\r
+  }\r
+\r
+extern EFI_GUID gPwdCredentialProviderGuid;\r
+\r
+#endif\r
diff --git a/SecurityPkg/Include/Guid/TcgConfigHii.h b/SecurityPkg/Include/Guid/TcgConfigHii.h
new file mode 100644 (file)
index 0000000..d316299
--- /dev/null
@@ -0,0 +1,25 @@
+/** @file\r
+  GUIDs used as HII FormSet and HII Package list GUID in TcgConfig driver. \r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php.                                            \r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __TCG_CONFIG_HII_GUID_H__\r
+#define __TCG_CONFIG_HII_GUID_H__\r
+\r
+#define TCG_CONFIG_FORM_SET_GUID \\r
+  { \\r
+    0xb0f901e4, 0xc424, 0x45de, {0x90, 0x81, 0x95, 0xe2, 0xb, 0xde, 0x6f, 0xb5 } \\r
+  }\r
+\r
+extern EFI_GUID gTcgConfigFormSetGuid;\r
+\r
+#endif\r
diff --git a/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h b/SecurityPkg/Include/Guid/UsbCredentialProviderHii.h
new file mode 100644 (file)
index 0000000..217aef6
--- /dev/null
@@ -0,0 +1,29 @@
+/** @file\r
+  GUID used as HII Package list GUID in UsbCredentialProviderDxe driver.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials \r
+are licensed and made available under the terms and conditions of the BSD License \r
+which accompanies this distribution.  The full text of the license may be found at \r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __USB_CREDENTIAL_PROVIDER_HII_H__\r
+#define __USB_CREDENTIAL_PROVIDER_HII_H__\r
+\r
+//\r
+// Used for save password credential and form browser\r
+// And used as provider identifier\r
+//\r
+#define USB_CREDENTIAL_PROVIDER_GUID \\r
+  { \\r
+    0xd0849ed1, 0xa88c, 0x4ba6, { 0xb1, 0xd6, 0xab, 0x50, 0xe2, 0x80, 0xb7, 0xa9 }\\r
+  }\r
+\r
+extern EFI_GUID gUsbCredentialProviderGuid;\r
+\r
+#endif\r
diff --git a/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h b/SecurityPkg/Include/Guid/UserIdentifyManagerHii.h
new file mode 100644 (file)
index 0000000..11d215c
--- /dev/null
@@ -0,0 +1,25 @@
+/** @file\r
+  GUID used as HII FormSet and HII Package list GUID in UserIdentifyManagerDxe driver.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials \r
+are licensed and made available under the terms and conditions of the BSD License \r
+which accompanies this distribution.  The full text of the license may be found at \r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __USER_IDENTIFY_MANAGER_HII_H__\r
+#define __USER_IDENTIFY_MANAGER_HII_H__\r
+\r
+#define USER_IDENTIFY_MANAGER_GUID \\r
+  { \\r
+    0x3ccd3dd8, 0x8d45, 0x4fed, { 0x96, 0x2d, 0x2b, 0x38, 0xcd, 0x82, 0xb3, 0xc4 } \\r
+  }\r
+\r
+extern EFI_GUID gUserIdentifyManagerGuid;\r
+\r
+#endif\r
diff --git a/SecurityPkg/Include/Guid/UserProfileManagerHii.h b/SecurityPkg/Include/Guid/UserProfileManagerHii.h
new file mode 100644 (file)
index 0000000..e53e5a1
--- /dev/null
@@ -0,0 +1,25 @@
+/** @file\r
+  GUID used as HII FormSet and HII Package list GUID in UserProfileManagerDxe driver.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials \r
+are licensed and made available under the terms and conditions of the BSD License \r
+which accompanies this distribution.  The full text of the license may be found at \r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef __USER_PROFILE_MANAGER_HII_H__\r
+#define __USER_PROFILE_MANAGER_HII_H__\r
+\r
+#define USER_PROFILE_MANAGER_GUID \\r
+  { \\r
+    0xc35f272c, 0x97c2, 0x465a, { 0xa2, 0x16, 0x69, 0x6b, 0x66, 0x8a, 0x8c, 0xfe } \\r
+  }\r
+\r
+extern EFI_GUID gUserProfileManagerGuid;\r
+\r
+#endif
\ No newline at end of file
index 8121f39..f4605ec 100644 (file)
 \r
   ## Include/Guid/PhysicalPresenceData.h\r
   gEfiPhysicalPresenceGuid           = { 0xf6499b1, 0xe9ad, 0x493d, { 0xb9, 0xc2, 0x2f, 0x90, 0x81, 0x5c, 0x6c, 0xbc }}\r
+  \r
+  ## Include/Guid/PwdCredentialProviderHii.h\r
+  gPwdCredentialProviderGuid         = { 0x78b9ec8b, 0xc000, 0x46c5, { 0xac, 0x93, 0x24, 0xa0, 0xc1, 0xbb, 0x0, 0xce }}\r
+\r
+  ## Include/Guid/UsbCredentialProviderHii.h\r
+  gUsbCredentialProviderGuid         = { 0xd0849ed1, 0xa88c, 0x4ba6, { 0xb1, 0xd6, 0xab, 0x50, 0xe2, 0x80, 0xb7, 0xa9 }}\r
+\r
+  ## Include/Guid/UserIdentifyManagerHii.h\r
+  gUserIdentifyManagerGuid           = { 0x3ccd3dd8, 0x8d45, 0x4fed, { 0x96, 0x2d, 0x2b, 0x38, 0xcd, 0x82, 0xb3, 0xc4 }}\r
+\r
+  ## Include/Guid/UserProfileManagerHii.h\r
+  gUserProfileManagerGuid            = { 0xc35f272c, 0x97c2, 0x465a, { 0xa2, 0x16, 0x69, 0x6b, 0x66, 0x8a, 0x8c, 0xfe }}\r
+\r
+  ## Include/Guid/TcgConfigHii.h\r
+  gTcgConfigFormSetGuid              = { 0xb0f901e4, 0xc424, 0x45de, { 0x90, 0x81, 0x95, 0xe2, 0xb, 0xde, 0x6f, 0xb5 }}\r
 \r
 [Ppis]\r
   ## Include/Ppi/LockPhysicalPresence.h\r
index 360e556..291f923 100644 (file)
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "TcgConfigNvData.h"\r
 \r
 formset\r
-  guid      = TCG_CONFIG_PRIVATE_GUID,\r
+  guid      = TCG_CONFIG_FORM_SET_GUID,\r
   title     = STRING_TOKEN(STR_TPM_TITLE),\r
   help      = STRING_TOKEN(STR_TPM_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
@@ -23,7 +23,7 @@ formset
   varstore TCG_CONFIGURATION,\r
     varid = TCG_CONFIGURATION_VARSTORE_ID,\r
     name  = TCG_CONFIGURATION,\r
-    guid  = TCG_CONFIG_PRIVATE_GUID;\r
+    guid  = TCG_CONFIG_FORM_SET_GUID;\r
 \r
   form formid = TCG_CONFIGURATION_FORM_ID,\r
     title = STRING_TOKEN(STR_TPM_TITLE);\r
index 2ec33e0..2d3728c 100644 (file)
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "TcgConfigImpl.h"\r
 \r
-EFI_GUID gTcgConfigPrivateGuid = TCG_CONFIG_PRIVATE_GUID;\r
-\r
 /**\r
   The entry point for Tcg configuration driver.\r
 \r
@@ -52,7 +50,7 @@ TcgConfigDriverEntryPoint (
   \r
   Status = gBS->OpenProtocol (\r
                   ImageHandle,\r
-                  &gTcgConfigPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   NULL,\r
                   ImageHandle,\r
                   ImageHandle,\r
@@ -86,7 +84,7 @@ TcgConfigDriverEntryPoint (
   //    \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &ImageHandle,\r
-                  &gTcgConfigPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   PrivateData,\r
                   NULL\r
                   );\r
@@ -125,7 +123,7 @@ TcgConfigDriverUnload (
 \r
   Status = gBS->HandleProtocol (\r
                   ImageHandle,\r
-                  &gTcgConfigPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   (VOID **) &PrivateData\r
                   );  \r
   if (EFI_ERROR (Status)) {\r
@@ -136,7 +134,7 @@ TcgConfigDriverUnload (
 \r
   gBS->UninstallMultipleProtocolInterfaces (\r
          &ImageHandle,\r
-         &gTcgConfigPrivateGuid,\r
+         &gEfiCallerIdGuid,\r
          PrivateData,\r
          NULL\r
          );\r
index d9d3102..44abdc0 100644 (file)
@@ -55,6 +55,7 @@
 [Guids]\r
   gEfiPhysicalPresenceGuid\r
   gEfiIfrTianoGuid\r
+  gTcgConfigFormSetGuid\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
index 0127819..c172583 100644 (file)
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "TcgConfigImpl.h"\r
 \r
-EFI_GUID                        mTcgFormSetGuid = TCG_CONFIG_PRIVATE_GUID;\r
 CHAR16                          mTcgStorageName[] = L"TCG_CONFIGURATION";\r
 \r
 TCG_CONFIG_PRIVATE_DATA         mTcgConfigPrivateDateTemplate = {\r
@@ -36,7 +35,7 @@ HII_VENDOR_DEVICE_PATH          mTcgHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    TCG_CONFIG_PRIVATE_GUID\r
+    TCG_CONFIG_FORM_SET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -166,7 +165,7 @@ TcgExtractConfig (
   }\r
 \r
   *Progress = Request;\r
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -220,7 +219,7 @@ TcgExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
-    ConfigRequestHdr = HiiConstructConfigHdr (&mTcgFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gTcgConfigFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -290,7 +289,7 @@ TcgRouteConfig (
   }\r
 \r
   *Progress = Configuration;\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -460,7 +459,7 @@ InstallTcgConfigForm (
   // Publish the HII package list\r
   //\r
   HiiHandle = HiiAddPackages (\r
-                &mTcgFormSetGuid,\r
+                &gTcgConfigFormSetGuid,\r
                 DriverHandle,\r
                 TcgConfigDxeStrings,\r
                 TcgConfigBin,\r
index 982764c..30f4dbf 100644 (file)
@@ -17,11 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Guid/HiiPlatformSetupFormset.h>\r
 #include <Guid/PhysicalPresenceData.h>\r
-\r
-#define TCG_CONFIG_PRIVATE_GUID \\r
-  { \\r
-    0xb0f901e4, 0xc424, 0x45de, {0x90, 0x81, 0x95, 0xe2, 0xb, 0xde, 0x6f, 0xb5 } \\r
-  }\r
+#include <Guid/TcgConfigHii.h>\r
 \r
 #define TCG_CONFIGURATION_VARSTORE_ID  0x0001\r
 #define TCG_CONFIGURATION_FORM_ID      0x0001\r
index 9d2e622..b8513e9 100644 (file)
@@ -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
index 9b5e776..c9ef33b 100644 (file)
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Uefi.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
-#include <Guid/MdeModuleHii.h>\r
 \r
 #include <Protocol/HiiConfigAccess.h>\r
 #include <Protocol/UserCredential.h>\r
index ffe0ade..feeffcc 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Data structure used by the Password Credential Provider driver.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PWD_CREDENTIAL_PROVIDER_DATA_H_\r
 #define _PWD_CREDENTIAL_PROVIDER_DATA_H_\r
 \r
-#define PWD_CREDENTIAL_PROVIDER_GUID \\r
-  { \\r
-    0x78b9ec8b, 0xc000, 0x46c5, { 0xac, 0x93, 0x24, 0xa0, 0xc1, 0xbb, 0x0, 0xce } \\r
-  }\r
+#include <Guid/PwdCredentialProviderHii.h>\r
 \r
 //\r
 // Forms definition\r
index 0ffc24e..3b32fbb 100644 (file)
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r
+  SecurityPkg/SecurityPkg.dec\r
 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
@@ -43,8 +44,8 @@
   BaseCryptLib\r
   \r
 [Guids]\r
-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
   gEfiUserCredentialClassPasswordGuid           ## CONSUMES ## Guid\r
+  gPwdCredentialProviderGuid                    ## PRODUCES ## Guid\r
 \r
 [Protocols]\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
index 2b79354..726e61c 100644 (file)
@@ -18,34 +18,6 @@ CREDENTIAL_TABLE            *mUsbTable       = NULL;
 USB_PROVIDER_CALLBACK_INFO  *mCallbackInfo   = NULL;\r
 USB_CREDENTIAL_INFO         *mUsbInfoHandle  = NULL;\r
 \r
-//\r
-// Used for save password credential and form browser\r
-// And used as provider identifier\r
-//\r
-EFI_GUID     mUsbCredentialGuid = USB_CREDENTIAL_PROVIDER_GUID;\r
-\r
-HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {\r
-  {\r
-    {\r
-      HARDWARE_DEVICE_PATH,\r
-      HW_VENDOR_DP,\r
-      {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
-      }\r
-    },\r
-    { 0x9463f883, 0x48f6, 0x4a7a, { 0x97, 0x2d, 0x9f, 0x8f, 0x38, 0xf2, 0xdd, 0x91 } }\r
-  },\r
-  {\r
-    END_DEVICE_PATH_TYPE,\r
-    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
-    }\r
-  }\r
-};\r
-\r
 EFI_USER_CREDENTIAL_PROTOCOL  gUsbCredentialProviderDriver = {\r
   USB_CREDENTIAL_PROVIDER_GUID,\r
   EFI_USER_CREDENTIAL_CLASS_SECURE_CARD,\r
@@ -180,7 +152,7 @@ ModifyTable (
   //\r
   Status = gRT->SetVariable (\r
                   L"UsbCredential",\r
-                  &mUsbCredentialGuid,\r
+                  &gUsbCredentialProviderGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   mUsbTable->Count * sizeof (USB_INFO),\r
                   &mUsbTable->UserInfo\r
@@ -212,7 +184,7 @@ InitCredentialTable (
   Var     = NULL;\r
   Status  = gRT->GetVariable (\r
                    L"UsbCredential", \r
-                   &mUsbCredentialGuid, \r
+                   &gUsbCredentialProviderGuid, \r
                    NULL, \r
                    &VarSize,\r
                    Var\r
@@ -224,7 +196,7 @@ InitCredentialTable (
     }\r
     Status = gRT->GetVariable (\r
                     L"UsbCredential", \r
-                    &mUsbCredentialGuid, \r
+                    &gUsbCredentialProviderGuid, \r
                     NULL, \r
                     &VarSize,\r
                     Var\r
@@ -647,7 +619,7 @@ InitFormBrowser (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mUsbCredentialGuid,\r
+                              &gUsbCredentialProviderGuid,\r
                               CallbackInfo->DriverHandle,\r
                               UsbCredentialProviderStrings,\r
                               NULL\r
@@ -1249,8 +1221,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, &mUsbCredentialGuid);\r
-    CopyGuid ((EFI_GUID *)(Info + 1), &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
+    CopyGuid ((EFI_GUID *)(Info + 1), &gUsbCredentialProviderGuid);\r
     \r
     mUsbInfoHandle->Info[0] = Info;\r
     mUsbInfoHandle->Count++;\r
@@ -1267,7 +1239,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, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
     \r
@@ -1284,7 +1256,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, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassSecureCardGuid);\r
     \r
     mUsbInfoHandle->Info[2] = Info;\r
@@ -1302,7 +1274,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, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
     \r
index 1d43e9a..d0295b8 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Usb Credential Provider driver header file.\r
     \r
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -18,9 +18,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Uefi.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
-#include <Guid/MdeModuleHii.h>\r
 #include <Guid/FileInfo.h>\r
 #include <Guid/SecurityPkgTokenSpace.h>\r
+#include <Guid/UsbCredentialProviderHii.h>\r
 \r
 #include <Protocol/SimpleFileSystem.h>\r
 #include <Protocol/BlockIo.h>\r
@@ -40,16 +40,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>\r
 \r
 extern UINT8      UsbCredentialProviderStrings[];\r
-extern UINT8      UsbCredentialProviderVfrBin[];\r
 \r
 #define USB_TABLE_INC          16\r
 #define HASHED_CREDENTIAL_LEN  20\r
 \r
-#define USB_CREDENTIAL_PROVIDER_GUID \\r
-  { \\r
-    0xd0849ed1, 0xa88c, 0x4ba6, { 0xb1, 0xd6, 0xab, 0x50, 0xe2, 0x80, 0xb7, 0xa9 }\\r
-  }\r
-\r
 //\r
 // Save the enroll user credential Information.\r
 //\r
@@ -75,14 +69,6 @@ typedef struct {
   EFI_USER_INFO                 *Info[1];\r
 } USB_CREDENTIAL_INFO;\r
 \r
-///\r
-/// HII specific Vendor Device Path definition.\r
-///\r
-typedef struct {\r
-  VENDOR_DEVICE_PATH        VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
-} HII_VENDOR_DEVICE_PATH;\r
-\r
 #define USB_PROVIDER_SIGNATURE  SIGNATURE_32 ('U', 'S', 'B', 'P')\r
 \r
 typedef struct {\r
index 2a45763..06f212e 100644 (file)
@@ -42,7 +42,7 @@
   BaseCryptLib\r
   \r
 [Guids]\r
-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
+  gUsbCredentialProviderGuid                    ## PRODUCES ## Guid\r
   gEfiFileInfoGuid                              ## CONSUMES ## Guid\r
   gEfiUserCredentialClassSecureCardGuid         ## CONSUMES ## Guid\r
 \r
index 6438813..e846b71 100644 (file)
@@ -14,11 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "UserIdentifyManager.h"\r
 \r
-//\r
-// Guid used in user profile saving and in form browser.\r
-//\r
-EFI_GUID                    mUserManagerGuid  = USER_IDENTIFY_MANAGER_GUID;\r
-\r
 //\r
 // Default user name.\r
 //\r
@@ -54,10 +49,7 @@ HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {ACA7C06F-743C-454f-9C6D-692138482498}\r
-    //\r
-    { 0xaca7c06f, 0x743c, 0x454f, { 0x9c, 0x6d, 0x69, 0x21, 0x38, 0x48, 0x24, 0x98 } }\r
+    USER_IDENTIFY_MANAGER_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -1152,7 +1144,7 @@ SaveNvUserProfile (
   //\r
   Status = gRT->SetVariable (\r
                   User->UserVarName,\r
-                  &mUserManagerGuid,\r
+                  &gUserIdentifyManagerGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   Delete ? 0 : User->UserProfileSize,\r
                   User->ProfileInfo\r
@@ -2812,7 +2804,7 @@ IdentifyOrTypeUser (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserManagerGuid,        // Formset GUID\r
+    &gUserIdentifyManagerGuid,// Formset GUID\r
     FORMID_PROVIDER_FORM,     // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
@@ -2916,7 +2908,7 @@ UserIdentifyManagerCallback (
   \r
       HiiUpdateForm (\r
         mCallbackInfo->HiiHandle, // HII handle\r
-        &mUserManagerGuid,        // Formset GUID\r
+        &gUserIdentifyManagerGuid,// Formset GUID\r
         FORMID_USER_FORM,         // Form ID\r
         StartOpCodeHandle,        // Label for where to insert opcodes\r
         EndOpCodeHandle           // Replace data\r
@@ -3058,7 +3050,7 @@ InitUserProfileDb (
     // Get variable value.\r
     //\r
     VarSize = CurVarSize;\r
-    Status  = gRT->GetVariable (VarName, &mUserManagerGuid, &VarAttr, &VarSize, VarData);\r
+    Status  = gRT->GetVariable (VarName, &gUserIdentifyManagerGuid, &VarAttr, &VarSize, VarData);\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       FreePool (VarData);\r
       VarData = AllocatePool (VarSize);\r
@@ -3068,7 +3060,7 @@ InitUserProfileDb (
       }\r
 \r
       CurVarSize  = VarSize;\r
-      Status      = gRT->GetVariable (VarName, &mUserManagerGuid, &VarAttr, &VarSize, VarData);\r
+      Status      = gRT->GetVariable (VarName, &gUserIdentifyManagerGuid, &VarAttr, &VarSize, VarData);\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -3082,7 +3074,7 @@ InitUserProfileDb (
     // Check variable attributes.\r
     //\r
     if (VarAttr != (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS)) {\r
-      Status = gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+      Status = gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
       continue;\r
     }\r
     \r
@@ -3095,7 +3087,7 @@ InitUserProfileDb (
         //\r
         // Delete invalid user profile\r
         //\r
-        gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+        gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
       } else if (Status == EFI_OUT_OF_RESOURCES) {\r
         break;\r
       }\r
@@ -3104,7 +3096,7 @@ InitUserProfileDb (
       // Delete and save the profile again if some invalid profiles are deleted.\r
       //\r
       if (mUserProfileDb->UserProfileNum < Index) {\r
-        gRT->SetVariable (VarName, &mUserManagerGuid, VarAttr, 0, NULL);\r
+        gRT->SetVariable (VarName, &gUserIdentifyManagerGuid, VarAttr, 0, NULL);\r
         SaveNvUserProfile (mUserProfileDb->UserProfile[mUserProfileDb->UserProfileNum - 1], FALSE);\r
       }\r
     }\r
@@ -3349,7 +3341,7 @@ InitFormBrowser (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mUserManagerGuid,\r
+                              &gUserIdentifyManagerGuid,\r
                               CallbackInfo->DriverHandle,\r
                               UserIdentifyManagerStrings,\r
                               UserIdentifyManagerVfrBin,\r
@@ -3590,7 +3582,7 @@ IdentifyUser (
                                  mCallbackInfo->FormBrowser2,\r
                                  &mCallbackInfo->HiiHandle,\r
                                  1,\r
-                                 &mUserManagerGuid,\r
+                                 &gUserIdentifyManagerGuid,\r
                                  0,\r
                                  NULL,\r
                                  NULL\r
index d91de10..5efc50d 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Data structure used by the user identify manager driver.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -15,15 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _USER_IDENTIFY_MANAGER_DATA_H_\r
 #define _USER_IDENTIFY_MANAGER_DATA_H_\r
 \r
-#include "UserIdentifyManagerStrDefs.h"\r
-\r
-//\r
-// Guid used in user profile saving and in form browser.\r
-//\r
-#define USER_IDENTIFY_MANAGER_GUID \\r
-  { \\r
-    0x3ccd3dd8, 0x8d45, 0x4fed, { 0x96, 0x2d, 0x2b, 0x38, 0xcd, 0x82, 0xb3, 0xc4 } \\r
-  }\r
+#include <Guid/UserIdentifyManagerHii.h>\r
 \r
 //\r
 // Forms definition.\r
index d5fccea..a8d7818 100644 (file)
@@ -30,6 +30,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  SecurityPkg/SecurityPkg.dec\r
 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
@@ -44,6 +45,7 @@
 [Guids]\r
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
   gEfiEventUserProfileChangedGuid               ## CONSUMES ## Guid \r
+  gUserIdentifyManagerGuid                      ## PRODUCES ## Guid\r
 \r
 [Protocols]\r
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES\r
index d0295b7..fffc93b 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   The functions to delete a user profile.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -303,7 +303,7 @@ SelectUserToDelete (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserProfileManagerGuid, // Formset GUID\r
+    &gUserProfileManagerGuid, // Formset GUID\r
     FORMID_DEL_USER,          // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
index c41fe97..83b391c 100644 (file)
@@ -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
@@ -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
@@ -786,7 +785,7 @@ UserProfileManagerInit (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mUserProfileManagerGuid,\r
+                              &gUserProfileManagerGuid,\r
                               CallbackInfo->DriverHandle,\r
                               UserProfileManagerStrings,\r
                               UserProfileManagerVfrBin,\r
index b7098dc..bff9539 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   The header file for user profile manager driver.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -112,11 +112,6 @@ extern UINT8                               UserProfileManagerVfrBin[];
 //\r
 extern UINT8                               UserProfileManagerStrings[];\r
 \r
-//\r
-// Guid used in the form browse.\r
-//\r
-extern EFI_GUID                            mUserProfileManagerGuid;\r
-\r
 //\r
 // The user manager protocol, used in several function.\r
 //\r
index 58b6cb8..4548c75 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   The form data for user profile manager driver.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __USER_PROFILE_MANAGER_DATA_H__\r
 #define __USER_PROFILE_MANAGER_DATA_H__\r
 \r
-#define USER_PROFILE_MANAGER_GUID \\r
-  { \\r
-    0xc35f272c, 0x97c2, 0x465a, { 0xa2, 0x16, 0x69, 0x6b, 0x66, 0x8a, 0x8c, 0xfe } \\r
-  }\r
+#include <Guid/UserProfileManagerHii.h>\r
 \r
 //\r
 // Form ID\r
index 27b3464..b31c37e 100644 (file)
@@ -32,6 +32,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  SecurityPkg/SecurityPkg.dec\r
 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
@@ -48,6 +49,7 @@
   gEfiUserInfoAccessSetupAdminGuid              ## CONSUMES ## Guid\r
   gEfiUserInfoAccessSetupNormalGuid             ## CONSUMES ## Guid\r
   gEfiUserInfoAccessSetupRestrictedGuid         ## CONSUMES ## Guid\r
+  gUserProfileManagerGuid                       ## PRODUCES ## Guid\r
 \r
 [Protocols]\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
index 156c155..9b0bfbd 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   The functions to modify a user profile.\r
     \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -90,7 +90,7 @@ SelectUserToModify  (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserProfileManagerGuid, // Formset GUID\r
+    &gUserProfileManagerGuid, // Formset GUID\r
     FORMID_MODIFY_USER,       // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
@@ -616,7 +616,7 @@ ModifyUserInfo (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle,                             // HII handle\r
-    &mUserProfileManagerGuid,                             // Formset GUID\r
+    &gUserProfileManagerGuid,                             // Formset GUID\r
     FORMID_USER_INFO,                                     // Form ID\r
     StartOpCodeHandle,                                    // Label\r
     EndOpCodeHandle                                       // Replace data\r
@@ -1060,7 +1060,7 @@ ModidyAccessPolicy (
   //\r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle,           // HII handle\r
-    &mUserProfileManagerGuid,           // Formset GUID\r
+    &gUserProfileManagerGuid,           // Formset GUID\r
     FORMID_MODIFY_AP,                   // Form ID\r
     StartOpCodeHandle,                  // Label for where to insert opcodes\r
     EndOpCodeHandle                     // Replace data\r
@@ -1560,7 +1560,7 @@ ModifyIdentityPolicy (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserProfileManagerGuid, // Formset GUID\r
+    &gUserProfileManagerGuid, // Formset GUID\r
     FORMID_MODIFY_IP,         // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
@@ -2158,7 +2158,7 @@ DisplayLoadPermit(
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserProfileManagerGuid, // Formset GUID\r
+    &gUserProfileManagerGuid, // Formset GUID\r
     FORMID_PERMIT_LOAD_DP,    // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r
@@ -2244,7 +2244,7 @@ DisplayLoadForbid (
 \r
   HiiUpdateForm (\r
     mCallbackInfo->HiiHandle, // HII handle\r
-    &mUserProfileManagerGuid, // Formset GUID\r
+    &gUserProfileManagerGuid, // Formset GUID\r
     FORMID_FORBID_LOAD_DP,    // Form ID\r
     StartOpCodeHandle,        // Label for where to insert opcodes\r
     EndOpCodeHandle           // Replace data\r