1. free those inserted NsKeyNode resource when releasing SetKeyBoardLayout event.

2. cleanup HiiDataBaseDxe to directly use gEfiHiiKeyBoardLayoutGuid which is used as the guid of event group.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9978 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

@@ -72,7 +72,12 @@
 
 [Guids]  
   gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## Variable:"PlatformLang"
-  
+  ##
+  # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,
+  # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
+  ##
+  gEfiHiiKeyBoardLayoutGuid  ## SOMETIME_CONSUMES  ## Event
+
 [Depex]
   TRUE
 

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c

@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Global variables
 //
 EFI_EVENT gHiiKeyboardLayoutChanged;
-EFI_GUID gHiiSetKbdLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID;
 
 HII_DATABASE_PRIVATE_DATA mPrivate = {
   HII_DATABASE_PRIVATE_DATA_SIGNATURE,
@@ -168,7 +167,7 @@ InitializeHiiDatabase (
                   TPL_NOTIFY,
                   KeyboardLayoutChangeNullEvent,
                   NULL,
-                  &gHiiSetKbdLayoutEventGuid,
+                  &gEfiHiiKeyBoardLayoutGuid,
                   &gHiiKeyboardLayoutChanged
                   );
   if (EFI_ERROR (Status)) {