Failed in applying to current master (
apply log)
BaseTools/Source/C/Include/Common/MdeModuleHii.h | 13 +-
BaseTools/Source/C/VfrCompile/VfrError.cpp | 3 +-
BaseTools/Source/C/VfrCompile/VfrError.h | 3 +-
BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 105 +-
BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 52 +-
BaseTools/Source/C/VfrCompile/VfrSyntax.g | 1238 +++++++++++++-------
BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 241 +++-
BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 23 +-
MdeModulePkg/Include/Guid/MdeModuleHii.h | 20 +-
MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 268 +++--
MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h | 4 +-
MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf | 5 +-
MdeModulePkg/MdeModulePkg.dec | 4 +
.../Universal/DriverSampleDxe/DriverSample.c | 120 ++
.../Universal/DriverSampleDxe/DriverSample.h | 2 +
.../Universal/DriverSampleDxe/NVDataStruc.h | 34 +-
MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 173 +++
.../Universal/DriverSampleDxe/VfrStrings.uni | 61 +
.../Universal/HiiDatabaseDxe/ConfigRouting.c | 247 +++-
.../Universal/HiiDatabaseDxe/HiiDatabase.h | 7 +-
.../Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf | 3 +-
MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c | 139 ++-
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 120 +-
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 3 +
.../Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 3 +-
25 files changed, 2249 insertions(+), 642 deletions(-)