Update ProdScan and WiaDriver samples (#824)

Update ProdScan and WiaDriver samples to target a single architecture.
microsoft · Jan 7, 2023 · 568ddda · 568ddda
1 parent 7092f6d
commit 568ddda
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 202 deletions.
diff --git a/wia/ProdScan/ProdScan.inf b/wia/ProdScan/ProdScan.inf
diff --git a/wia/ProdScan/ProdScan.inx b/wia/ProdScan/ProdScan.inx
diff --git 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
@@ -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
diff --git 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