Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit21173ac

Browse files
committed
Merged PR 613: Minor cleanup and add Virutaliztion setting (limited)
Misspelling, line end blanks, and add a settings manager for DFCI Virtualization Settings
1 parent967e323 commit21173ac

File tree

11 files changed

+574
-40
lines changed

11 files changed

+574
-40
lines changed

‎DfciPkg/Application/DfciMenu/DfciMenu.c‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ GetDfciParameters (
519519

520520
Status=GetASetting (DFCI_SETTING_ID__MDM_TENANT_NAME,&Name,&NameSize);
521521
if (!EFI_ERROR(Status)&& (NameSize >=1)) {
522-
mDfciMenuConfiguration.DfciFriendlyName= TRUE;
522+
mDfciMenuConfiguration.DfciTennantName= TRUE;
523523
SetStringEntry (STRING_TOKEN(STR_DFCI_MDM_TENANT_NAME),Name);
524524
DEBUG((DEBUG_INFO,"Dfci MDM.Tenant is enabled\n"));
525525
}
@@ -643,8 +643,9 @@ DfciMenuEntry(
643643
STATIC
644644
EFI_STATUS
645645
DisplayMessageBox (
646+
EFI_STRING_IDMsgToken,
646647
INEFI_STATUSStatusIn,
647-
INCHAR16*MessageText
648+
INCHAR16*MessageTextOPTIONAL
648649
) {
649650

650651
UINT32MessageBoxType;
@@ -656,10 +657,6 @@ DisplayMessageBox (
656657
DFCI_MB_RESULTSwmResult;
657658

658659

659-
if (NULL==MessageText) {
660-
returnEFI_INVALID_PARAMETER;
661-
}
662-
663660
MessageBoxType=DFCI_MB_OK;
664661
SwmResult=DFCI_MB_IDOK;
665662
pTitle=HiiGetString(mDfciMenuPrivate.HiiHandle,STRING_TOKEN(STR_DFCI_MB_TITLE),NULL);
@@ -672,8 +669,8 @@ DisplayMessageBox (
672669
}
673670

674671
pCaption=HiiGetString(mDfciMenuPrivate.HiiHandle,STRING_TOKEN(STR_DFCI_MB_CAPTION),NULL);
675-
pBody=HiiGetString(mDfciMenuPrivate.HiiHandle,STRING_TOKEN(STR_DFCI_MB_NEW_SETTINGS),NULL);
676-
if (NULL!=pBody) {
672+
pBody=HiiGetString(mDfciMenuPrivate.HiiHandle,MsgToken,NULL);
673+
if ((NULL!=pBody)&& (NULL!=MessageText)) {
677674
pTmp=AllocatePool(MAX_MSG_SIZE);
678675
if (NULL!=pTmp) {
679676
UnicodeSPrint(pTmp,MAX_MSG_SIZE,pBody,MessageText);
@@ -687,7 +684,7 @@ DisplayMessageBox (
687684

688685
caseEFI_NOT_FOUND:
689686
pBody=HiiGetString(mDfciMenuPrivate.HiiHandle,STRING_TOKEN(STR_DFCI_MB_NOT_FOUND),NULL);
690-
if (NULL!=pBody) {
687+
if ((NULL!=pBody)&& (NULL!=MessageText)) {
691688
pTmp=AllocatePool(MAX_MSG_SIZE);
692689
if (NULL!=pTmp) {
693690
UnicodeSPrint(pTmp,MAX_MSG_SIZE,pBody,MessageText);
@@ -773,6 +770,10 @@ IssueDfciNetworkRequest (
773770
//
774771
EfiEventGroupSignal (&gDfciConfigStartEventGroupGuid);
775772

773+
// Platform Late Locking event. For now, just signal
774+
// ReadyToBoot().
775+
EfiEventGroupSignal (&gEfiEventPreReadyToBootGuid);
776+
776777
JsonString=NULL;
777778
DfciIdString=NULL;
778779
//
@@ -812,7 +813,7 @@ IssueDfciNetworkRequest (
812813
//
813814
Url=ConvertToCHAR16 (mDfciUrl);
814815

815-
DisplayMessageBox (Status,Url);
816+
DisplayMessageBox (STRING_TOKEN(STR_DFCI_MB_NEW_SETTINGS),Status,Url);
816817

817818
if (NULL!=Url) {
818819
FreePool (Url);
@@ -844,6 +845,10 @@ IssueDfciUsbRequest (
844845
//
845846
EfiEventGroupSignal (&gDfciConfigStartEventGroupGuid);
846847

848+
// Platform Late Locking event. For now, just signal
849+
// ReadyToBoot().
850+
EfiEventGroupSignal (&gEfiEventPreReadyToBootGuid);
851+
847852
FileName=NULL;
848853
JsonString=NULL;
849854

@@ -889,7 +894,7 @@ IssueDfciUsbRequest (
889894
//
890895
// Inform user that operation is complete
891896
//
892-
DisplayMessageBox (Status,FileName);
897+
DisplayMessageBox (STRING_TOKEN(STR_DFCI_MB_NEW_SETTINGS),Status,FileName);
893898

894899
if (NULL!=JsonString) {
895900
FreePool (JsonString);
@@ -995,6 +1000,7 @@ DriverCallback (
9951000

9961001
*ActionRequest=EFI_BROWSER_ACTION_REQUEST_SUBMIT;
9971002
Status=EFI_SUCCESS;
1003+
DisplayMessageBox (STRING_TOKEN(STR_DFCI_MB_OPT_CHANGE),Status,NULL);
9981004
break;
9991005

10001006
caseDFCI_MENU_ZUM_OPT_OUT_QUESTION_ID:
@@ -1005,6 +1011,7 @@ DriverCallback (
10051011

10061012
*ActionRequest=EFI_BROWSER_ACTION_REQUEST_SUBMIT;
10071013
Status=EFI_SUCCESS;
1014+
DisplayMessageBox (STRING_TOKEN(STR_DFCI_MB_OPT_CHANGE),Status,NULL);
10081015
break;
10091016

10101017
default:

‎DfciPkg/Application/DfciMenu/DfciMenu.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ typedef struct {
7272
UINT8DfciUser1Enabled;
7373
UINT8DfciUser2Enabled;
7474
UINT8DfciFriendlyName;
75+
UINT8DfciTennantName;
7576
UINT8DfciOptInChanged;
7677
}DFCI_MENU_CONFIGURATION;
7778

‎DfciPkg/Application/DfciMenu/DfciMenu.inf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
gDfciSettingsGuid
9696
gDfciSettingsManagerVarNamespace
9797
gEfiBootManagerPolicyNetworkGuid
98+
gEfiEventPreReadyToBootGuid
9899

99100
[Protocols]
100101
gDfciAuthenticationProtocolGuid

‎DfciPkg/Application/DfciMenu/DfciMenuStrings.uni‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
144144

145145
#string STR_DFCI_MB_NOT_FOUND #language en-US "%s not found."
146146

147-
#string STR_DFCI_MB_INTERNAL_ERROR #language en-US "Internal error. Code=%r."
147+
#string STR_DFCI_MB_INTERNAL_ERROR #language en-US "Internal error. Code=%r."
148+
149+
#string STR_DFCI_MB_OPT_CHANGE #language en-US "ZTD Opt In changed. Restart now to apply the change."

‎DfciPkg/Application/DfciMenu/DfciMenuVfr.Vfr‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,32 @@ formset
160160
help = STRING_TOKEN(STR_NULL_STRING), // Subject:
161161
text = STRING_TOKEN(STR_DFCI_MANAGED_BY);
162162

163-
suppressif ideqval DfciMenuConfig.DfciFriendlyName == 0x00; // If no friendly name, just
163+
suppressifNOTideqval DfciMenuConfig.DfciFriendlyName == 0x00; // If no friendly name, just
164164
text
165165
help = STRING_TOKEN(STR_NULL_STRING), // managed by owner
166166
text = STRING_TOKEN(STR_DFCI_OWNER_SUBJECT_FIELD);
167167
endif;
168168

169-
suppressifNOTideqval DfciMenuConfig.DfciFriendlyName == 0x00; // If friendly name,
169+
suppressif ideqval DfciMenuConfig.DfciFriendlyName == 0x00; // If friendly name,
170170
text
171171
help = STRING_TOKEN(STR_NULL_STRING), // managed by MDM
172172
text = STRING_TOKEN(STR_DFCI_MDM_FRIENDLY_NAME);
173173

174-
subtitle
175-
text = STRING_TOKEN(STR_NULL_STRING), // Group of horizontal text blocks
176-
flags = HORIZONTAL;
174+
suppressif ideqval DfciMenuConfig.DfciTennantName == 0x00; // If Tennant Name name,
177175

178-
text
179-
help = STRING_TOKEN(STR_NULL_STRING), // On behalf of MDM Tenant name
180-
text = STRING_TOKEN(STR_DFCI_ON_BEHALF_OF);
176+
subtitle
177+
text = STRING_TOKEN(STR_NULL_STRING), // Group of horizontal text blocks
178+
flags = HORIZONTAL;
179+
180+
text
181+
help = STRING_TOKEN(STR_NULL_STRING), // On behalf of MDM Tenant name
182+
text = STRING_TOKEN(STR_DFCI_ON_BEHALF_OF);
183+
184+
text
185+
help = STRING_TOKEN(STR_NULL_STRING),
186+
text = STRING_TOKEN(STR_DFCI_MDM_TENANT_NAME);
187+
endif;
181188

182-
text
183-
help = STRING_TOKEN(STR_NULL_STRING),
184-
text = STRING_TOKEN(STR_DFCI_MDM_TENANT_NAME);
185189
endif;
186190

187191
text

‎DfciPkg/DfciPkg.dsc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
DfciUiSupportLib|DfciPkg/Library/DfciUiSupportLibNull/DfciUiSupportLibNull.inf
9191
DfciV1SupportLib|DfciPkg/Library/DfciV1SupportLibNull/DfciV1SupportLibNull.inf
9292
DfciSettingsLib|DfciPkg/Library/DfciSettingsLib/DfciSettingsLib.inf
93+
DfciVirtualizationSettingsLib|DfciPkg/Library/DfciVirtualizationSettings/DfciVirtualizationSettings.inf
9394
ZeroTouchSettingsLib|ZeroTouchPkg/Library/ZeroTouchSettings/ZeroTouchSettings.inf
9495
JsonLiteParserLib|MsCorePkg/Library/JsonLiteParser/JsonLiteParser.inf
9596

@@ -162,11 +163,13 @@
162163
DfciPkg/Library/DfciXmlSettingSchemaSupportLib/DfciXmlSettingSchemaSupportLib.inf
163164
DfciPkg/Library/DfciXmlDeviceIdSchemaSupportLib/DfciXmlDeviceIdSchemaSupportLib.inf
164165
DfciPkg/Library/DfciXmlIdentitySchemaSupportLib/DfciXmlIdentitySchemaSupportLib.inf
166+
DfciPkg/Library/DfciVirtualizationSettings/DfciVirtualizationSettings.inf
165167

166168
DfciPkg/SettingsManager/SettingsManagerDxe.inf {
167169
#Platform should add all it settings libs here
168170
<LibraryClasses>
169171
NULL|DfciPkg/Library/DfciSettingsLib/DfciSettingsLib.inf
172+
NULL|DfciPkg/Library/DfciVirtualizationSettings/DfciVirtualizationSettings.inf
170173
DfciSettingPermissionLib|DfciPkg/Library/DfciSettingPermissionLib/DfciSettingPermissionLib.inf
171174
<PcdsFeatureFlag>
172175
gDfciPkgTokenSpaceGuid.PcdSettingsManagerInstallProvider|TRUE

‎DfciPkg/Library/DfciSettingPermissionLib/DfciSettingPermission.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ IN CONST DFCI_AUTH_TOKEN *AuthToken OPTIONAL
6464
returnEFI_NOT_READY;
6565
}
6666

67-
//User is trying to reset. Check if auth token is valid for this operation.
67+
//User is trying to reset. Check if auth token is valid for this operation.
6868
// Permission is based on who can change the Owner Cert and/or who can do recovery.
6969
Status=HasWritePermissions(DFCI_SETTING_ID__OWNER_KEY,AuthToken,&CanChange);
7070
if (EFI_ERROR(Status))
@@ -86,7 +86,7 @@ IN CONST DFCI_AUTH_TOKEN *AuthToken OPTIONAL
8686
returnEFI_ACCESS_DENIED;
8787
}
8888
}
89-
89+
9090
DEBUG((DEBUG_INFO,"%a - Auth Token good. Lets clear the permissions.\n",__FUNCTION__));
9191

9292
// 1. Free existing PermissionStore
@@ -95,7 +95,7 @@ IN CONST DFCI_AUTH_TOKEN *AuthToken OPTIONAL
9595
FreePermissionStore(mPermStore);
9696
mPermStore=NULL;
9797
}
98-
98+
9999
// 2. Set it to defaults which is all access to all settings
100100
Status=InitPermStore(&mPermStore);
101101
if (EFI_ERROR(Status))
@@ -161,8 +161,7 @@ OUT BOOLEAN *Result
161161
returnStatus;
162162
}
163163

164-
165-
//2. set to default.
164+
//2. set to default.
166165
PMask=mPermStore->DefaultPMask;
167166

168167
//3. Set PMask to specific value if in list
@@ -278,13 +277,15 @@ IdentityChange (
278277
Status=AddRequiredPermissionEntry (mPermStore,DFCI_SETTING_ID__ZTD_KEY,DFCI_IDENTITY_INVALID,DFCI_PERMISSION_MASK__NONE);
279278
}
280279

281-
// 4. When an Owner isentrolled and the signer is ZTD:
280+
// 4. When an Owner isenrolled and the signer is ZTD:
282281
if (Properties.Identity==DFCI_IDENTITY_SIGNER_ZTD)
283282
{
284283
// a. Allow ZTD to UnEnroll.
285284
// b. Allow ZTD to use hard reset Recovery
285+
// c. Remove SEMM recovery permission
286286
Status |=AddRequiredPermissionEntry (mPermStore,DFCI_SETTING_ID__ZTD_RECOVERY,DFCI_IDENTITY_SIGNER_ZTD,DFCI_PERMISSION_MASK__NONE);
287287
Status |=AddRequiredPermissionEntry (mPermStore,DFCI_SETTING_ID__ZTD_UNENROLL,DFCI_IDENTITY_SIGNER_ZTD,DFCI_PERMISSION_MASK__NONE);
288+
Status |=AddRequiredPermissionEntry (mPermStore,DFCI_SETTING_ID__DFCI_RECOVERY,DFCI_PERMISSION_MASK__NONE,DFCI_PERMISSION_MASK__NONE);
288289
returnEFI_SUCCESS;
289290
}
290291

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp