Fixed #373

Removed Win32 build configuration of driver
nefarius · Jul 11, 2024 · 3ab1158 · 3ab1158
1 parent d084d6a
commit 3ab1158
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 91 deletions.
diff --git a/dshidmini.sln b/dshidmini.sln
@@ -68,9 +68,7 @@ Global
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.ActiveCfg = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.Build.0 = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x64.Deploy.0 = Debug|x64
-		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x86.ActiveCfg = Debug|Win32
-		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x86.Build.0 = Debug|Win32
-		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x86.Deploy.0 = Debug|Win32
+		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug_OTEL|x86.ActiveCfg = Release|Win32
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.Build.0 = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|Any CPU.Deploy.0 = Debug|x64
@@ -80,7 +78,7 @@ Global
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x64.ActiveCfg = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x64.Build.0 = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x64.Deploy.0 = Debug|x64
-		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x86.ActiveCfg = Debug|Win32
+		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Debug|x86.ActiveCfg = Debug|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|Any CPU.ActiveCfg = Release|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|ARM64.ActiveCfg = Release|ARM64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release_OTEL|x64.ActiveCfg = Release|x64
@@ -94,7 +92,7 @@ Global
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x64.ActiveCfg = Release|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x64.Build.0 = Release|x64
 		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x64.Deploy.0 = Release|x64
-		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x86.ActiveCfg = Release|Win32
+		{BEAF5753-7811-465B-8FED-CFB114DA66A5}.Release|x86.ActiveCfg = Release|x64
 		{30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|Any CPU.ActiveCfg = Debug|x64
 		{30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|ARM64.ActiveCfg = Debug|x64
 		{30CAEA37-74D5-4219-AF2D-827F12FF6ECF}.Debug_OTEL|x64.ActiveCfg = Debug|x64

diff --git a/sys/dshidmini.vcxproj b/sys/dshidmini.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -104,16 +96,6 @@
     <RootNamespace>dshidmini</RootNamespace>
     <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
   <PropertyGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -135,16 +117,6 @@
     <DriverTargetPlatform>Universal</DriverTargetPlatform>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -173,19 +145,6 @@
     <Import Project="DMF.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)bin\DEBUG\$(DDKPlatform)\</OutDir>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-    <TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
-    <OutDir>$(SolutionDir)bin\$(DDKPlatform)\</OutDir>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-    <TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
-    <SignMode>Off</SignMode>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
     <OutDir>$(SolutionDir)bin\DEBUG\$(DDKPlatform)\</OutDir>
@@ -212,47 +171,6 @@
     <TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
     <SignMode>Off</SignMode>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);DMF_USER_MODE</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(DmfRootPath)\DMF\Modules.Library;$(DmfRootPath)\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;BluetoothApis.lib</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>libcmtd;%(IgnoreSpecificDefaultLibraries);kernel32.lib;user32.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <MessageCompile>
-      <GenerateUserModeLoggingMacros>true</GenerateUserModeLoggingMacros>
-    </MessageCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <WppRecorderEnabled>true</WppRecorderEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile.ScanConfigurationData)' == ''">trace.h</WppScanConfigurationData>
-      <PreprocessorDefinitions>_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions);DMF_USER_MODE</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(DmfRootPath)\DMF\Modules.Library;$(DmfRootPath)\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;BluetoothApis.lib</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);kernel32.lib;user32.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Inf />
-    <Inf>
-      <TimeStamp>1.0.0.0</TimeStamp>
-    </Inf>
-    <DriverSign>
-      <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
-    </DriverSign>
-    <MessageCompile>
-      <GenerateUserModeLoggingMacros>true</GenerateUserModeLoggingMacros>
-    </MessageCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WppEnabled>true</WppEnabled>
@@ -326,6 +244,9 @@
     <MessageCompile>
       <GenerateUserModeLoggingMacros>true</GenerateUserModeLoggingMacros>
     </MessageCompile>
+    <Inf>
+      <TimeStamp>1.0.0.0</TimeStamp>
+    </Inf>
   </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
@@ -339,14 +260,10 @@
   </ItemGroup>
   <ItemGroup>
     <MessageCompile Include="DsHidMini.man">
-      <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</UseBaseNameOfInput>
-      <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</UseBaseNameOfInput>
       <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</UseBaseNameOfInput>
       <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</UseBaseNameOfInput>
       <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</UseBaseNameOfInput>
       <UseBaseNameOfInput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</UseBaseNameOfInput>
-      <GeneratedFilesBaseName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)ETW</GeneratedFilesBaseName>
-      <GeneratedFilesBaseName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename)ETW</GeneratedFilesBaseName>
       <GeneratedFilesBaseName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">%(Filename)ETW</GeneratedFilesBaseName>
       <GeneratedFilesBaseName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">%(Filename)ETW</GeneratedFilesBaseName>
       <GeneratedFilesBaseName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)ETW</GeneratedFilesBaseName>