Merge pull request #876 from andrewst/sdk15063

Update maping on Windows 10 Creators Update SDK 15063

Author: xoofx

Readme.md

@@ -13,7 +13,7 @@ You can find more documentation on the [Wiki](http://sharpdx.org/wiki)
 In order to compile SharpDX, you need to install **Visual Studio 2017 or newer** with the following workloads and components:
 
 - [x] Visual C++ Toolset Component
-- [x] Windows 10 Anniversary SDK (10.0.14393.0) Component
+- [x] Windows 10 Creators Update SDK (10.0.15063.0) Component
 - [x] C# Development Workload
 - [x] .NET Core Cross Platform Development Workload
 

Source/Mapping.xml

@@ -24,9 +24,9 @@
 
   <include-dir override="true">$(THIS_CONFIG_PATH)\..\External\LegacyHeaders</include-dir>
   <include-dir>$(VC_TOOLS_PATH)\include</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\shared</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\um</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\ucrt</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\shared</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\um</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\ucrt</include-dir>
 
   <var name="FILTER_PASTING_ERROR">error: pasting .*a valid preprocessing token</var>
 
@@ -59,7 +59,7 @@
     // For XAudio2 patch
     #define __unaligned __attribute((__unaligned))
 
-    #define NTDDI_VERSION NTDDI_WIN10_RS1
+    #define NTDDI_VERSION NTDDI_WIN10_RS2
 
   </include-prolog>
 

Source/SharpDX.DXGI/Mapping.xml

@@ -31,22 +31,26 @@
   <include id="dxgiformat" file="dxgiformat.h" attach="true" />
   <include id="winerror" file="winerror.h"/>
   <include id="dxgitype" file="dxgitype.h" attach="true"/>
+  <include id="dxgicommon" file="dxgicommon.h" attach="true"/>
   <include id="dxgi1_2" file="dxgi1_2.h" attach="true" />
   <include id="windows.ui.xaml.media.dxinterop" file="windows.ui.xaml.media.dxinterop.h" attach="true" />
   <include id="dxgi1_3" file="dxgi1_3.h" attach="true" />
   <include id="dxgi1_4" file="dxgi1_4.h" attach="true" />
   <include id="dxgi1_5" file="dxgi1_5.h" attach="true" />
+  <include id="dxgi1_6" file="dxgi1_6.h" attach="true" />
 
   <context-set id="dxgi-all">
     <context>sharpdx-dxgi</context>
     <context>sharpdx-dxgi-ext</context>
     <context>dxgi</context>
     <context>dxgiformat</context>
     <context>dxgitype</context>
+    <context>dxgicommon</context>
     <context>dxgi1_2</context>
     <context>dxgi1_3</context>
     <context>dxgi1_4</context>
     <context>dxgi1_5</context>
+    <context>dxgi1_6</context>
     <context>winerror</context>
     <context>windows.ui.xaml.media.dxinterop</context>
   </context-set>

Source/SharpDX.Direct2D1/ColorContext1.cs

@@ -0,0 +1,76 @@
+// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class ColorContext1
+    {
+        /// <summary>	
+        /// Initializes a new instance of <see cref="ColorContext1"/> class from ColorSpaceType.
+        /// </summary>	
+        /// <param name="context">No documentation.</param>	
+        /// <param name="wicColorContext">No documentation.</param>	
+        /// <unmanaged>HRESULT ID2D1DeviceContext5::CreateColorContextFromDxgiColorSpace([In] DXGI_COLOR_SPACE_TYPE colorSpace,[Out, Fast] ID2D1ColorContext1** colorContext)</unmanaged>	
+        public ColorContext1(DeviceContext5 context, SharpDX.DXGI.ColorSpaceType colorSpace)
+            : base(IntPtr.Zero)
+        {
+            context.CreateColorContextFromDxgiColorSpace(colorSpace, this);
+        }
+
+        /// <summary>	
+        /// Initializes a new instance of <see cref="ColorContext1"/> class from SimpleColorProfile.
+        /// </summary>	
+        /// <param name="context">No documentation.</param>	
+        /// <param name="wicColorContext">No documentation.</param>	
+        /// <unmanaged>HRESULT ID2D1DeviceContext5::CreateColorContextFromDxgiColorSpace([In] DXGI_COLOR_SPACE_TYPE colorSpace,[Out, Fast] ID2D1ColorContext1** colorContext)</unmanaged>	
+        public ColorContext1(DeviceContext5 context, ref SharpDX.Direct2D1.SimpleColorProfile simpleProfile)
+            : base(IntPtr.Zero)
+        {
+            context.CreateColorContextFromSimpleColorProfile(ref simpleProfile, this);
+        }
+
+        /// <summary>	
+        /// Initializes a new instance of <see cref="ColorContext1"/> class from ColorSpaceType.
+        /// </summary>	
+        /// <param name="context">No documentation.</param>	
+        /// <param name="wicColorContext">No documentation.</param>	
+        /// <unmanaged>HRESULT ID2D1DeviceContext5::CreateColorContextFromDxgiColorSpace([In] DXGI_COLOR_SPACE_TYPE colorSpace,[Out, Fast] ID2D1ColorContext1** colorContext)</unmanaged>	
+        public ColorContext1(EffectContext2 context, SharpDX.DXGI.ColorSpaceType colorSpace)
+            : base(IntPtr.Zero)
+        {
+            context.CreateColorContextFromDxgiColorSpace(colorSpace, this);
+        }
+
+        /// <summary>	
+        /// Initializes a new instance of <see cref="ColorContext1"/> class from SimpleColorProfile.
+        /// </summary>	
+        /// <param name="context">No documentation.</param>	
+        /// <param name="wicColorContext">No documentation.</param>	
+        /// <unmanaged>HRESULT ID2D1DeviceContext5::CreateColorContextFromDxgiColorSpace([In] DXGI_COLOR_SPACE_TYPE colorSpace,[Out, Fast] ID2D1ColorContext1** colorContext)</unmanaged>	
+        public ColorContext1(EffectContext2 context, ref SharpDX.Direct2D1.SimpleColorProfile simpleProfile)
+            : base(IntPtr.Zero)
+        {
+            context.CreateColorContextFromSimpleColorProfile(ref simpleProfile, this);
+        }
+    }
+}

