More Cleanup and use WINDOWS_UWP where possible instead of DESKTOP_APP.

amerkoleci · amerkoleci · commit 6ca52c909894 · 2017-10-05T20:45:55.000+02:00
Fix XAudio to correctly handle DESKTOP_APP backend 2.7 resolve.
diff --git a/Build/SharpDX.props b/Build/SharpDX.props
@@ -3,6 +3,21 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
     <DefineConstants>$(DefineConstants);DIRECTX11_1;DIRECTX11_2;DirectX12</DefineConstants>
+
+    <PackageIconUrl>http://sharpdx.org/logo_100x100.png</PackageIconUrl>
+    <PackageLicenseUrl>http://sharpdx.org/License.txt</PackageLicenseUrl>
+    <PackageProjectUrl>http://sharpdx.org</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageTags>SharpDX DirectX Direct3D Multimedia MDX 3D</PackageTags>
+
+    <Authors>Alexandre Mutel</Authors>
+    <Owners>Alexandre Mutel</Owners>
+    <Company>Alexandre Mutel</Company>
+    <Copyright>Copyright (c) 2010-2016 Alexandre Mutel</Copyright>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Version>4.0.1</Version>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <Version Condition=" '$(SharpDXPackagingDev)' == 'true' ">$(Version)-ci$(SharpDXBuildNumber)</Version>
     <PackageOutputPath>$(SolutionDir)bin</PackageOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' And Exists('$(SolutionDir)sharpdx.snk')">
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/SharpDX-Sources.sln b/SharpDX-Sources.sln
@@ -52,7 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDX.Direct3D10", "Sourc
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{C3D5FB70-8EA0-4493-B1C3-8A2C73605C4B}"
 	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
 		Build\SharpDX.props = Build\SharpDX.props
 		Build\SharpDX.targets = Build\SharpDX.targets
 	EndProjectSection
diff --git a/Source/SharedAssemblyInfo.cs b/Source/SharedAssemblyInfo.cs
@@ -24,7 +24,7 @@
 
 [assembly:ComVisible(false)]
 
-#if STORE_APP
+#if WINDOWS_UWP
 [assembly: Obfuscation(Feature = "Apply to type SharpDX.* when public and interface: renaming", Exclude = false, ApplyToMembers = true)]
 [assembly: Obfuscation(Feature = "Apply to type SharpDX.* when struct: renaming", Exclude = false, ApplyToMembers = true)]
 [assembly: Obfuscation(Feature = "Apply to type SharpDX.*: INotifyPropertyChanged heuristics", Exclude = true)]
diff --git a/Source/SharpDX.RawInput/Mapping.xml b/Source/SharpDX.RawInput/Mapping.xml
@@ -25,7 +25,7 @@
   
   <namespace>SharpDX.RawInput</namespace>
   <assembly>SharpDX.RawInput</assembly>
-
+  
   <include file="winuser.h">
     <attach>RAWINPUTHEADER</attach>
     <!--<attach>RAWMOUSE</attach>-->
