TransformInterfaces TransformCOM split

moved to internal Native struct
INativeInterface and IComInterface added to represent all interfaces and Com interfaces, respectively.
- IComInterface is a child of INativeInterface and INativeGuid

Author: curin

generator.json

@@ -8,6 +8,7 @@
       "Mods": [
         "ClangScraper",
         "ChangeNamespace",
+        "TransformInterfaces",
         "TransformCOM",
         "DisableWarnings"
       ],
@@ -52,17 +53,29 @@
           "TerraFX.Interop(?!.Windows)(.*)": "Silk.NET$1"
         }
       },
+      "TransformInterfaces": {
+        "AdditionalInterfaces": [
+          "IDispatchEx"
+        ]
+      },
       "TransformCOM": {
         "BaseTypes": {
-          "IUnknown.Interface": "Silk.NET.Win32.IUnknown.Interface"
+          "IUnknown.Native.Interface": "Silk.NET.Win32.IUnknown.Native.Interface"
+        },
+        "AdditionalCOMTypes": {
+          "IDispatchEx.Native.Interface": {
+            "Namespace": "Silk.NET.Win32",
+            "Parent": "IDispatch.Native.Interface"
+
+          }
         }
       },
       "DisableWarnings": {
         "WarningCodes": [
           "CS1589", //XML Comments missing (due to missing docs)
           "CS0419", //Inheritdoc issue (due to bug)
           "CA1416", //Function available outside of target os (intended)
-          "CS0618"  //Obsolete Warnings
+          "CS0618" //Obsolete Warnings
         ]
       }
     },

sources/Core/Core/IComInterface.cs

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.Core
+{
+    /// <summary>
+    /// A specialized native interface representing a ComType
+    /// </summary>
+    public interface IComInterface : INativeInterface, INativeGuid
+    {
+    }
+}

sources/Core/Core/INativeInterface.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.Core
+{
+    /// <summary>
+    /// Represents a native interface structure
+    /// </summary>
+    public unsafe interface INativeInterface
+    {
+        /// <summary>
+        /// Gets the address of  the pointer to the interface object address
+        /// </summary>
+        /// <typeparam name="TNativeInterface">The native interface object type</typeparam>
+        /// <returns>pointer to interface object address </returns>
+        TNativeInterface** GetAddressOf<TNativeInterface>() where TNativeInterface : unmanaged;
+        /// <summary>
+        /// Gets the address of  the pointer to the interface object address
+        /// </summary>
+        /// <returns>pointer to interface object address </returns>
+        void** GetAddressOf();
+    }
+}

sources/Core/Core/PublicAPI/net8.0/PublicAPI.Unshipped.txt

@@ -91,6 +91,7 @@ Silk.NET.Core.IBoolScheme
 Silk.NET.Core.IBoolScheme.False<T>() -> T
 Silk.NET.Core.IBoolScheme.IsTrue<T>(T value) -> bool
 Silk.NET.Core.IBoolScheme.True<T>() -> T
+Silk.NET.Core.IComInterface
 Silk.NET.Core.IGLContext
 Silk.NET.Core.IGLContext.IsCurrent.get -> bool
 Silk.NET.Core.IGLContext.IsCurrent.set -> void
@@ -105,6 +106,9 @@ Silk.NET.Core.INativeWindow
 Silk.NET.Core.INativeWindow.TryGetPlatformInfo<TPlatformInfo>(out TPlatformInfo? info) -> bool
 Silk.NET.Core.INativeGuid
 Silk.NET.Core.INativeGuid.NativeGuid.get -> System.Guid*
+Silk.NET.Core.INativeInterface
+Silk.NET.Core.INativeInterface.GetAddressOf() -> void**
+Silk.NET.Core.INativeInterface.GetAddressOf<TNativeInterface>() -> TNativeInterface**
 Silk.NET.Core.Loader.DefaultNativeContext
 Silk.NET.Core.Loader.DefaultNativeContext.DefaultNativeContext() -> void
 Silk.NET.Core.Loader.DefaultNativeContext.Dispose() -> void

sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs

@@ -179,7 +179,7 @@ out var handle
                             CXDiagnostic_Warning => LogLevel.Warning,
                             CXDiagnostic_Error => LogLevel.Error,
                             CXDiagnostic_Fatal => LogLevel.Critical,
-                            _ => LogLevel.Trace
+                            _ => LogLevel.Trace,
                         },
                         "    {0}",
                         diagnostic.Format(CXDiagnostic.DefaultDisplayOptions).ToString()
@@ -202,7 +202,14 @@ out var handle
                 using var translationUnit = TranslationUnit.GetOrCreate(handle);
                 Debug.Assert(translationUnit is not null);
 