Source/SharpDX.Direct2D1/CommandSink4.cs

@@ -0,0 +1,16 @@
+namespace SharpDX.Direct2D1
+{
+    public partial interface CommandSink4
+    {
+        /// <summary>	
+        /// <p>Sets a new primitive blend mode. Allows access to the MAX primitive blend mode.</p>	
+        /// </summary>	
+        /// <param name="primitiveBlend">The primitive blend that will apply to subsequent primitives.</param>	
+        /// <returns><p>If this method succeeds, it returns <strong><see cref="SharpDX.Result.Ok"/></strong>. Otherwise, it returns an <strong><see cref="SharpDX.Result"/></strong> error code.</p></returns>	
+        /// <include file='.\..\Documentation\CodeComments.xml' path="/comments/comment[@id='ID2D1CommandSink4::SetPrimitiveBlend2']/*"/>	
+        /// <msdn-id>mt797802</msdn-id>	
+        /// <unmanaged>HRESULT ID2D1CommandSink4::SetPrimitiveBlend2([In] D2D1_PRIMITIVE_BLEND primitiveBlend)</unmanaged>	
+        /// <unmanaged-short>ID2D1CommandSink4::SetPrimitiveBlend2</unmanaged-short>	
+        void SetPrimitiveBlend2(PrimitiveBlend primitiveBlend);
+    }
+}

Source/SharpDX.Direct2D1/CommandSink4Native.cs

@@ -0,0 +1,19 @@
+namespace SharpDX.Direct2D1
+{
+    internal partial class CommandSink4Native
+    {
+        /// <summary>	
+        /// <p>Sets a new primitive blend mode. Allows access to the MAX primitive blend mode.</p>	
+        /// </summary>	
+        /// <param name="primitiveBlend">The primitive blend that will apply to subsequent primitives.</param>	
+        /// <returns><p>If this method succeeds, it returns <strong><see cref="SharpDX.Result.Ok"/></strong>. Otherwise, it returns an <strong><see cref="SharpDX.Result"/></strong> error code.</p></returns>	
+        /// <include file='.\..\Documentation\CodeComments.xml' path="/comments/comment[@id='ID2D1CommandSink4::SetPrimitiveBlend2']/*"/>	
+        /// <msdn-id>mt797802</msdn-id>	
+        /// <unmanaged>HRESULT ID2D1CommandSink4::SetPrimitiveBlend2([In] D2D1_PRIMITIVE_BLEND primitiveBlend)</unmanaged>	
+        /// <unmanaged-short>ID2D1CommandSink4::SetPrimitiveBlend2</unmanaged-short>	
+        public void SetPrimitiveBlend2(PrimitiveBlend primitiveBlend)
+        {
+            SetPrimitiveBlend2_(primitiveBlend);
+        }
+    }
+}

