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@3988 6f19259b-4bc3-4df7-8a09-765794883524

Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c

@@ -110,14 +110,16 @@ InitializeWinNtBlockIo(
   //
   // Install driver model protocol(s).
   //
-  Status = EfiLibInstallAllDriverProtocols (
+  Status = EfiLibInstallAllDriverProtocols2 (
              ImageHandle,
              SystemTable,
              &gWinNtBlockIoDriverBinding,
              ImageHandle,
              &gWinNtBlockIoComponentName,
+             &gWinNtBlockIoComponentName2,
              NULL,
-             &gWinNtBlockIoDriverDiagnostics
+             &gWinNtBlockIoDriverDiagnostics,
+             NULL
              );
   ASSERT_EFI_ERROR (Status);
 
@@ -509,12 +511,21 @@ Returns:
 
   Private->ControllerNameTable  = NULL;
 
-  AddUnicodeString (
+  AddUnicodeString2 (
     "eng",
     gWinNtBlockIoComponentName.SupportedLanguages,
     &Private->ControllerNameTable,
-    Private->Filename
+    Private->Filename,
+    TRUE
     );
+  AddUnicodeString2 (
+    "en",
+    gWinNtBlockIoComponentName2.SupportedLanguages,
+    &Private->ControllerNameTable,
+    Private->Filename,
+    FALSE
+    );
+
 
   BlockIo = &Private->BlockIo;
   BlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION;