Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit a0614e5

Browse files
author
AndrewSt
committed
update mapping for NTDDI_WIN10_RS2
1 parent e6d65bb commit a0614e5

7 files changed

Lines changed: 47 additions & 2 deletions

File tree

Source/Mapping.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
// For XAudio2 patch
6060
#define __unaligned __attribute((__unaligned))
6161

62-
#define NTDDI_VERSION NTDDI_WIN10_RS1
62+
#define NTDDI_VERSION NTDDI_WIN10_RS2
6363

6464
</include-prolog>
6565

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespace SharpDX.Direct2D1
2+
{
3+
public partial interface CommandSink4
4+
{
5+
/// <summary>
6+
/// <p>Sets a new primitive blend mode. Allows access to the MAX primitive blend mode.</p>
7+
/// </summary>
8+
/// <param name="primitiveBlend">The primitive blend that will apply to subsequent primitives.</param>
9+
/// <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>
10+
/// <include file='.\..\Documentation\CodeComments.xml' path="/comments/comment[@id='ID2D1CommandSink4::SetPrimitiveBlend2']/*"/>
11+
/// <msdn-id>mt797802</msdn-id>
12+
/// <unmanaged>HRESULT ID2D1CommandSink4::SetPrimitiveBlend2([In] D2D1_PRIMITIVE_BLEND primitiveBlend)</unmanaged>
13+
/// <unmanaged-short>ID2D1CommandSink4::SetPrimitiveBlend2</unmanaged-short>
14+
void SetPrimitiveBlend2(PrimitiveBlend primitiveBlend);
15+
}
16+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
namespace SharpDX.Direct2D1
2+
{
3+
internal partial class CommandSink4Native
4+
{
5+
/// <summary>
6+
/// <p>Sets a new primitive blend mode. Allows access to the MAX primitive blend mode.</p>
7+
/// </summary>
8+
/// <param name="primitiveBlend">The primitive blend that will apply to subsequent primitives.</param>
9+
/// <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>
10+
/// <include file='.\..\Documentation\CodeComments.xml' path="/comments/comment[@id='ID2D1CommandSink4::SetPrimitiveBlend2']/*"/>
11+
/// <msdn-id>mt797802</msdn-id>
12+
/// <unmanaged>HRESULT ID2D1CommandSink4::SetPrimitiveBlend2([In] D2D1_PRIMITIVE_BLEND primitiveBlend)</unmanaged>
13+
/// <unmanaged-short>ID2D1CommandSink4::SetPrimitiveBlend2</unmanaged-short>
14+
public void SetPrimitiveBlend2(PrimitiveBlend primitiveBlend)
15+
{
16+
SetPrimitiveBlend2_(primitiveBlend);
17+
}
18+
}
19+
}

Source/SharpDX.Direct2D1/DirectWrite/Mapping.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,12 @@
214214

215215
<map method="IDWriteBitmapRenderTarget::DrawGlyphRun" visibility="private"/>
216216
<map param="IDWriteBitmapRenderTarget::DrawGlyphRun::textColor" type="int"/>
217+
218+
219+
<map param="IDWriteRemoteFontFileStream::BeginDownload::asyncResult" return="true" />
220+
<map method="IDWriteAsyncResult::GetResult" check="false"/>
217221

218-
<!--
222+
<!--
219223
// *****************************************************************
220224
// DWrite Functions
221225
// *****************************************************************

Source/SharpDX.Direct2D1/Mapping-direct2d1.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
<map interface="ID2D(\d+).*Sink1?" callback="true" callback-dual="true" />
395395
<map interface="ID2D(\d+).*Sink2?" callback="true" callback-dual="true" />
396396
<map interface="ID2D(\d+).*Sink3?" callback="true" callback-dual="true" />
397+
<map interface="ID2D(\d+).*Sink4?" callback="true" callback-dual="true" />
397398

398399
<!--<map param="ID2D1DeviceContext::CreateColorContextFromWicColorContext::wicColorContext" type="IUnknown"/>
399400
<map param="ID2D1DeviceContext::CreateColorContextFromWicColorContext::colorContext" type="IUnknown"/>-->

Source/SharpDX/Result.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,5 +300,10 @@ public static Result GetResultFromWin32Error(int win32Error)
300300
/// </summary>
301301
/// <unmanaged>WAIT_TIMEOUT</unmanaged>
302302
public static readonly SharpDX.ResultDescriptor WaitTimeout = new SharpDX.ResultDescriptor(unchecked((int)0x00000102L), "General", "WAIT_TIMEOUT", "WaitTimeout");
303+
/// <summary>
304+
/// The data necessary to complete this operation is not yet available.
305+
/// </summary>
306+
/// <unmanaged>WAIT_TIMEOUT</unmanaged>
307+
public static readonly SharpDX.ResultDescriptor Pending = new SharpDX.ResultDescriptor(unchecked((int)0x8000000AL), "General", "E_PENDING", "Pending");
303308
}
304309
}

Source/Tools/SharpGen/MSDNDoc.zip

16.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)