Skip to content

Commit 061158c

Browse files
Psychlist1972Psychlist1972
authored
Merge pull request #471 from microsoft/bidifornonbidifix
Winmm reliability for large messages, winmm compatibility with applications that don't coinitialize
2 parents 1edd787 + aef906e commit 061158c

File tree

34 files changed

+2186
-39
lines changed

34 files changed

+2186
-39
lines changed

‎src/api/Client/WinMM/wdmaud2.vcxproj

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM64</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|Win32">
9+
<Configuration>Debug</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|ARM64">
913
<Configuration>Release</Configuration>
1014
<Platform>ARM64</Platform>
@@ -13,6 +17,10 @@
1317
<Configuration>Debug</Configuration>
1418
<Platform>x64</Platform>
1519
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
1624
<ProjectConfiguration Include="Release|x64">
1725
<Configuration>Release</Configuration>
1826
<Platform>x64</Platform>
@@ -31,6 +39,12 @@
3139
<PlatformToolset>v143</PlatformToolset>
3240
<CharacterSet>Unicode</CharacterSet>
3341
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
43+
<ConfigurationType>DynamicLibrary</ConfigurationType>
44+
<UseDebugLibraries>true</UseDebugLibraries>
45+
<PlatformToolset>v143</PlatformToolset>
46+
<CharacterSet>Unicode</CharacterSet>
47+
</PropertyGroup>
3448
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
3549
<ConfigurationType>DynamicLibrary</ConfigurationType>
3650
<UseDebugLibraries>true</UseDebugLibraries>
@@ -43,6 +57,12 @@
4357
<PlatformToolset>v143</PlatformToolset>
4458
<CharacterSet>Unicode</CharacterSet>
4559
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
61+
<ConfigurationType>DynamicLibrary</ConfigurationType>
62+
<UseDebugLibraries>false</UseDebugLibraries>
63+
<PlatformToolset>v143</PlatformToolset>
64+
<CharacterSet>Unicode</CharacterSet>
65+
</PropertyGroup>
4666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
4767
<ConfigurationType>DynamicLibrary</ConfigurationType>
4868
<UseDebugLibraries>false</UseDebugLibraries>
@@ -57,12 +77,18 @@
5777
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5878
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5979
</ImportGroup>
80+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
81+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
82+
</ImportGroup>
6083
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
6184
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6285
</ImportGroup>
6386
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6487
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6588
</ImportGroup>
89+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
90+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
91+
</ImportGroup>
6692
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
6793
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6894
</ImportGroup>
@@ -73,6 +99,12 @@
7399
<IntDir>$(SolutionDir)VSFiles\intermediate\wdmaud2\$(Platform)\$(Configuration)\</IntDir>
74100
<TargetExt>.drv</TargetExt>
75101
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
103+
<LinkIncremental>true</LinkIncremental>
104+
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
105+
<IntDir>$(SolutionDir)VSFiles\intermediate\wdmaud2\$(Platform)\$(Configuration)\</IntDir>
106+
<TargetExt>.drv</TargetExt>
107+
</PropertyGroup>
76108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
77109
<LinkIncremental>true</LinkIncremental>
78110
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
@@ -85,6 +117,12 @@
85117
<IntDir>$(SolutionDir)VSFiles\intermediate\wdmaud2\$(Platform)\$(Configuration)\</IntDir>
86118
<TargetExt>.drv</TargetExt>
87119
</PropertyGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
121+
<LinkIncremental>true</LinkIncremental>
122+
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
123+
<IntDir>$(SolutionDir)VSFiles\intermediate\wdmaud2\$(Platform)\$(Configuration)\</IntDir>
124+
<TargetExt>.drv</TargetExt>
125+
</PropertyGroup>
88126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
89127
<LinkIncremental>true</LinkIncremental>
90128
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
@@ -108,6 +146,23 @@
108146
<RegisterOutput>false</RegisterOutput>
109147
</Link>
110148
</ItemDefinitionGroup>
149+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
150+
<ClCompile>
151+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WDMAUD2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<WarningLevel>Level3</WarningLevel>
153+
<PrecompiledHeader>Create</PrecompiledHeader>
154+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
155+
<LanguageStandard>stdcpp20</LanguageStandard>
156+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(ProjectDir)\..\Inc;$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\MidiSrv\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midi2.midisrvtransport\$(Platform)\$(Configuration)</AdditionalIncludeDirectories>
157+
</ClCompile>
158+
<Link>
159+
<GenerateDebugInformation>true</GenerateDebugInformation>
160+
<SubSystem>Windows</SubSystem>
161+
<ModuleDefinitionFile>winmmdrv.def</ModuleDefinitionFile>
162+
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);winmm.lib;onecoreuap.lib;avrt.lib;$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\midixproc.lib;$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\midisrvtransportlib.lib</AdditionalDependencies>
163+
<RegisterOutput>false</RegisterOutput>
164+
</Link>
165+
</ItemDefinitionGroup>
111166
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
112167
<ClCompile>
113168
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WDMAUD2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -144,6 +199,25 @@
144199
<RegisterOutput>false</RegisterOutput>
145200
</Link>
146201
</ItemDefinitionGroup>
202+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
203+
<ClCompile>
204+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WDMAUD2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
205+
<WarningLevel>Level3</WarningLevel>
206+
<PrecompiledHeader>Create</PrecompiledHeader>
207+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
208+
<LanguageStandard>stdcpp20</LanguageStandard>
209+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(ProjectDir)\..\Inc;$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\MidiSrv\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midi2.midisrvtransport\$(Platform)\$(Configuration)</AdditionalIncludeDirectories>
210+
</ClCompile>
211+
<Link>
212+
<GenerateDebugInformation>true</GenerateDebugInformation>
213+
<SubSystem>Windows</SubSystem>
214+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
215+
<OptimizeReferences>true</OptimizeReferences>
216+
<ModuleDefinitionFile>winmmdrv.def</ModuleDefinitionFile>
217+
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);winmm.lib;onecoreuap.lib;avrt.lib;$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\midixproc.lib;$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\midisrvtransportlib.lib</AdditionalDependencies>
218+
<RegisterOutput>false</RegisterOutput>
219+
</Link>
220+
</ItemDefinitionGroup>
147221
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
148222
<ClCompile>
149223
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WDMAUD2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎src/api/Drivers/MinMidi/Driver/Driver.vcxproj

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|x64">
59
<Configuration>Debug</Configuration>
610
<Platform>x64</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|x64">
917
<Configuration>Release</Configuration>
1018
<Platform>x64</Platform>
@@ -36,6 +44,14 @@
3644
<DriverType>WDM</DriverType>
3745
<CharacterSet>Unicode</CharacterSet>
3846
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
48+
<TargetVersion>Windows10</TargetVersion>
49+
<UseDebugLibraries>true</UseDebugLibraries>
50+
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
51+
<ConfigurationType>Driver</ConfigurationType>
52+
<DriverType>WDM</DriverType>
53+
<CharacterSet>Unicode</CharacterSet>
54+
</PropertyGroup>
3955
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4056
<TargetVersion>Windows10</TargetVersion>
4157
<UseDebugLibraries>false</UseDebugLibraries>
@@ -44,6 +60,14 @@
4460
<DriverType>WDM</DriverType>
4561
<CharacterSet>Unicode</CharacterSet>
4662
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
64+
<TargetVersion>Windows10</TargetVersion>
65+
<UseDebugLibraries>false</UseDebugLibraries>
66+
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
67+
<ConfigurationType>Driver</ConfigurationType>
68+
<DriverType>WDM</DriverType>
69+
<CharacterSet>Unicode</CharacterSet>
70+
</PropertyGroup>
4771
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
4872
<TargetVersion>Windows10</TargetVersion>
4973
<UseDebugLibraries>true</UseDebugLibraries>
@@ -76,6 +100,14 @@
76100
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
77101
<IntDir>$(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
78102
</PropertyGroup>
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
104+
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
105+
<TargetName>MinMidi</TargetName>
106+
<IncludePath>$(CRT_IncludePath);$(KM_IncludePath);$(KIT_SHARED_IncludePath);$(SolutionDir)\inc;</IncludePath>
107+
<ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</ExternalIncludePath>
108+
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
109+
<IntDir>$(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
110+
</PropertyGroup>
79111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
80112
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
81113
<TargetName>MinMidi</TargetName>
@@ -84,6 +116,14 @@
84116
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
85117
<IntDir>$(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
86118
</PropertyGroup>
119+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
120+
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
121+
<TargetName>MinMidi</TargetName>
122+
<IncludePath>$(CRT_IncludePath);$(KM_IncludePath);$(KIT_SHARED_IncludePath);$(SolutionDir)\inc;</IncludePath>
123+
<ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</ExternalIncludePath>
124+
<OutDir>$(SolutionDir)VSFiles\$(Platform)\$(Configuration)\</OutDir>
125+
<IntDir>$(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
126+
</PropertyGroup>
87127
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
88128
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
89129
<TargetName>MinMidi</TargetName>
@@ -112,6 +152,18 @@
112152
<LanguageStandard>stdcpp17</LanguageStandard>
113153
</ClCompile>
114154
</ItemDefinitionGroup>
155+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
156+
<DriverSign>
157+
<FileDigestAlgorithm>sha256</FileDigestAlgorithm>
158+
</DriverSign>
159+
<Link>
160+
<AdditionalDependencies>%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)ks.lib</AdditionalDependencies>
161+
<RegisterOutput>true</RegisterOutput>
162+
</Link>
163+
<ClCompile>
164+
<LanguageStandard>stdcpp17</LanguageStandard>
165+
</ClCompile>
166+
</ItemDefinitionGroup>
115167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
116168
<DriverSign>
117169
<FileDigestAlgorithm>sha256</FileDigestAlgorithm>
@@ -128,6 +180,22 @@
128180
<RegisterOutput>true</RegisterOutput>
129181
</Link>
130182
</ItemDefinitionGroup>
183+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
184+
<DriverSign>
185+
<FileDigestAlgorithm>sha256</FileDigestAlgorithm>
186+
</DriverSign>
187+
<ClCompile>
188+
<LanguageStandard>stdcpp17</LanguageStandard>
189+
</ClCompile>
190+
<ClCompile>
191+
<LanguageStandard_C>Default</LanguageStandard_C>
192+
<Optimization>MaxSpeed</Optimization>
193+
</ClCompile>
194+
<Link>
195+
<AdditionalDependencies>%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)ks.lib</AdditionalDependencies>
196+
<RegisterOutput>true</RegisterOutput>
197+
</Link>
198+
</ItemDefinitionGroup>
131199
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
132200
<Link>
133201
<AdditionalDependencies>%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)ks.lib</AdditionalDependencies>

0 commit comments

Comments
 (0)