From b8d6d5584f1691e66f7361a39724647ed4047912 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 28 Feb 2012 05:28:32 +0000 Subject: sync patch r11075, r11087, r11088, r11091, r11092, r11119 from main trunk. Fix AutoUpdateLangVariable() logic to handle the case PlatformLang/Lang is set before PlatformLangCodes/LangCodes. Pre-allocate pool for runtime phase. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2008@13050 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/FSVariable/FSVariable.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'DuetPkg/FSVariable/FSVariable.h') diff --git a/DuetPkg/FSVariable/FSVariable.h b/DuetPkg/FSVariable/FSVariable.h index 2abec3eeba..f01ae648ef 100644 --- a/DuetPkg/FSVariable/FSVariable.h +++ b/DuetPkg/FSVariable/FSVariable.h @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2006 - 2007, Intel Corporation +Copyright (c) 2006 - 2012, Intel Corporation All rights reserved. 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 @@ -28,6 +28,7 @@ Abstract: #include #include #include +#include #include #include #include @@ -91,10 +92,10 @@ typedef struct { VOID *Scratch; // Buffer used during reclaim UINTN CommonVariableTotalSize; UINTN HwErrVariableTotalSize; - CHAR8 PlatformLangCodes[256]; //Pre-allocate 256 bytes space to accommodate the PlatformlangCodes. - CHAR8 LangCodes[256]; //Pre-allocate 256 bytes space to accommodate the langCodes. - CHAR8 PlatformLang[8]; //Pre-allocate 8 bytes space to accommodate the Platformlang variable. - CHAR8 Lang[4]; //Pre-allocate 4 bytes space to accommodate the lang variable. + CHAR8 *PlatformLangCodes; + CHAR8 *LangCodes; + CHAR8 *PlatformLang; + CHAR8 Lang[ISO_639_2_ENTRY_SIZE + 1]; } VARIABLE_GLOBAL; // -- cgit v1.2.3