Update ProdScan and WiaDriver samples (#824)

Update ProdScan and WiaDriver samples to target a single architecture.

7 files changed, 18 insertions, 202 deletions

diff --git a/wia/ProdScan/ProdScan.inf b/wia/ProdScan/ProdScan.inf
deleted file mode 100644
index 26359afa..00000000
--- a/wia/ProdScan/ProdScan.inf
+++ /dev/null
@@ -1,79 +0,0 @@
-;
-; ProdScan.inf - installation file for the Production Scanner Driver Sample
-;
-; Copyright (c) Microsoft Corporation. All rights reserved.
-;
-; Manufacturer: Microsoft
-;
-[Version]
-Signature="$WINDOWS NT$"
-Class=Image
-ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f}
-Provider=%ProviderString%
-DriverVer=10/16/2015,1.0.0.2
-CatalogFile=prodscan.cat
-PnpLockdown=1
-
-[SourceDisksFiles]
-ProdScan.dll=1
-
-[SourceDisksNames]
-1=%Location%,,,
-
-[DestinationDirs]
-DefaultDestDir = 11
-
-[Manufacturer]
-%ManufacturerName%=Models,NTx86,NTAMD64,NTIA64,NTARM,NTARM64
-
-[Models.NTx86]
-%ProdScan.DeviceDesc% = ProdScan.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[Models.NTAMD64]
-%ProdScan.DeviceDesc% = ProdScan.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[Models.NTIA64]
-%ProdScan.DeviceDesc% = ProdScan.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[Models.NTARM]
-%ProdScan.DeviceDesc% = ProdScan.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[Models.NTARM64]
-%ProdScan.DeviceDesc% = ProdScan.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[ProdScan.Device]
-Include = sti.inf
-Needs = STI.SerialSection
-PortSelect = no
-SubClass = StillImage
-DeviceType = 1
-DeviceSubType = 1
-Capabilities = 0x31
-Events = ProdScan.Events
-AddReg = ProdScan.AddReg
-CopyFiles = ProdScan.CopyFiles
-ICMProfiles = "sRGB Color Space Profile.icm"
-
-[ProdScan.CopyFiles]
-ProdScan.dll
-
-[ProdScan.AddReg]
-HKR,,HardwareConfig,1,1
-HKR,,USDClass,,"{EB135F56-B088-4bc7-9733-422F324B3A09}"
-HKCR,CLSID\{EB135F56-B088-4bc7-9733-422F324B3A09},,,"Production Scanner Driver Sample"
-HKCR,CLSID\{EB135F56-B088-4bc7-9733-422F324B3A09}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\ProdScan.dll
-HKCR,CLSID\{EB135F56-B088-4bc7-9733-422F324B3A09}\InProcServer32,ThreadingModel,,"Both"
-
-[ProdScan.Events]
-ScanEvent = %ScanEvent.Desc%,{A6C5A715-8C6E-11d2-977A-0000F87A926F},*
-
-[ProdScan.Device.Services]
-Include = sti.inf
-Needs = STI.SerialSection.Services
-
-[Strings]
-ManufacturerName="TODO-Set-Manufacturer"
-ProviderString="TODO-Set-Provider"
-Location="Production Scanner Driver Sample Installation Source"
-ProdScan.DeviceDesc = "Production Scanner Test Driver"
-ScanEvent.Desc="Scan"
diff --git a/wia/ProdScan/ProdScan.inx b/wia/ProdScan/ProdScan.inx
new file mode 100644
index 00000000..33d0da88
--- /dev/null
+++ b/wia/ProdScan/ProdScan.inx
diff --git a/wia/ProdScan/ProdScan.vcxproj b/wia/ProdScan/ProdScan.vcxproj
index 2b14d9a8..a94d26db 100644
--- a/wia/ProdScan/ProdScan.vcxproj
+++ b/wia/ProdScan/ProdScan.vcxproj
@@ -74,7 +74,14 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
+  <ItemGroup Label="WrappedTaskItems">
+    <Inf Include="ProdScan.inx">
+      <Architecture>$(InfArch)</Architecture>
+      <SpecifyArchitecture>true</SpecifyArchitecture>
+      <Verbose>true</Verbose>
+      <CopyOutput>.\$(IntDir)\ProdScan.inf</CopyOutput>
+    </Inf>
+  </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>ProdScan</TargetName>
   </PropertyGroup>
