Update to support to produce Component Name and & Component Name 2 protocol based on Feature flag PcdComponentNameDisable & PcdComponentName2Disable.

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

MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c

@@ -154,15 +154,14 @@ USBMouseDriverBindingEntryPoint (
 
 --*/
 {
-  return EfiLibInstallAllDriverProtocols (
-          ImageHandle,
-          SystemTable,
-          &gUsbMouseDriverBinding,
-          ImageHandle,
-          &gUsbMouseComponentName,
-          NULL,
-          NULL
-          );
+  return EfiLibInstallDriverBindingComponentName2 (
+           ImageHandle,
+           SystemTable,
+           &gUsbMouseDriverBinding,
+           ImageHandle,
+           &gUsbMouseComponentName,
+           &gUsbMouseComponentName2
+           );
 }
 
 
@@ -413,12 +412,21 @@ USBMouseDriverBindingStart (
   if (!EFI_ERROR (Status)) {
 
     UsbMouseDevice->ControllerNameTable = NULL;
-    AddUnicodeString (
+    AddUnicodeString2 (
       "eng",
       gUsbMouseComponentName.SupportedLanguages,
       &UsbMouseDevice->ControllerNameTable,
-      L"Generic Usb Mouse"
+      L"Generic Usb Mouse",
+      TRUE
       );
+    AddUnicodeString2 (
+      "en",
+      gUsbMouseComponentName2.SupportedLanguages,
+      &UsbMouseDevice->ControllerNameTable,
+      L"Generic Usb Mouse",
+      FALSE
+      );
+
 
     return EFI_SUCCESS;
   }