Merge pull request #303 from tannergooding/main

Merge remote-tracking branch 'terrafx/v10.0.20348.1'
terrafx · Dec 28, 2021 · b08e14a · b08e14a
2 parents 0262f0f + 02cb09d
commit b08e14a
Show file tree

Hide file tree

Showing 22 changed files with 184 additions and 22 deletions.
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Blur.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Blur.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/BrightnessContrast.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/BrightnessContrast.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorBalance.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorBalance.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorCurve.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorCurve.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorLUT.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorLUT.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorMatrixEffect.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/ColorMatrixEffect.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Effect.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Effect.Manual.cs
@@ -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()
     {

diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/HueSaturationLightness.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/HueSaturationLightness.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Levels.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Levels.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/RedEyeCorrection.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/RedEyeCorrection.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Sharpen.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Sharpen.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Tint.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdipluseffects/Tint.Manual.cs
@@ -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()
     {
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpAdjustableArrowCap.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpAdjustableArrowCap.Manual.cs
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpBitmap.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpBitmap.Manual.cs
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpHatch.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpHatch.Manual.cs
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpInstalledFontCollection.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpInstalledFontCollection.Manual.cs
@@ -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
+    {
+    }
 }
diff --git a/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpLineGradient.Manual.cs b/sources/Interop/Windows/Gdiplus/um/gdiplusgpstubs/GpLineGradient.Manual.cs
@@ -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
+    {
+    }
 }