diff --git a/wia/copywia.cmd b/wia/copywia.cmd
index 49f6f1cf..df37a38c 100644
--- a/wia/copywia.cmd
+++ b/wia/copywia.cmd
@@ -92,11 +92,11 @@ copy wiadriverex\segfilter\%build_samples%\%cpu_samples%\segfilter.dll   %1wiabi
 copy wiadriverex\imgfilter\%build_samples%\%cpu_samples%\imgfilter.dll   %1wiabins\drivers
 copy wiadriverex\errhandler\%build_samples%\%cpu_samples%\errhandler.dll %1wiabins\drivers
 copy wiadriverex\uiext2\%build_samples%\%cpu_samples%\uiext2.dll         %1wiabins\drivers
-copy wiadriverex\wiadriver.inf                                           %1wiabins\drivers
+copy wiadriverex\usd\%build_samples%\%cpu_samples%\wiadriver.inf         %1wiabins\drivers
 copy wiadriverex\sample.bmp                                              %1wiabins\drivers
 
 copy prodscan\%build_samples%\%cpu_samples%\prodscan.dll                 %1wiabins\drivers
-copy prodscan\prodscan.inf                                               %1wiabins\drivers
+copy prodscan\%build_samples%\%cpu_samples%\prodscan.inf                 %1wiabins\drivers
 
 copy "%build_tools%\%cpu_tools%\wiainfo2.exe"                            %1wiabins
 copy "%build_tools%\%cpu_tools%\wiatrcvw.exe"                            %1wiabins
diff --git a/wia/wiadriverex/usd/WiaDriver.inx b/wia/wiadriverex/usd/WiaDriver.inx
new file mode 100644
index 00000000..d7feb02f
--- /dev/null
+++ b/wia/wiadriverex/usd/WiaDriver.inx
diff --git a/wia/wiadriverex/usd/wiadriverex.vcxproj b/wia/wiadriverex/usd/wiadriverex.vcxproj
index 583c90f4..50129b85 100644
--- a/wia/wiadriverex/usd/wiadriverex.vcxproj
+++ b/wia/wiadriverex/usd/wiadriverex.vcxproj
@@ -74,7 +74,14 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
+  <ItemGroup Label="WrappedTaskItems">
+    <Inf Include="WiaDriver.inx">
+      <Architecture>$(InfArch)</Architecture>
+      <SpecifyArchitecture>true</SpecifyArchitecture>
+      <Verbose>true</Verbose>
+      <CopyOutput>.\$(IntDir)\WiaDriver.inf</CopyOutput>
+    </Inf>
+  </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>wiadriverex</TargetName>
   </PropertyGroup>
