Index: launch.py
===================================================================
--- launch.py	(revision 11)
+++ launch.py	(working copy)
@@ -1,7 +1,7 @@
 ## @file
 # Main entry point and code generator for UEFI Driver Wizard
 #
-# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials are licensed and made available
 # under the terms and conditions of the BSD License which accompanies this
@@ -545,16 +546,16 @@
       Dictionary['ConsumedProtocol'] = ''
       Dictionary['ConsumedProtocolIncludeFile'] = ''
       if u"PCI Driver that consumes the PCI I/O Protocol" in Config.UefiDriverConsumedProtocols:
-        Dictionary['ConsumedProtocol'] = 'gEfiPciIoProtocolGuid'
+        Dictionary['ConsumedProtocol'] = 'gEfiPciIoProtocolGuid                         ## TO_START'
         Dictionary['ConsumedProtocolIncludeFile'] = 'PciIo.h'
       if u"USB Driver that consumes the USB I/O Protocol" in Config.UefiDriverConsumedProtocols:
-        Dictionary['ConsumedProtocol'] = 'gEfiUsbIoProtocolGuid'
+        Dictionary['ConsumedProtocol'] = 'gEfiUsbIoProtocolGuid                         ## TO_START'
         Dictionary['ConsumedProtocolIncludeFile'] = 'UsbIo.h'
       if u"SCSI Driver that consumes the SCSI I/O Protocol" in Config.UefiDriverConsumedProtocols:
-        Dictionary['ConsumedProtocol'] = 'gEfiScsiIoProtocolGuid'
+        Dictionary['ConsumedProtocol'] = 'gEfiScsiIoProtocolGuid                        ## TO_START'
         Dictionary['ConsumedProtocolIncludeFile'] = 'ScsiIo.h'
       if u"ATA Driver that consumes the ATA Pass Thru Protocol" in Config.UefiDriverConsumedProtocols:
-        Dictionary['ConsumedProtocol'] = 'gEfiAtaPassThruProtocolGuid'
+        Dictionary['ConsumedProtocol'] = 'gEfiAtaPassThruProtocolGuid                   ## TO_START'
         Dictionary['ConsumedProtocolIncludeFile'] = 'AtaPassThru.h'
 
       Dictionary['SimpleTextInputEnabled']        = []
@@ -615,9 +616,11 @@
       if u"Platform driver producing the EDID Override Protocol" in Config.UefiDriverProducedProtocols:
         Dictionary['EdidOverrideEnabled'] = ['']
 
-      self.ProcessTemplate('Templates/UefiDriver.inf', Dictionary, Config.UefiDriverName + '.inf')
-      self.ProcessTemplate('Templates/UefiDriver.c',   Dictionary, Config.UefiDriverName + '.c')
-      self.ProcessTemplate('Templates/UefiDriver.h',   Dictionary, Config.UefiDriverName + '.h')
+      self.ProcessTemplate('Templates/UefiDriver.inf',          Dictionary, Config.UefiDriverName + '.inf')
+      self.ProcessTemplate('Templates/UefiDriver.c',            Dictionary, Config.UefiDriverName + '.c')
+      self.ProcessTemplate('Templates/UefiDriver.h',            Dictionary, Config.UefiDriverName + '.h')
+      self.ProcessTemplate('Templates/UefiDriverExtra.uni',     Dictionary, Config.UefiDriverName + 'Extra.uni',   Encoding='utf-16')
+      self.ProcessTemplate('Templates/UefiDriverModStrs.uni',   Dictionary, Config.UefiDriverName + 'ModStrs.uni', Encoding='utf-16')
       if Dictionary['UefiDriverModelEnabled'] <> []:
         self.ProcessTemplate('Templates/DriverBinding.h', Dictionary, 'DriverBinding.h')
       if Dictionary['ComponentNameEnabled'] <> []:
Index: Templates/UefiDriver.inf
===================================================================
--- Templates/UefiDriver.inf	(revision 11)
+++ Templates/UefiDriver.inf	(working copy)
@@ -3,7 +3,7 @@
 #
 # UEFI Driver Wizard template file
 #
-# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials are licensed and made 
 # available under the terms and conditions of the BSD License which 
@@ -37,11 +37,15 @@
 <<END>>
   VERSION_STRING            = <<DriverVersionString>>
   ENTRY_POINT               = <<DriverName>>DriverEntryPoint
+  MODULE_UNI_FILE           = <<DriverName>>ModStrs.uni
 <<BEGIN>>  <<UnloadEnabled>>UNLOAD_IMAGE              = <<DriverName>>Unload
 <<END>>
 <<BEGIN>>  <<HiiEnabled>>UEFI_HII_RESOURCE_SECTION = TRUE
 <<END>>
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  <<DriverName>>Extra.uni
+
 [Packages]
   MdePkg/MdePkg.dec
 
