From 568ddda9b180706e03ead12e2e99bc46cd33a0a6 Mon Sep 17 00:00:00 2001
From: alexke-dev <65682333+alexke-dev@users.noreply.github.com>
Date: Fri, 6 Jan 2023 16:36:29 -0800
Subject: Update ProdScan and WiaDriver samples (#824)

Update ProdScan and WiaDriver samples to target a single architecture.
---
 wia/ProdScan/ProdScan.inf     |  79 ------------------------------------------
 wia/ProdScan/ProdScan.inx     | Bin 0 -> 3734 bytes
 wia/ProdScan/ProdScan.vcxproj |   9 ++++-
 3 files changed, 8 insertions(+), 80 deletions(-)
 delete mode 100644 wia/ProdScan/ProdScan.inf
 create mode 100644 wia/ProdScan/ProdScan.inx

(limited to 'wia/ProdScan')

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
Binary files /dev/null and b/wia/ProdScan/ProdScan.inx differ
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>
-- 
cgit v1.3.1