diff --git a/wia/wiadriverex/wiadriver.inf b/wia/wiadriverex/wiadriver.inf
deleted file mode 100644
index b0d37528..00000000
--- a/wia/wiadriverex/wiadriver.inf
+++ /dev/null
@@ -1,119 +0,0 @@
-; WIADRIVER.INF  -- WIA Driver setup file
-; Copyright (c) 2003 Microsoft Corporation
-; Manufacturer:  Microsoft Windows Imaging Acquisition Team
-
-[Version]
-Signature="$WINDOWS NT$"
-Class=Image
-ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f}
-Provider=%ProviderString%
-DriverVer=09/20/2004,1.0.0.7
-CatalogFile=wiadriver.cat
-PnpLockdown=1
-
-[SourceDisksFiles]
-wiadriverex.dll=1
-segfilter.dll=1
-imgfilter.dll=1
-errhandler.dll=1
-uiext2.dll=1
-sample.bmp=1
-
-[SourceDisksNames]
-1=%Location%,,,
-
-[DestinationDirs]
-DefaultDestDir=11
-WIADRIVER.StorageFiles=10,ServiceProfiles\LocalService\Documents\WIADRIVER\STORAGE
-
-[Manufacturer]
-%ManufacturerName%=Models, NTx86, NTAMD64, NTIA64, NTARM, NTARM64
-
-; This is the models section for the x86 driver
-[Models.NTx86]
-%WIADRIVER.DeviceDesc% = WIADRIVER.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-; This is the models section for the AMD64 driver
-[Models.NTAMD64]
-%WIADRIVER.DeviceDesc% = WIADRIVER.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-; This is the models section for the IA64 driver
-[Models.NTIA64]
-%WIADRIVER.DeviceDesc% = WIADRIVER.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-; This is the models section for the ARM driver
-[Models.NTARM]
-%WIADRIVER.DeviceDesc% = WIADRIVER.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-; This is the models section for the ARM64 driver
-[Models.NTARM64]
-%WIADRIVER.DeviceDesc% = WIADRIVER.Device, WIADRIVER_PNP_ID, USB\MS_COMP_SCAN&MS_SUBCOMP_WIAPNPID
-
-[WIADRIVER.Device]
-Include=sti.inf
-Needs=STI.SerialSection
-PortSelect=no
-SubClass=StillImage
-DeviceType=1
-DeviceSubType=0x1
-Capabilities=0x30
-Events=WIADRIVER.Events
-DeviceData=WIADRIVER.DeviceData
-AddReg=WIADRIVER.AddReg
-CopyFiles=WIADRIVER.CopyFiles,WIADRIVER.StorageFiles
-ICMProfiles="sRGB Color Space Profile.icm"
-
-[WIADRIVER.Events]
-
-[WIADRIVER.Device.Services]
-Include=sti.inf
-Needs=STI.SerialSection.Services
-
-[WIADRIVER.DeviceData]
-UI Class ID={07DD9E07-ECC0-438a-B5EB-C5227ECA910E}
-StoragePath=%10%\ServiceProfiles\LocalService\Documents\WIADRIVER\STORAGE
-
-[WIADRIVER.AddReg]
-HKR,,HardwareConfig,1,1
-HKR,,USDClass,,"{EEA1E6F7-A59C-487a-BFFA-BD8AA99FE503}"
-HKCR,CLSID\{EEA1E6F7-A59C-487a-BFFA-BD8AA99FE503},,,"Extended WIA Driver"
-HKCR,CLSID\{EEA1E6F7-A59C-487a-BFFA-BD8AA99FE503}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\wiadriverex.dll
-HKCR,CLSID\{EEA1E6F7-A59C-487a-BFFA-BD8AA99FE503}\InProcServer32,ThreadingModel,,"Both"
-
-HKCR,CLSID\{07DD9E07-ECC0-438a-B5EB-C5227ECA910E},,,"WIA Driver UI Extension"
-HKCR,CLSID\{07DD9E07-ECC0-438a-B5EB-C5227ECA910E}\shellex\SegmentationFilter\{7B6D704B-A4F2-4ecf-8B86-8E0CF1A707F5}
-HKCR,CLSID\{07DD9E07-ECC0-438a-B5EB-C5227ECA910E}\shellex\ImageProcessingFilter\{AA9198F3-3B91-47d3-A371-EBE7D243F606}
-HKCR,CLSID\{07DD9E07-ECC0-438a-B5EB-C5227ECA910E}\shellex\ErrorHandler\{CFC1A4D4-5F27-4881-81E4-1BE314EB22F7}
-HKCR,CLSID\{07DD9E07-ECC0-438a-B5EB-C5227ECA910E}\shellex\WiaDialogExtensionHandlers\{61364062-0593-4eda-84d2-f5531d8c3259}
-
-HKCR,CLSID\{7B6D704B-A4F2-4ecf-8B86-8E0CF1A707F5},,,"WIA Sample Segmentation Filter"
-HKCR,CLSID\{7B6D704B-A4F2-4ecf-8B86-8E0CF1A707F5}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\segfilter.dll
-HKCR,CLSID\{7B6D704B-A4F2-4ecf-8B86-8E0CF1A707F5}\InProcServer32,ThreadingModel,,"Both"
-
-HKCR,CLSID\{AA9198F3-3B91-47d3-A371-EBE7D243F606},,,"WIA Sample Image Processing Filter"
-HKCR,CLSID\{AA9198F3-3B91-47d3-A371-EBE7D243F606}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\imgfilter.dll
-HKCR,CLSID\{AA9198F3-3B91-47d3-A371-EBE7D243F606}\InProcServer32,ThreadingModel,,"Both"
-
-HKCR,CLSID\{CFC1A4D4-5F27-4881-81E4-1BE314EB22F7},,,"WIA Sample Error Handler"
-HKCR,CLSID\{CFC1A4D4-5F27-4881-81E4-1BE314EB22F7}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\errhandler.dll
-HKCR,CLSID\{CFC1A4D4-5F27-4881-81E4-1BE314EB22F7}\InProcServer32,ThreadingModel,,"Both"
-
-HKCR,CLSID\{61364062-0593-4eda-84d2-f5531d8c3259},,,"WIA Dialog Extension Handler"
-HKCR,CLSID\{61364062-0593-4eda-84d2-f5531d8c3259}\InProcServer32,,0x00020000,%%SystemRoot%%\System32\uiext2.dll
-HKCR,CLSID\{61364062-0593-4eda-84d2-f5531d8c3259}\InProcServer32,ThreadingModel,,"Both"
-
-[WIADRIVER.CopyFiles]
-wiadriverex.dll
-segfilter.dll
-imgfilter.dll
-errhandler.dll
-uiext2.dll
-
-[WIADRIVER.StorageFiles]
-sample.bmp
-
-[Strings]
-ManufacturerName="TODO-Set-Manufacturer"
-ProviderString="TODO-Set-Provider"
-Location="WIA Monster Device Driver Installation Source"
-WIADRIVER.DeviceDesc="Extended WIA Monster Device"