Explicit delegate types (#5954)

This is done to please AOT compilers. Removed not used MilGlyphCache_SetCreateGlyphBitmapsCallback Technically NativeAOT would handle that after dotnet/runtime#63219 but want to cleanup just in case overall I think using untyped delegates in C# is wrong
dotnet · May 9, 2022 · 5c57653 · 5c57653
1 parent 48165a1
commit 5c57653
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/...oft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs b/...oft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs
@@ -112,7 +112,7 @@ internal unsafe static extern int MilUtility_PathGeometryCombine(
                 UInt32 nSize2,
                 double rTolerance,
                 bool fRelative,
-                Delegate addFigureCallback,
+                PathGeometry.AddFigureToListDelegate addFigureCallback,
                 GeometryCombineMode combineMode,
                 out FillRule resultFillRule);
 
@@ -126,7 +126,7 @@ internal unsafe static extern int MilUtility_PathGeometryWiden(
                 UInt32 nSize,
                 double rTolerance,
                 bool fRelative,
-                Delegate addFigureCallback,
+                PathGeometry.AddFigureToListDelegate addFigureCallback,
                 out FillRule widenedFillRule);
 
             [DllImport(DllImport.MilCore)]
@@ -137,7 +137,7 @@ internal unsafe static extern int MilUtility_PathGeometryOutline(
                 UInt32 nSize,
                 double rTolerance,
                 bool fRelative,
-                Delegate addFigureCallback,
+                PathGeometry.AddFigureToListDelegate addFigureCallback,
                 out FillRule outlinedFillRule);
 
             [DllImport(DllImport.MilCore)]
@@ -148,14 +148,9 @@ internal unsafe static extern int MilUtility_PathGeometryFlatten(
                 UInt32 nSize,
                 double rTolerance,
                 bool fRelative,
-                Delegate addFigureCallback,
+                PathGeometry.AddFigureToListDelegate addFigureCallback,
                 out FillRule resultFillRule);
 
-            [DllImport(DllImport.MilCore)]
-            internal unsafe static extern int /* HRESULT */ MilGlyphCache_SetCreateGlyphBitmapsCallback(
-                MulticastDelegate del
-                );
-
             [DllImport(DllImport.MilCore)]
             internal unsafe static extern int MilGlyphCache_BeginCommandAtRenderTime(
                 IntPtr pMilSlaveGlyphCacheTarget,