diff --git a/Source/SharpDX.XAudio2/Fx/Reverb.cs b/Source/SharpDX.XAudio2/Fx/Reverb.cs
@@ -41,7 +41,7 @@ public Reverb(XAudio2 device) : this(device, false)
         public Reverb(XAudio2 device, bool isUsingDebug)
             : base(device)
         {
-#if !STORE_APP
+#if !WINDOWS_UWP
             if (device.Version == XAudio2Version.Version27)
             {
                 Guid clsid = (isUsingDebug) ? XAudio2FxContants.CLSID_AudioReverb_Debug : XAudio2FxContants.CLSID_AudioReverb;
@@ -53,7 +53,7 @@ public Reverb(XAudio2 device, bool isUsingDebug)
             {
                 XAudio28Functions.CreateAudioReverb(this);
             }
-#if STORE_APP
+#if WINDOWS_UWP
             else if (device.Version == XAudio2Version.Version29)
             {
                 XAudio29Functions.CreateAudioReverb(this);
diff --git a/Source/SharpDX.XAudio2/Fx/VolumeMeter.cs b/Source/SharpDX.XAudio2/Fx/VolumeMeter.cs
@@ -46,7 +46,7 @@ public VolumeMeter(XAudio2 device)
         public VolumeMeter(XAudio2 device, bool isUsingDebug)
             : base(device)
         {
-#if !STORE_APP
+#if !WINDOWS_UWP
             if (device.Version == XAudio2Version.Version27)
             {
                 Guid clsid = (isUsingDebug) ? XAudio2FxContants.CLSID_AudioVolumeMeter_Debug : XAudio2FxContants.CLSID_AudioVolumeMeter;
@@ -58,7 +58,7 @@ public VolumeMeter(XAudio2 device, bool isUsingDebug)
             {
                 XAudio28Functions.CreateAudioVolumeMeter(this);
             }
-#if STORE_APP
+#if WINDOWS_UWP
             else if (device.Version == XAudio2Version.Version29)
             {
                 XAudio29Functions.CreateAudioVolumeMeter(this);
diff --git a/Source/SharpDX.XAudio2/X3DAudio/X3DAudio17.cs b/Source/SharpDX.XAudio2/X3DAudio/X3DAudio17.cs
@@ -28,7 +28,7 @@
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
-#if DESKTOP_APP
+#if !WINDOWS_UWP
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
diff --git a/Source/SharpDX.XAudio2/X3DAudio/X3DAudio29.cs b/Source/SharpDX.XAudio2/X3DAudio/X3DAudio29.cs
@@ -28,7 +28,7 @@
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
-#if STORE_APP_10
+#if WINDOWS_UWP
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
diff --git a/Source/SharpDX.XAudio2/XAPO/Fx/XAPOFx.Interop.cs b/Source/SharpDX.XAudio2/XAPO/Fx/XAPOFx.Interop.cs
@@ -8,7 +8,7 @@ namespace SharpDX.XAPO.Fx
     /// </summary>	
     /// <include file='..\..\Documentation\CodeComments.xml' path="/comments/comment[@id='SharpDX.XAPO.Fx.XAPOFx']/*"/>	
     static partial class XAPOFx {
-#if STORE_APP
+#if WINDOWS_UWP
         /// <summary>	
         /// <p>Creates an instance of the requested XAPOFX effect.</p>	
         /// </summary>	
diff --git a/Source/SharpDX.XAudio2/XAPO/Fx/XAPOFx.cs b/Source/SharpDX.XAudio2/XAPO/Fx/XAPOFx.cs
@@ -32,7 +32,7 @@ internal partial class XAPOFx
 
         public static void CreateFX(SharpDX.XAudio2.XAudio2 device, System.Guid clsid, SharpDX.ComObject effectRef)
         {
-#if !STORE_APP
+#if !WINDOWS_UWP
             if (device.Version == XAudio2Version.Version27)
             {
                 var clsid15 = clsid;
@@ -66,7 +66,7 @@ public static void CreateFX(SharpDX.XAudio2.XAudio2 device, System.Guid clsid, S
             {
                 CreateFX28(clsid, effectRef, IntPtr.Zero, 0);
             }
-#if STORE_APP
+#if WINDOWS_UWP
             else if (device.Version == XAudio2Version.Version29)
             {
                 CreateFX29(clsid, effectRef, IntPtr.Zero, 0);
@@ -86,7 +86,7 @@ public static void CreateFX(SharpDX.XAudio2.XAudio2 device, System.Guid clsid, S
         /// <summary>Constant None.</summary>
         private static Guid CLSID_FXReverb_15 = new Guid("a90bc001-e897-e897-7439-435500000002");
 
-#if !STORE_APP
+#if !WINDOWS_UWP
         [DllImport("XAPOFX1_5.dll", CallingConvention = CallingConvention.Cdecl, EntryPoint = "CreateFX")]
         private unsafe static extern int CreateFX15(ref Guid guid, out IntPtr arg1);
 #endif
diff --git a/Source/SharpDX.XAudio2/XAudio2.cs b/Source/SharpDX.XAudio2/XAudio2.cs
@@ -85,7 +85,7 @@ public XAudio2(XAudio2Flags flags, ProcessorSpecifier processorSpecifier, XAudio
             {
                 switch (tryVersion)
                 {
-#if !STORE_APP
+#if !WINDOWS_UWP
                     case XAudio2Version.Version27:
                         Guid clsid = ((int)flags == 1) ? CLSID_XAudio27_Debug : CLSID_XAudio27;
                         if ((requestedVersion == XAudio2Version.Default || requestedVersion == XAudio2Version.Version27) && Utilities.TryCreateComInstance(clsid, Utilities.CLSCTX.ClsctxInprocServer, IID_IXAudio2, this))
@@ -105,7 +105,7 @@ public XAudio2(XAudio2Flags flags, ProcessorSpecifier processorSpecifier, XAudio
                         }
                         catch (DllNotFoundException) { }
                         break;
-#if STORE_APP
+#if WINDOWS_UWP
                     case XAudio2Version.Version29:
                         try
                         {
diff --git a/Source/SharpDX.XAudio2/XAudio29Functions.cs b/Source/SharpDX.XAudio2/XAudio29Functions.cs
@@ -1,4 +1,4 @@
-#if STORE_APP
+#if WINDOWS_UWP
 using System;
 using System.Runtime.InteropServices;
 
diff --git a/Source/SharpDX/DataBuffer.cs b/Source/SharpDX/DataBuffer.cs
@@ -34,9 +34,11 @@ public class DataBuffer : DisposeBase
     {
         private unsafe sbyte* _buffer;
         private GCHandle _gCHandle;
-        private Blob _blob;
         private readonly bool _ownsBuffer;
         private readonly int _size;
+#if !WINDOWS_UWP
+        private Blob _blob;
+#endif
 
         /// <summary>
         /// Creates the specified user buffer.
@@ -141,7 +143,7 @@ internal unsafe DataBuffer(void* buffer, int sizeInBytes, bool makeCopy)
             _size = sizeInBytes;
             _ownsBuffer = makeCopy;
         }
-#if DESKTOP_APP
+#if !WINDOWS_UWP
         internal unsafe DataBuffer(Blob buffer)
         {
             System.Diagnostics.Debug.Assert(buffer.GetBufferSize() > 0);
@@ -160,7 +162,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-#if DESKTOP_APP
+#if !WINDOWS_UWP
                 if (_blob != null)
                 {
                     _blob.Dispose();
diff --git a/Source/SharpDX/Diagnostics/ObjectTracker.cs b/Source/SharpDX/Diagnostics/ObjectTracker.cs
@@ -104,7 +104,7 @@ private static Dictionary<IntPtr, List<ObjectReference>> ObjectReferences
         /// </summary>
         public static string GetStackTrace()
         {
-#if STORE_APP
+#if WINDOWS_UWP
             var stacktrace = "Stacktrace is not available on this platform";
 
             // This code is a workaround to be able to get a full stacktrace on Windows Store App. 
@@ -121,7 +121,7 @@ public static string GetStackTrace()
                         // First try to get the stacktrace
                         stacktrace = (string)stackTraceGetMethod.Invoke(null, null);
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         // If we have an exception, it means that the access to the method is not possible
                         // so we are going to patch the field RuntimeMethodInfo.m_invocationFlags that should contain
@@ -145,15 +145,15 @@ public static string GetStackTrace()
                                     // if it succeeds, first Invoke() should run on next call
                                     stacktrace = (string)stackTraceGetMethod.Invoke(null, null);
                                 }
-                                catch (Exception ex2)
+                                catch (Exception)
                                 {
                                     // if it is still failing, we can't do anything
                                 }
                             }
                         }
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     // can't do anything
                 }
diff --git a/Source/SharpDX/IO/NativeFile.cs b/Source/SharpDX/IO/NativeFile.cs
@@ -29,7 +29,7 @@ namespace SharpDX.IO
     /// </summary>
     public static class NativeFile 
     {
-#if STORE_APP
+#if WINDOWS_UWP
         private const string KERNEL_FILE = "api-ms-win-core-file-l1-2-0.dll";
 #else
         private const string KERNEL_FILE = "kernel32.dll";
@@ -114,7 +114,7 @@ public static string ReadAllText(string path, Encoding encoding, NativeFileShare
                 }
             }
         }
-#if STORE_APP
+#if WINDOWS_UWP
         internal struct CREATEFILE2_EXTENDED_PARAMETERS
         {
             public uint dwSize;
@@ -284,7 +284,7 @@ public static DateTime GetLastWriteTime(string path)
         [DllImport(KERNEL_FILE, EntryPoint = "GetFileAttributesExW", CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern bool GetFileAttributesEx(string name, int fileInfoLevel, out WIN32_FILE_ATTRIBUTE_DATA lpFileInformation);
 
-#if STORE_APP
+#if WINDOWS_UWP
 
         /// <summary>
         /// Creates the file.
diff --git a/Source/SharpDX/IO/NativeFileStream.cs b/Source/SharpDX/IO/NativeFileStream.cs
@@ -44,7 +44,7 @@ public class NativeFileStream : Stream
         /// <param name="share">The share mode.</param>
         public unsafe NativeFileStream(string fileName, NativeFileMode fileMode, NativeFileAccess access, NativeFileShare share = NativeFileShare.Read)
         {
-#if STORE_APP
+#if WINDOWS_UWP
             //uint newAccess = 0;
             //const int FILE_ATTRIBUTE_NORMAL = 0x00000080;
             //const int FILE_FLAG_RANDOM_ACCESS = 0x10000000;
diff --git a/Source/SharpDX/Mapping.xml b/Source/SharpDX/Mapping.xml
@@ -25,7 +25,7 @@
   <depends>sharpdx-core</depends>
   <depends>sharpdx-core-direct3d</depends>
   <depends>sharpdx-core-multimedia</depends>
-
+l
   <file>Mapping-core.xml</file>
   <file>Direct3D\Mapping.xml</file>
   <file>Multimedia\Mapping.xml</file>  
diff --git a/Source/SharpDX/Multimedia/SoundStream.cs b/Source/SharpDX/Multimedia/SoundStream.cs
@@ -28,7 +28,6 @@ namespace SharpDX.Multimedia
     /// </summary>
     public class SoundStream : Stream
     {
-        private readonly bool isOwnerOfInput;
         private Stream input;
         private long startPositionOfData;
         private long length;
diff --git a/Source/SharpDX/Reflection/ObfuscationAttributes.cs b/Source/SharpDX/Reflection/ObfuscationAttributes.cs
@@ -1,4 +1,4 @@
-﻿#if STORE_APP
+﻿#if WINDOWS_UWP
 // Definition of custom attributes for declarative obfuscation.
 // This file is only necessary for .NET Compact Framework, Silverlight, WinRT and Portable Library projects.
 
diff --git a/Source/SharpDX/ResultDescriptor.cs b/Source/SharpDX/ResultDescriptor.cs
@@ -278,7 +278,7 @@ private static string GetDescriptionFromResultCode(int resultCode)
             return description;
         }
 
-#if STORE_APP
+#if WINDOWS_UWP
         [DllImport("api-ms-win-core-localization-l1-2-0.dll", EntryPoint = "FormatMessageW")]
         private static extern uint FormatMessageW(int dwFlags, IntPtr lpSource, int dwMessageId, int dwLanguageId, ref IntPtr lpBuffer, int nSize, IntPtr Arguments);
 #else
diff --git a/Source/SharpDX/Utilities.cs b/Source/SharpDX/Utilities.cs
@@ -1039,7 +1039,7 @@ public enum CLSCTX : uint
             ClsctxAll = ClsctxServer | ClsctxInprocHandler
         }
 
-#if STORE_APP
+#if WINDOWS_UWP
         [StructLayout(LayoutKind.Sequential)]
         public struct MultiQueryInterface
         {
@@ -1131,7 +1131,7 @@ public enum CoInit
             SpeedOverMemory = 0x8
         }
 
-#if STORE_APP
+#if WINDOWS_UWP
         [DllImport("api-ms-win-core-handle-l1-1-0.dll", EntryPoint = "CloseHandle", SetLastError = true)]
         internal static extern bool CloseHandle(IntPtr handle);
 #else
@@ -1154,7 +1154,7 @@ public static IntPtr GetProcAddress(IntPtr handle, string dllFunctionToImport)
             return result;
         }
 
-#if STORE_APP
+#if WINDOWS_UWP
         [DllImport("api-ms-win-core-libraryloader-l1-1-1.dll", EntryPoint = "GetProcAddress", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
         static extern IntPtr GetProcAddress_(IntPtr hModule, string procName);
 #else

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Reverb(XAudio2 device) : this(device, false)`
`41`	`41`	`public Reverb(XAudio2 device, bool isUsingDebug)`
`42`	`42`	`: base(device)`
`43`	`43`	`{`
`44`		`-#if !STORE_APP`
	`44`	`+#if !WINDOWS_UWP`
`45`	`45`	`if (device.Version == XAudio2Version.Version27)`
`46`	`46`	`{`
`47`	`47`	`Guid clsid = (isUsingDebug) ? XAudio2FxContants.CLSID_AudioReverb_Debug : XAudio2FxContants.CLSID_AudioReverb;`
`@@ -53,7 +53,7 @@ public Reverb(XAudio2 device, bool isUsingDebug)`
`53`	`53`	`{`
`54`	`54`	`XAudio28Functions.CreateAudioReverb(this);`
`55`	`55`	`}`
`56`		`-#if STORE_APP`
	`56`	`+#if WINDOWS_UWP`
`57`	`57`	`else if (device.Version == XAudio2Version.Version29)`
`58`	`58`	`{`
`59`	`59`	`XAudio29Functions.CreateAudioReverb(this);`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public VolumeMeter(XAudio2 device)`
`46`	`46`	`public VolumeMeter(XAudio2 device, bool isUsingDebug)`
`47`	`47`	`: base(device)`
`48`	`48`	`{`
`49`		`-#if !STORE_APP`
	`49`	`+#if !WINDOWS_UWP`
`50`	`50`	`if (device.Version == XAudio2Version.Version27)`
`51`	`51`	`{`
`52`	`52`	`Guid clsid = (isUsingDebug) ? XAudio2FxContants.CLSID_AudioVolumeMeter_Debug : XAudio2FxContants.CLSID_AudioVolumeMeter;`
`@@ -58,7 +58,7 @@ public VolumeMeter(XAudio2 device, bool isUsingDebug)`
`58`	`58`	`{`
`59`	`59`	`XAudio28Functions.CreateAudioVolumeMeter(this);`
`60`	`60`	`}`
`61`		`-#if STORE_APP`
	`61`	`+#if WINDOWS_UWP`
`62`	`62`	`else if (device.Version == XAudio2Version.Version29)`
`63`	`63`	`{`
`64`	`64`	`XAudio29Functions.CreateAudioVolumeMeter(this);`