-                logger.LogInformation("Generating raw bindings for '{0}' ({1}/{2}) ({3}/{4})", fileName, index, count, rspIndex, rspCount);
+                logger.LogInformation(
+                    "Generating raw bindings for '{0}' ({1}/{2}) ({3}/{4})",
+                    fileName,
+                    index,
+                    count,
+                    rspIndex,
+                    rspCount
+                );
                 pinvokeGenerator.GenerateBindings(
                     translationUnit,
                     filePath,
@@ -213,15 +220,14 @@ out var handle
 
                 if (files.Count == 0)
                 {
-                    logger.LogWarning("No files generated for {0}",
-                    filePath);
+                    logger.LogWarning("No files generated for {0}", filePath);
                 }
                 else
                 {
                     logger.LogDebug(
-                    "Completed generation for {0}, file count: {1}",
-                    filePath,
-                    files.Count
+                        "Completed generation for {0}, file count: {1}",
+                        filePath,
+                        files.Count
                     );
                 }
             }
@@ -298,15 +304,19 @@ await Parallel.ForEachAsync(
                 new ParallelOptions
                 {
                     CancellationToken = ct,
-                    MaxDegreeOfParallelism = parallelism
+                    MaxDegreeOfParallelism = parallelism,
                 },
                 async (rsp, innerCt) =>
                     await Task.Run(
                         async () =>
                         {
                             int index = Interlocked.Increment(ref rspIndex);
                             // Generate the raw bindings.
-                            var (sources, tests, hasErrors) = ScrapeRawBindings(rsp, index, rspCount);
+                            var (sources, tests, hasErrors) = ScrapeRawBindings(
+                                rsp,
+                                index,
+                                rspCount
+                            );
 
                             static MemoryStream Reopen(MemoryStream ms) =>
                                 ms.TryGetBuffer(out var buff) && buff.Array is not null
@@ -334,8 +344,9 @@ static MemoryStream Reopen(MemoryStream ms) =>
                                 // Cache the output.
                                 //TODO: Refactor for better Parallelisation
                                 //Breaks with high concurrency
-                                string relativePath = $"{(isTest ? "tests" : "sources")}/{relativeKey}";
-                                if (cacheKey is not null && !hasErrors && cfg.CacheOutput) 
+                                string relativePath =
+                                    $"{(isTest ? "tests" : "sources")}/{relativeKey}";
+                                if (cacheKey is not null && !hasErrors && cfg.CacheOutput)
                                 {
                                     cacheDir ??= (
                                         await cacheProvider!.GetDirectory(
@@ -359,7 +370,7 @@ static MemoryStream Reopen(MemoryStream ms) =>
                                     logger.LogTrace("ClangSharp skipped {0}", relativePath);
                                     continue;
                                 }
-                                
+
                                 // Add it to the dictionary.
                                 if (
                                     !(isTest ? aggregatedTests : aggregatedSources).TryAdd(
@@ -471,7 +482,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
             // Others
             VisualStudioResolver.TryGetVisualStudioInfo(out _)
                 ? "vs"
-                : "!vs"
+                : "!vs",
         };
 
         // Read the configuration.
@@ -486,19 +497,35 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
         var toRemoveMatcher = new Matcher();
         if (cfg.GeneratedToRemove is not null)
         {
-            toRemoveMatcher.AddIncludePatterns(cfg.GeneratedToRemove.Where(toRemove => !toRemove.StartsWith("!")).Select(ResponseFileHandler.PathFixup));
-            toRemoveMatcher.AddExcludePatterns(cfg.GeneratedToRemove.Where(toRemove => toRemove.StartsWith("!")).Select(toRemove => toRemove[1..]).Select(ResponseFileHandler.PathFixup));
+            toRemoveMatcher.AddIncludePatterns(
+                cfg.GeneratedToRemove.Where(toRemove => !toRemove.StartsWith("!"))
+                    .Select(ResponseFileHandler.PathFixup)
+            );
+            toRemoveMatcher.AddExcludePatterns(
+                cfg.GeneratedToRemove.Where(toRemove => toRemove.StartsWith("!"))
+                    .Select(toRemove => toRemove[1..])
+                    .Select(ResponseFileHandler.PathFixup)
+            );
         }
 
         if (rsps.Count == 0)
         {
             logger.LogWarning("No Response files found for {}", ctx.JobKey);
         }
 
-        var missingIncludes = rsps.SelectMany<ResponseFile, string>(rsp => rsp.ClangCommandLineArgs.Where(arg => arg.StartsWith("--include-directory=") && !Directory.Exists(arg.Substring(20)))).Select(arg => arg.Substring(20)).Distinct();
+        var missingIncludes = rsps.SelectMany<ResponseFile, string>(rsp =>
+                rsp.ClangCommandLineArgs.Where(arg =>
+                    arg.StartsWith("--include-directory=") && !Directory.Exists(arg.Substring(20))
+                )
+            )
+            .Select(arg => arg.Substring(20))
+            .Distinct();
         if (missingIncludes.Count() > 0)
         {
-            logger.LogWarning("The following includes are missing and may cause erroneous generation: \n" + string.Join("\n", missingIncludes));
+            logger.LogWarning(
+                "The following includes are missing and may cause erroneous generation: \n"
+                    + string.Join("\n", missingIncludes)
+            );
         }
 
         // Apply modifications. This is done before the cache key as modifications to the rsps result in different

sources/SilkTouch/SilkTouch/Mods/Common/ModLoader.cs

@@ -29,6 +29,7 @@ public class ModLoader
             nameof(ExtractNestedTyping) => typeof(ExtractNestedTyping),
             nameof(TransformProperties) => typeof(TransformProperties),
             nameof(ClangScraper) => typeof(ClangScraper),
+            nameof(TransformInterfaces) => typeof(TransformInterfaces),
             nameof(TransformCOM) => typeof(TransformCOM),
             nameof(DisableWarnings) => typeof(DisableWarnings),
             _ => null,

sources/SilkTouch/SilkTouch/Mods/DisableWarnings.cs

@@ -1,12 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Build.Evaluation;
 using Microsoft.CodeAnalysis;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Extensions.Options;
-using Microsoft.Build.Evaluation;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Silk.NET.SilkTouch.Mods
 {
@@ -15,8 +15,7 @@ namespace Silk.NET.SilkTouch.Mods
     /// </summary>
     /// <param name="config">The configuration to use.</param>
     [ModConfiguration<Configuration>]
-    public class DisableWarnings(
-        IOptionsSnapshot<DisableWarnings.Configuration> config) : Mod
+    public class DisableWarnings(IOptionsSnapshot<DisableWarnings.Configuration> config) : Mod
     {
         /// <summary>
         /// The configuration for the <see cref="DisableWarnings"/> mod.
@@ -44,30 +43,38 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
 
             // Create the pragma directive trivia
             var pragmaDirective = Trivia(
-                                    PragmaWarningDirectiveTrivia(
-                                        Token(SyntaxKind.DisableKeyword),
-                                        true)
-                                    .WithErrorCodes(
-                                        SeparatedList<ExpressionSyntax>(
-                                            cfg.WarningCodes.Select(warn => IdentifierName(warn)))));
+                PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)
+                    .WithErrorCodes(
+                        SeparatedList<ExpressionSyntax>(
+                            cfg.WarningCodes.Select(warn => IdentifierName(warn))
+                        )
+                    )
+            );
 
             ctx.SourceProject = await DisableWarningsAsync(ctx.SourceProject, pragmaDirective, ct);
             ctx.TestProject = await DisableWarningsAsync(ctx.TestProject, pragmaDirective, ct);
         }
 
-        private async Task<Microsoft.CodeAnalysis.Project?> DisableWarningsAsync(Microsoft.CodeAnalysis.Project? proj, SyntaxTrivia pragmaDirective, CancellationToken ct)
+        private async Task<Microsoft.CodeAnalysis.Project?> DisableWarningsAsync(
+            Microsoft.CodeAnalysis.Project? proj,
+            SyntaxTrivia pragmaDirective,
+            CancellationToken ct
+        )
         {
             foreach (var docId in proj?.DocumentIds ?? [])
             {
                 var doc =
-                    proj?.GetDocument(docId) ?? throw new InvalidOperationException("Document missing");
+                    proj?.GetDocument(docId)
+                    ?? throw new InvalidOperationException("Document missing");
                 if (await doc.GetSyntaxRootAsync(ct) is not { } root)
                 {
                     continue;
                 }
 
                 // Find the using directive
-                SyntaxNode? namespaceNode = root.DescendantNodes().OfType<FileScopedNamespaceDeclarationSyntax>().FirstOrDefault();
+                SyntaxNode? namespaceNode = root.DescendantNodes()
+                    .OfType<FileScopedNamespaceDeclarationSyntax>()
+                    .FirstOrDefault();
 
                 if (namespaceNode == null)
                 {
@@ -79,7 +86,8 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
                 var leadingTrivia = namespaceNode.GetLeadingTrivia();
 
                 // Insert the pragma directive after the comments
-                var newLeadingTrivia = leadingTrivia.Insert(leadingTrivia.Count, pragmaDirective)
+                var newLeadingTrivia = leadingTrivia
+                    .Insert(leadingTrivia.Count, pragmaDirective)
                     .Add(CarriageReturnLineFeed);
 
                 // Update the using directive with the new leading trivia