[ISSUE-59] Windows 10 Mobile ole32.dll error when playing

ArieJones · Dec 1, 2015 · 801c068 · 801c068
1 parent a996e1b
commit 801c068
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 5 deletions.
diff --git a/NAudio.Universal/CoreAudioApi/PropVariantNative.cs b/NAudio.Universal/CoreAudioApi/PropVariantNative.cs
@@ -0,0 +1,12 @@
+using NAudio.CoreAudioApi.Interfaces;
+using System.Runtime.InteropServices;
+
+namespace NAudio.CoreAudioApi.Interfaces
+{
+    class PropVariantNative
+    {
+        // Windows 10 requires api-ms-win-core-com-l1-1-1.dll
+        [DllImport("api-ms-win-core-com-l1-1-1.dll")]
+        internal static extern int PropVariantClear(ref PropVariant pvar);
+    }
+}
diff --git a/NAudio.Universal/NAudio.Universal.csproj b/NAudio.Universal/NAudio.Universal.csproj
@@ -824,6 +824,7 @@
     <Compile Include="..\NAudio\Wave\WaveStreams\WaveStream.cs">
       <Link>Wave\WaveStreams\WaveStream.cs</Link>
     </Compile>
+    <Compile Include="CoreAudioApi\PropVariantNative.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Wave\WaveOutputs\IWavePlayer.cs" />
   </ItemGroup>

diff --git a/NAudio.Win8/CoreAudioApi/PropVariantNative.cs b/NAudio.Win8/CoreAudioApi/PropVariantNative.cs
@@ -0,0 +1,13 @@
+using NAudio.CoreAudioApi.Interfaces;
+using System.Runtime.InteropServices;
+
+namespace NAudio.CoreAudioApi.Interfaces
+{
+    class PropVariantNative
+    {
+        // For Windows 8 we need to import api-ms-win-core-com-l1-1-0.dll, so we use this since we target 8.0
+        // TODO Windows 8.1 requires api-ms-win-core-com-l1-1-1.dll for PropVariantClear
+        [DllImport("api-ms-win-core-com-l1-1-0.dll")]
+        internal static extern int PropVariantClear(ref PropVariant pvar);
+    }
+}
diff --git a/NAudio.Win8/NAudio.Win8.csproj b/NAudio.Win8/NAudio.Win8.csproj
@@ -808,6 +808,7 @@
     <Compile Include="..\NAudio\Wave\WaveStreams\WaveStream.cs">
       <Link>Wave\WaveStreams\WaveStream.cs</Link>
     </Compile>
+    <Compile Include="CoreAudioApi\PropVariantNative.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Wave\WaveInputs\WasapiCaptureRT.cs" />
     <Compile Include="Wave\WaveOutputs\IWavePlayer.cs" />

diff --git a/NAudio/CoreAudioApi/PropVariant.cs b/NAudio/CoreAudioApi/PropVariant.cs
@@ -212,10 +212,7 @@ public object Value
         /// </summary>
         public void Clear()
         {
-            PropVariantClear(ref this);
+            PropVariantNative.PropVariantClear(ref this);
         }
-
-        [DllImport("ole32.dll")]
-        private static extern int PropVariantClear(ref PropVariant pvar);
     }
 }
diff --git a/NAudio/CoreAudioApi/PropVariantNative.cs b/NAudio/CoreAudioApi/PropVariantNative.cs
@@ -0,0 +1,10 @@
+using System.Runtime.InteropServices;
+
+namespace NAudio.CoreAudioApi.Interfaces
+{
+    class PropVariantNative
+    {
+        [DllImport("ole32.dll")]
+        internal static extern int PropVariantClear(ref PropVariant pvar);
+    }
+}
diff --git a/NAudio/NAudio.csproj b/NAudio/NAudio.csproj
@@ -119,6 +119,7 @@
     <Compile Include="CoreAudioApi\Interfaces\ISimpleAudioVolume.cs" />
     <Compile Include="CoreAudioApi\MMDeviceCollection.cs" />
     <Compile Include="CoreAudioApi\PropertyKeys.cs" />
+    <Compile Include="CoreAudioApi\PropVariantNative.cs" />
     <Compile Include="CoreAudioApi\SessionCollection.cs" />
     <Compile Include="CoreAudioApi\SimpleAudioVolume.cs" />
     <Compile Include="Dsp\EnvelopeGenerator.cs" />

diff --git a/NAudioUniversalDemo/Package.appxmanifest b/NAudioUniversalDemo/Package.appxmanifest
@@ -20,7 +20,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10166.0" MaxVersionTested="10.0.10166.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10166.0" MaxVersionTested="10.0.10586.0" />
   </Dependencies>
 
   <Resources>