@@ -162,78 +166,78 @@
 <<END>>
 
 [Protocols]
-<<BEGIN>>  <<UefiDriverModelEnabled>>gEfiDriverBindingProtocolGuid
-<<END>>
 <<BEGIN>>  <<UefiDriverModelEnabled>><<ConsumedProtocol>>
 <<END>>
-<<BEGIN>>  <<DriverSupportedEfiVersionEnabled>>gEfiDriverSupportedEfiVersionProtocolGuid
+<<BEGIN>>  <<UefiDriverModelEnabled>>gEfiDriverBindingProtocolGuid                 ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<HiiEnabled>>gEfiHiiPackageListProtocolGuid
+<<BEGIN>>  <<DriverSupportedEfiVersionEnabled>>gEfiDriverSupportedEfiVersionProtocolGuid     ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<HiiEnabled>>gEfiHiiDatabaseProtocolGuid
+<<BEGIN>>  <<HiiEnabled>>gEfiHiiPackageListProtocolGuid                ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<ComponentNameEnabled>>gEfiComponentName2ProtocolGuid
+<<BEGIN>>  <<HiiEnabled>>gEfiHiiDatabaseProtocolGuid                   ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<ComponentNameEnabled>>gEfiComponentNameProtocolGuid
+<<BEGIN>>  <<ComponentNameEnabled>>gEfiComponentName2ProtocolGuid                ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverDiagnosticsEnabled>>gEfiDriverDiagnostics2ProtocolGuid
+<<BEGIN>>  <<ComponentNameEnabled>>gEfiComponentNameProtocolGuid                 ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverDiagnosticsEnabled>>gEfiDriverDiagnosticsProtocolGuid
+<<BEGIN>>  <<DriverDiagnosticsEnabled>>gEfiDriverDiagnostics2ProtocolGuid            ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverConfigurationEnabled>>gEfiDriverConfiguration2ProtocolGuid
+<<BEGIN>>  <<DriverDiagnosticsEnabled>>gEfiDriverDiagnosticsProtocolGuid             ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverConfigurationEnabled>>gEfiDriverConfigurationProtocolGuid
+<<BEGIN>>  <<DriverConfigurationEnabled>>gEfiDriverConfiguration2ProtocolGuid          ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverFamilyOverrideEnabled>>gEfiDriverFamilyOverrideProtocolGuid
+<<BEGIN>>  <<DriverConfigurationEnabled>>gEfiDriverConfigurationProtocolGuid           ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<DriverHealthEnabled>>gEfiDriverHealthProtocolGuid
+<<BEGIN>>  <<DriverFamilyOverrideEnabled>>gEfiDriverFamilyOverrideProtocolGuid          ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<BusSpecificDriverOverrideEnabled>>gEfiBusSpecificDriverOverrideProtocolGuid
+<<BEGIN>>  <<DriverHealthEnabled>>gEfiDriverHealthProtocolGuid                  ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<HiiConfigAccessEnabled>>gEfiHiiConfigAccessProtocolGuid
+<<BEGIN>>  <<BusSpecificDriverOverrideEnabled>>gEfiBusSpecificDriverOverrideProtocolGuid     ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<SimpleTextInputEnabled>>gEfiSimpleTextInProtocolGuid
+<<BEGIN>>  <<HiiConfigAccessEnabled>>gEfiHiiConfigAccessProtocolGuid               ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<SimpleTextInputEnabled>>gEfiSimpleTextInputExProtocolGuid
+<<BEGIN>>  <<SimpleTextInputEnabled>>gEfiSimpleTextInProtocolGuid                  ## BY_START
 <<END>>
-<<BEGIN>>  <<SimplePointerEnabled>>gEfiSimplePointerProtocolGuid
+<<BEGIN>>  <<SimpleTextInputEnabled>>gEfiSimpleTextInputExProtocolGuid             ## BY_START
 <<END>>
-<<BEGIN>>  <<AbsolutePointerEnabled>>gEfiAbsolutePointerProtocolGuid
+<<BEGIN>>  <<SimplePointerEnabled>>gEfiSimplePointerProtocolGuid                 ## BY_START
 <<END>>
-<<BEGIN>>  <<SimpleTextOutputEnabled>>gEfiSimpleTextOutProtocolGuid
+<<BEGIN>>  <<AbsolutePointerEnabled>>gEfiAbsolutePointerProtocolGuid               ## BY_START
 <<END>>
