-EFI_HII_DATABASE_PROTOCOL *mHiiDatabase;\r
-EFI_HII_FONT_PROTOCOL *mHiiFont;\r
-BOOLEAN mFirstAccessFlag = TRUE;\r
-\r
-STATIC EFI_GUID mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};\r
-\r
-static CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
-\r
-static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {\r
- //\r
- // B G R\r
- //\r
- {0x00, 0x00, 0x00, 0x00}, // BLACK\r
- {0x98, 0x00, 0x00, 0x00}, // BLUE\r
- {0x00, 0x98, 0x00, 0x00}, // GREEN\r
- {0x98, 0x98, 0x00, 0x00}, // CYAN\r
- {0x00, 0x00, 0x98, 0x00}, // RED\r
- {0x98, 0x00, 0x98, 0x00}, // MAGENTA\r
- {0x00, 0x98, 0x98, 0x00}, // BROWN\r
- {0x98, 0x98, 0x98, 0x00}, // LIGHTGRAY\r
- {0x30, 0x30, 0x30, 0x00}, // DARKGRAY - BRIGHT BLACK\r
- {0xff, 0x00, 0x00, 0x00}, // LIGHTBLUE - ?\r
- {0x00, 0xff, 0x00, 0x00}, // LIGHTGREEN - ?\r
- {0xff, 0xff, 0x00, 0x00}, // LIGHTCYAN\r
- {0x00, 0x00, 0xff, 0x00}, // LIGHTRED\r
- {0xff, 0x00, 0xff, 0x00}, // LIGHTMAGENTA\r
- {0x00, 0xff, 0xff, 0x00}, // LIGHTBROWN\r
- {0xff, 0xff, 0xff, 0x00} // WHITE\r
+EFI_HII_DATABASE_PROTOCOL *mHiiDatabase;\r
+EFI_HII_FONT_PROTOCOL *mHiiFont;\r
+EFI_HII_HANDLE mHiiHandle;\r
+VOID *mHiiRegistration;\r
+\r
+EFI_GUID mFontPackageListGuid = {\r
+ 0xf5f219d3, 0x7006, 0x4648, { 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad }\r
+};\r
+\r
+CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
+\r
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL mGraphicsEfiColors[16] = {\r
+ //\r
+ // B G R reserved\r
+ //\r
+ { 0x00, 0x00, 0x00, 0x00 }, // BLACK\r
+ { 0x98, 0x00, 0x00, 0x00 }, // LIGHTBLUE\r
+ { 0x00, 0x98, 0x00, 0x00 }, // LIGHGREEN\r
+ { 0x98, 0x98, 0x00, 0x00 }, // LIGHCYAN\r
+ { 0x00, 0x00, 0x98, 0x00 }, // LIGHRED\r
+ { 0x98, 0x00, 0x98, 0x00 }, // MAGENTA\r
+ { 0x00, 0x98, 0x98, 0x00 }, // BROWN\r
+ { 0x98, 0x98, 0x98, 0x00 }, // LIGHTGRAY\r
+ { 0x30, 0x30, 0x30, 0x00 }, // DARKGRAY - BRIGHT BLACK\r
+ { 0xff, 0x00, 0x00, 0x00 }, // BLUE\r
+ { 0x00, 0xff, 0x00, 0x00 }, // LIME\r
+ { 0xff, 0xff, 0x00, 0x00 }, // CYAN\r
+ { 0x00, 0x00, 0xff, 0x00 }, // RED\r
+ { 0xff, 0x00, 0xff, 0x00 }, // FUCHSIA\r
+ { 0x00, 0xff, 0xff, 0x00 }, // YELLOW\r
+ { 0xff, 0xff, 0xff, 0x00 } // WHITE\r