build: More INF fixes and prefer 64 bit for control panel

Author: vitoplantamura

AmtPtpControlPanel/AmtPtpControlPanel.csproj

@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

build/AmtPtpDevice_AMD64.inf

@@ -83,13 +83,13 @@ AmtPtpDeviceUsbUm.dll
 ; PTP filter
 [AmtPtpHidFilter_MiniPortDevice.NT]
 CopyFiles=FilterDriver_Payload
-Include=mshidioc.inf
-Needs=mshidkmdf.NT
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf.NT
 
 [AmtPtpHidFilter_MiniPortDevice.NT.Services]
 AddService = AmtPtpHidFilter,, AmtPtpHidFilter_Service_Inst
-Include=mshidioc.inf
-Needs=mshidkmdf.NT.Services
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf.NT.Services
 
 [AmtPtpHidFilter_MiniPortDevice.NT.HW]
 AddReg=AmtPtpHidFilter_AddReg
@@ -114,15 +114,15 @@ KmdfLibraryVersion = 1.15
 ; USB UM
 [AmtPtpDeviceUsbUm_Install.NT]
 CopyFiles=PtpUmDrivers_Dir
-Include=mshidioc.inf, wudfrd.inf
-Needs=mshidumdf.NT, WUDFRD.NT
+Include=MsHidUmdf.inf, WUDFRD.inf
+Needs=MsHidUmdf.NT, WUDFRD.NT
 
 [AmtPtpDeviceUsbUm_Install.NT.hw]
 AddReg=AmtPtpDeviceUsbUm_AddReg
 
 [AmtPtpDeviceUsbUm_Install.NT.Services]
-Include=mshidioc.inf, wudfrd.inf
-Needs=mshidumdf.NT.Services, WUDFRD.NT.Services
+Include=MsHidUmdf.inf, WUDFRD.inf
+Needs=MsHidUmdf.NT.Services, WUDFRD.NT.Services
 
 [AmtPtpDeviceUsbUm_Install.NT.Wdf]
 UmdfDispatcher=NativeUSB

build/AmtPtpDevice_ARM64.inf

@@ -83,13 +83,13 @@ AmtPtpDeviceUsbUm.dll
 ; PTP filter
 [AmtPtpHidFilter_MiniPortDevice.NT]
 CopyFiles=FilterDriver_Payload
-Include=mshidioc.inf
-Needs=mshidkmdf.NT
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf.NT
 
 [AmtPtpHidFilter_MiniPortDevice.NT.Services]
 AddService = AmtPtpHidFilter,, AmtPtpHidFilter_Service_Inst
-Include=mshidioc.inf
-Needs=mshidkmdf.NT.Services
+Include=MsHidKmdf.inf
+Needs=MsHidKmdf.NT.Services
 
 [AmtPtpHidFilter_MiniPortDevice.NT.HW]
 AddReg=AmtPtpHidFilter_AddReg
@@ -114,15 +114,15 @@ KmdfLibraryVersion = 1.15
 ; USB UM
 [AmtPtpDeviceUsbUm_Install.NT]
 CopyFiles=PtpUmDrivers_Dir
-Include=mshidioc.inf, wudfrd.inf
-Needs=mshidumdf.NT, WUDFRD.NT
+Include=MsHidUmdf.inf, WUDFRD.inf
+Needs=MsHidUmdf.NT, WUDFRD.NT
 
 [AmtPtpDeviceUsbUm_Install.NT.hw]
 AddReg=AmtPtpDeviceUsbUm_AddReg
 
 [AmtPtpDeviceUsbUm_Install.NT.Services]
-Include=mshidioc.inf, wudfrd.inf
-Needs=mshidumdf.NT.Services, WUDFRD.NT.Services
+Include=MsHidUmdf.inf, WUDFRD.inf
+Needs=MsHidUmdf.NT.Services, WUDFRD.NT.Services
 
 [AmtPtpDeviceUsbUm_Install.NT.Wdf]
 UmdfDispatcher=NativeUSB