Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge remote-tracking branch 'terrafx/v10.0.20348.1' #303

Merged
merged 43 commits into from
Dec 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
1f89afd
Updating version to v10.0.20348.1
tannergooding Dec 23, 2021
3b385c6
Fixing an issue in the D3D12_RT_FORMAT_ARRAY constructor where the op…
tannergooding Dec 23, 2021
42d2113
Ensure that CI runs for v* branches
tannergooding Dec 23, 2021
77ef6f0
Merge pull request #294 from tannergooding/v10.0.20348.1
tannergooding Dec 23, 2021
c3d7091
Generating bindings for um/objbase
tannergooding Dec 23, 2021
1c089cb
Adding some implicit conversion operators for LARGE_INTEGER and ULARG…
tannergooding Dec 23, 2021
06e6f77
Merge pull request #295 from tannergooding/v10.0.20348.1
tannergooding Dec 23, 2021
6a9db7f
Ensure E_NOT_SET and friends are being generated
tannergooding Dec 23, 2021
d3b4190
Adding a ThrowIfFailed extension method to HRESULT
tannergooding Dec 23, 2021
0221dbf
Merge pull request #296 from tannergooding/v10.0.20348.1
tannergooding Dec 23, 2021
ca9edf1
Don't have ThrowIfFailed be an extension method
tannergooding Dec 24, 2021
c3788c5
Remove the now unecessary ThrowIfFailed helper from the sample code
tannergooding Dec 24, 2021
37886fd
Merge pull request #297 from tannergooding/v10.0.20348.1
tannergooding Dec 24, 2021
f0bb418
Adding support for generating GDI+ bindings
tannergooding Dec 24, 2021
a92a5ee
Generating bindings for um/gdiplus.h
tannergooding Dec 24, 2021
9a8fe07
Generating bindings for um/gdiplusmem.h
tannergooding Dec 24, 2021
6926f2b
Generating bindings for um/gdiplusenums.h
tannergooding Dec 24, 2021
4204663
Generating bindings for um/gdiplustypes.h
tannergooding Dec 24, 2021
3ad0657
Generating bindings for um/gdiplusinit.h
tannergooding Dec 24, 2021
1751160
Generating bindings for um/gdipluspixelformats.h
tannergooding Dec 24, 2021
95ccc90
Generating bindings for um/gdipluscolor.h
tannergooding Dec 24, 2021
7a5fda7
Generating bindings for um/gdiplusmetaheader.h
tannergooding Dec 24, 2021
55bb8ac
Generating bindings for um/gdiplusimaging.h and adding some Flags att…
tannergooding Dec 24, 2021
3b57905
Generating bindings for um/gdipluscolormatrix.h
tannergooding Dec 24, 2021
2c95f74
Generating bindings for um/gdipluseffects.h
tannergooding Dec 24, 2021
9c0caff
Fixing some typedef remappings
tannergooding Dec 26, 2021
a72edc3
Generating bindings for um/gdiplusgpstubs.h
tannergooding Dec 26, 2021
e1d705a
Generating bindings for um/gdiplusflat.h
tannergooding Dec 26, 2021
4ed51af
Exclude GDI+ C++ definitions for the time being
tannergooding Dec 26, 2021
20e9931
Generating bindings for um/gdiplusimagecodec.h
tannergooding Dec 26, 2021
f492373
Fixing some of the GDI+ remappings
tannergooding Dec 26, 2021
dafddfb
Exclude 3 functions that are marked as unavailable
tannergooding Dec 26, 2021
da80b9c
Merge pull request #298 from tannergooding/v10.0.20348.1
tannergooding Dec 26, 2021
2071f64
Ensure that binding generation is clean
tannergooding Dec 26, 2021
bfd0fff
Merge pull request #299 from tannergooding/v10.0.20348.1
tannergooding Dec 26, 2021
bf63fd3
Fixing the exposed interfaces for GDI+
tannergooding Dec 28, 2021
7783fa6
Merge pull request #301 from tannergooding/v10.0.20348.1
tannergooding Dec 28, 2021
bc9afa6
Merge remote-tracking branch 'terrafx/v10.0.20348.1'
tannergooding Dec 28, 2021
8f03fa5
Ensure some of the GDI+ effects inherit from the respective interface
tannergooding Dec 28, 2021
d293dd2
Merge pull request #302 from tannergooding/v10.0.20348.1
tannergooding Dec 28, 2021
1b90624
Merge remote-tracking branch 'terrafx/v10.0.20348.1'
tannergooding Dec 28, 2021
1af7a4a
Merge branch 'main' into main
tannergooding Dec 28, 2021
02cb09d
Fixing a mis-merged rsp file
tannergooding Dec 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct Blur
public unsafe partial struct Blur : Blur.Interface
{
public Blur()
{
Expand All @@ -17,4 +18,15 @@ public Blur()
_ = GdipCreateEffect(BlurEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<Blur*, void>)(Base.lpVtbl[0]))((Blur*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct BrightnessContrast
public unsafe partial struct BrightnessContrast : BrightnessContrast.Interface
{
public BrightnessContrast()
{
Expand All @@ -17,4 +18,15 @@ public BrightnessContrast()
_ = GdipCreateEffect(BrightnessContrastEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<BrightnessContrast*, void>)(Base.lpVtbl[0]))((BrightnessContrast*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct ColorBalance
public unsafe partial struct ColorBalance : ColorBalance.Interface
{
public ColorBalance()
{
Expand All @@ -17,4 +18,15 @@ public ColorBalance()
_ = GdipCreateEffect(ColorBalanceEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<ColorBalance*, void>)(Base.lpVtbl[0]))((ColorBalance*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct ColorCurve
public unsafe partial struct ColorCurve : ColorCurve.Interface
{
public ColorCurve()
{
Expand All @@ -17,4 +18,15 @@ public ColorCurve()
_ = GdipCreateEffect(ColorCurveEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<ColorCurve*, void>)(Base.lpVtbl[0]))((ColorCurve*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct ColorLUT
public unsafe partial struct ColorLUT : ColorLUT.Interface
{
public ColorLUT()
{
Expand All @@ -17,4 +18,15 @@ public ColorLUT()
_ = GdipCreateEffect(ColorLUTEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<ColorLUT*, void>)(Base.lpVtbl[0]))((ColorLUT*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct ColorMatrixEffect
public unsafe partial struct ColorMatrixEffect : ColorMatrixEffect.Interface
{
public ColorMatrixEffect()
{
Expand All @@ -17,4 +18,15 @@ public ColorMatrixEffect()
_ = GdipCreateEffect(ColorMatrixEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<ColorMatrixEffect*, void>)(Base.lpVtbl[0]))((ColorMatrixEffect*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct Effect : Effect.Interface
{
private static void** s_vtbl = InitVtbl();
private static readonly void** s_vtbl = InitVtbl();

private static void** InitVtbl()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct HueSaturationLightness
public unsafe partial struct HueSaturationLightness : HueSaturationLightness.Interface
{
public HueSaturationLightness()
{
Expand All @@ -17,4 +18,15 @@ public HueSaturationLightness()
_ = GdipCreateEffect(HueSaturationLightnessEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<HueSaturationLightness*, void>)(Base.lpVtbl[0]))((HueSaturationLightness*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct Levels
public unsafe partial struct Levels : Levels.Interface
{
public Levels()
{
Expand All @@ -17,4 +18,15 @@ public Levels()
_ = GdipCreateEffect(LevelsEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<Levels*, void>)(Base.lpVtbl[0]))((Levels*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct RedEyeCorrection
public unsafe partial struct RedEyeCorrection : RedEyeCorrection.Interface
{
public RedEyeCorrection()
{
Expand All @@ -17,4 +18,15 @@ public RedEyeCorrection()
_ = GdipCreateEffect(RedEyeCorrectionEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<RedEyeCorrection*, void>)(Base.lpVtbl[0]))((RedEyeCorrection*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct Sharpen
public unsafe partial struct Sharpen : Sharpen.Interface
{
public Sharpen()
{
Expand All @@ -17,4 +18,15 @@ public Sharpen()
_ = GdipCreateEffect(SharpenEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<Sharpen*, void>)(Base.lpVtbl[0]))((Sharpen*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
// Ported from um/gdipluseffects.h in the Windows SDK for Windows 10.0.22000.0
// Original source is Copyright © Microsoft. All rights reserved.

using System.Runtime.CompilerServices;
using static TerraFX.Interop.Gdiplus.Gdiplus;

namespace TerraFX.Interop.Gdiplus;

public unsafe partial struct Tint
public unsafe partial struct Tint : Tint.Interface
{
public Tint()
{
Expand All @@ -17,4 +18,15 @@ public Tint()
_ = GdipCreateEffect(TintEffectGuid, &nativeEffect);
Base.nativeEffect = nativeEffect;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(0)]
public void Dispose()
{
((delegate* unmanaged<Tint*, void>)(Base.lpVtbl[0]))((Tint*)Unsafe.AsPointer(ref this));
}

public interface Interface : Effect.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ namespace TerraFX.Interop.Gdiplus;

[NativeTypeName("struct GpAdjustableArrowCap : GpCustomLineCap")]
[NativeInheritance("GpCustomLineCap")]
public partial struct GpAdjustableArrowCap : GpCustomLineCap.Interface
public partial struct GpAdjustableArrowCap : GpAdjustableArrowCap.Interface
{
public interface Interface : GpCustomLineCap.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ namespace TerraFX.Interop.Gdiplus;

[NativeTypeName("struct GpBitmap : GpImage")]
[NativeInheritance("GpImage")]
public partial struct GpBitmap : GpBrush.Interface
public partial struct GpBitmap : GpBitmap.Interface
{
public interface Interface : GpImage.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ namespace TerraFX.Interop.Gdiplus;

[NativeTypeName("struct GpHatch : GpBrush")]
[NativeInheritance("GpBrush")]
public partial struct GpHatch : GpBrush.Interface
public partial struct GpHatch : GpHatch.Interface
{
public interface Interface : GpBrush.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ namespace TerraFX.Interop.Gdiplus;

[NativeTypeName("struct GpInstalledFontCollection : GpFontCollection")]
[NativeInheritance("GpFontCollection")]
public partial struct GpInstalledFontCollection : GpFontCollection.Interface
public partial struct GpInstalledFontCollection : GpInstalledFontCollection.Interface
{
public interface Interface : GpFontCollection.Interface
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ namespace TerraFX.Interop.Gdiplus;

[NativeTypeName("struct GpLineGradient : GpBrush")]
[NativeInheritance("GpBrush")]
public partial struct GpLineGradient : GpBrush.Interface
public partial struct GpLineGradient : GpLineGradient.Interface
{
public interface Interface : GpBrush.Interface
{
}
}
Loading