Source/SharpDX.Direct2D1/Device3.cs

@@ -33,7 +33,7 @@ public partial class Device3
         /// Each call to CreateDevice returns a unique <see cref="SharpDX.Direct2D1.Device3"/> object.The <see cref="SharpDX.DXGI.Device"/> object is obtained by calling QueryInterface on an ID3D10Device or an ID3D11Device.	
         /// </remarks>	
         /// <unmanaged>HRESULT ID2D1Factory3::CreateDevice([In] IDXGIDevice* dxgiDevice,[Out] ID2D1Device2** d2dDevice2)</unmanaged>	
-        public Device3(Factory4 factory, SharpDX.DXGI.Device3 device)
+        public Device3(Factory4 factory, SharpDX.DXGI.Device device)
             : base(IntPtr.Zero)
         {
             factory.CreateDevice(device, this);

Source/SharpDX.Direct2D1/Device4.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class Device4
+    {
+        /// <summary>	
+        /// Initializes a new instance of the <see cref="Device4"/> class.
+        /// </summary>	
+        /// <param name="factory"><para>The <see cref="Factory5"/> object used when creating  the <see cref="SharpDX.Direct2D1.Device3"/>. </para></param>	
+        /// <param name="device"><para>The <see cref="SharpDX.DXGI.Device"/> object used when creating  the <see cref="SharpDX.Direct2D1.Device4"/>. </para></param>	
+        /// <remarks>	
+        /// Each call to CreateDevice returns a unique <see cref="SharpDX.Direct2D1.Device4"/> object.The <see cref="SharpDX.DXGI.Device4"/> object is obtained by calling QueryInterface on an ID3D10Device or an ID3D11Device.	
+        /// </remarks>	
+        /// <unmanaged>HRESULT ID2D1Factory5::CreateDevice([In] IDXGIDevice* dxgiDevice,[Out] ID2D1Device5** d2dDevice4)</unmanaged>	
+        public Device4(Factory5 factory, SharpDX.DXGI.Device device)
+            : base(IntPtr.Zero)
+        {
+            factory.CreateDevice(device, this);
+        }
+    }
+}

Source/SharpDX.Direct2D1/Device5.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class Device5
+    {
+        /// <summary>	
+        /// Initializes a new instance of the <see cref="Device5"/> class.
+        /// </summary>	
+        /// <param name="factory"><para>The <see cref="Factory4"/> object used when creating  the <see cref="SharpDX.Direct2D1.Device5"/>. </para></param>	
+        /// <param name="device"><para>The <see cref="SharpDX.DXGI.Device"/> object used when creating  the <see cref="SharpDX.Direct2D1.Device5"/>. </para></param>	
+        /// <remarks>	
+        /// Each call to CreateDevice returns a unique <see cref="SharpDX.Direct2D1.Device5"/> object.The <see cref="SharpDX.DXGI.Device"/> object is obtained by calling QueryInterface on an ID3D10Device or an ID3D11Device.	
+        /// </remarks>	
+        /// <unmanaged>HRESULT ID2D1Factory3::CreateDevice([In] IDXGIDevice* dxgiDevice,[Out] ID2D1Device2** d2dDevice2)</unmanaged>	
+        public Device5(Factory6 factory, SharpDX.DXGI.Device device)
+            : base(IntPtr.Zero)
+        {
+            factory.CreateDevice(device, this);
+        }
+    }
+}

Source/SharpDX.Direct2D1/DeviceContext4.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace SharpDX.Direct2D1
+{
+    public partial class DeviceContext4
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceContext4"/> class using an existing <see cref="Device4"/>.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <param name="options">The options to be applied to the created device context.</param>
+        /// <remarks>
+        /// The new device context will not have a  selected target bitmap. The caller must create and select a bitmap as the target surface of the context.
+        /// </remarks>
+        /// <unmanaged>HRESULT ID2D1Device4::CreateDeviceContext([In] D2D1_DEVICE_CONTEXT_OPTIONS options,[Out] ID2D1DeviceContext4** DeviceContext4)</unmanaged>
+        public DeviceContext4(Device4 device, DeviceContextOptions options)
+            : base(IntPtr.Zero)
+        {
+            device.CreateDeviceContext(options, this);
+        }
+    }
+}