- _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name");\r
- Val.b = TRUE;\r
- if (CBObj.GetFlags () & 0x01) {\r
- _PCATCH(\r
- mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
- EFI_HII_DEFAULT_CLASS_STANDARD,\r
- _GET_CURRQEST_VARTINFO(),\r
- VarStoreName,\r
- _GET_CURRQEST_DATATYPE (),\r
- Val\r
- ),\r
- VFR_RETURN_SUCCESS,\r
- L,\r
- "No standard default storage found"\r
- );\r
- }\r
- if (CBObj.GetFlags () & 0x02) {\r
- _PCATCH(\r
- mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
- EFI_HII_DEFAULT_CLASS_MANUFACTURING,\r
- _GET_CURRQEST_VARTINFO(),\r
- VarStoreName,\r
- _GET_CURRQEST_DATATYPE (),\r
- Val\r
- ),\r
- VFR_RETURN_SUCCESS,\r
- L,\r
- "No manufacturing default storage found"\r
- );\r
+ if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) {\r
+ _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name");\r
+ VarStoreGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId);\r
+ Val.b = TRUE;\r
+ if (CBObj.GetFlags () & 0x01) {\r
+ CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_STANDARD, F);\r
+ _PCATCH(\r
+ mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
+ EFI_HII_DEFAULT_CLASS_STANDARD,\r
+ _GET_CURRQEST_VARTINFO(),\r
+ VarStoreName,\r
+ VarStoreGuid,\r
+ _GET_CURRQEST_DATATYPE (),\r
+ Val\r
+ ),\r
+ VFR_RETURN_SUCCESS,\r
+ L,\r
+ "No standard default storage found"\r
+ );\r
+ }\r
+ if (CBObj.GetFlags () & 0x02) {\r
+ CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_MANUFACTURING, F);\r
+ _PCATCH(\r
+ mCVfrDefaultStore.BufferVarStoreAltConfigAdd (\r
+ EFI_HII_DEFAULT_CLASS_MANUFACTURING,\r
+ _GET_CURRQEST_VARTINFO(),\r
+ VarStoreName,\r
+ VarStoreGuid,\r
+ _GET_CURRQEST_DATATYPE (),\r
+ Val\r
+ ),\r
+ VFR_RETURN_SUCCESS,\r
+ L,\r
+ "No manufacturing default storage found"\r
+ );\r
+ }\r