-<<BEGIN>>  <<SerialIoEnabled>>gEfiSerialIoProtocolGuid
+<<BEGIN>>  <<SimpleTextOutputEnabled>>gEfiSimpleTextOutProtocolGuid                 ## BY_START
 <<END>>
-<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiGraphicsOutputProtocolGuid
+<<BEGIN>>  <<SerialIoEnabled>>gEfiSerialIoProtocolGuid                      ## BY_START
 <<END>>
-<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiEdidDiscoveredProtocolGuid
+<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiGraphicsOutputProtocolGuid                ## BY_START
 <<END>>
-<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiEdidActiveProtocolGuid
+<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiEdidDiscoveredProtocolGuid                ## BY_START
 <<END>>
-<<BEGIN>>  <<BlockIoEnabled>>gEfiBlockIoProtocolGuid
+<<BEGIN>>  <<GraphicsOutputEnabled>>gEfiEdidActiveProtocolGuid                    ## BY_START
 <<END>>
-<<BEGIN>>  <<BlockIoEnabled>>gEfiBlockIo2ProtocolGuid
+<<BEGIN>>  <<BlockIoEnabled>>gEfiBlockIoProtocolGuid                       ## BY_START
 <<END>>
-<<BEGIN>>  <<StorageSecurityCommandEnabled>>gEfiStorageSecurityCommandProtocolGuid
+<<BEGIN>>  <<BlockIoEnabled>>gEfiBlockIo2ProtocolGuid                      ## BY_START
 <<END>>
-<<BEGIN>>  <<NiiUndiEnabled>>gEfiNetworkInterfaceIdentifierProtocolGuid_31
+<<BEGIN>>  <<StorageSecurityCommandEnabled>>gEfiStorageSecurityCommandProtocolGuid        ## ALWAYS_PRODUCES
 <<END>>
-<<BEGIN>>  <<SimpleNetworkEnabled>>gEfiSimpleNetworkProtocolGuid
+<<BEGIN>>  <<NiiUndiEnabled>>gEfiNetworkInterfaceIdentifierProtocolGuid_31 ## BY_START
 <<END>>
-<<BEGIN>>  <<Usb2HostControllerEnabled>>gEfiUsb2HcProtocolGuid
+<<BEGIN>>  <<SimpleNetworkEnabled>>gEfiSimpleNetworkProtocolGuid                 ## BY_START
 <<END>>
-<<BEGIN>>  <<ScsiPassThruEnabled>>gEfiScsiPassThruProtocolGuid
+<<BEGIN>>  <<Usb2HostControllerEnabled>>gEfiUsb2HcProtocolGuid                        ## BY_START
 <<END>>
-<<BEGIN>>  <<ExtScsiPassThruEnabled>>gEfiExtScsiPassThruProtocolGuid
+<<BEGIN>>  <<ScsiPassThruEnabled>>gEfiScsiPassThruProtocolGuid                  ## BY_START
 <<END>>
-<<BEGIN>>  <<AtaPassThruEnabled>>gEfiAtaPassThruProtocolGuid
+<<BEGIN>>  <<ExtScsiPassThruEnabled>>gEfiExtScsiPassThruProtocolGuid                ## BY_START
 <<END>>
-<<BEGIN>>  <<UserCredentialEnabled>>gEfiUserCredential2ProtocolGuid
+<<BEGIN>>  <<AtaPassThruEnabled>>gEfiAtaPassThruProtocolGuid                    ## BY_START
 <<END>>
-<<BEGIN>>  <<LoadFileEnabled>>gEfiLoadFileProtocolGuid
+<<BEGIN>>  <<UserCredentialEnabled>>gEfiUserCredential2ProtocolGuid                ## BY_START
 <<END>>
-<<BEGIN>>  <<EdidOverrideEnabled>>gEfiEdidOverrideProtocolGuid
+<<BEGIN>>  <<LoadFileEnabled>>gEfiLoadFileProtocolGuid                       ## BY_START
 <<END>>
+<<BEGIN>>  <<EdidOverrideEnabled>>gEfiEdidOverrideProtocolGuid                   ## BY_START
+<<END>>
 
 [Guids]
 
Index: Templates/UefiDriverExtra.uni
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Templates/UefiDriverExtra.uni
===================================================================
--- Templates/UefiDriverExtra.uni	(revision 0)
+++ Templates/UefiDriverExtra.uni	(working copy)

Property changes on: Templates/UefiDriverExtra.uni
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Templates/UefiDriverModStrs.uni
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Templates/UefiDriverModStrs.uni
===================================================================
--- Templates/UefiDriverModStrs.uni	(revision 0)
+++ Templates/UefiDriverModStrs.uni	(working copy)

Property changes on: Templates/UefiDriverModStrs.uni
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
