gircore · badcel · Oct 31, 2024 · Oct 31, 2024 · Oct 31, 2024 · Oct 31, 2024
diff --git a/ext/gir-files b/ext/gir-files
diff --git a/src/Generation/Generator/Fixer/Record/DisableBrokenTypes.cs b/src/Generation/Generator/Fixer/Record/DisableBrokenTypes.cs
@@ -0,0 +1,17 @@
+using Generator.Model;
+
+namespace Generator.Fixer.Record;
+
+internal class DisableBrokenTypes : Fixer<GirModel.Record>
+{
+    public void Fixup(GirModel.Record record)
+    {
+        switch (record.Name)
+        {
+            case "Win32NetworkMonitor":
+            case "Win32NetworkMonitorClass":
+                Type.Disable(record);
+                break;
+        }
+    }
+}
diff --git a/src/Generation/Generator/Fixer/Records.cs b/src/Generation/Generator/Fixer/Records.cs
@@ -5,13 +5,14 @@ namespace Generator.Fixer;
 
 public static class Records
 {
-    private static readonly List<Fixer<GirModel.Record>> Fixers = new()
-    {
+    private static readonly List<Fixer<GirModel.Record>> Fixers =
+    [
+        new DisableBrokenTypes(),
         new InternalMethodsNamedLikeRecordFixer(),
         new MethodWithInOutInstanceParameterFixer(),
         new PublicMethodsColldingWithFieldFixer(),
         new RecordEqualsMethodCollidesWithGeneratedCode()
-    };
+    ];
 
     public static void Fixup(IEnumerable<GirModel.Record> records)
     {

diff --git a/src/Generation/Generator/Generator/Internal/TypedRecord.cs b/src/Generation/Generator/Generator/Internal/TypedRecord.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class TypedRecord : Generator<GirModel.Record>
+internal class TypedRecord(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public TypedRecord(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsTyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.TypedRecord.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/TypedRecordData.cs b/src/Generation/Generator/Generator/Internal/TypedRecordData.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class TypedRecordData : Generator<GirModel.Record>
+internal class TypedRecordData(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public TypedRecordData(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsTyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.TypedRecordData.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/TypedRecordDelegates.cs b/src/Generation/Generator/Generator/Internal/TypedRecordDelegates.cs
@@ -3,15 +3,8 @@
 
 namespace Generator.Generator.Internal;
 
-internal class TypedRecordDelegates : Generator<GirModel.Record>
+internal class TypedRecordDelegates(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public TypedRecordDelegates(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record record)
     {
         if (!Record.IsTyped(record))
@@ -20,6 +13,9 @@ public void Generate(GirModel.Record record)
         if (!record.Fields.Any(field => field.AnyTypeOrCallback.IsT1))
             return;
 
+        if (!Type.IsEnabled(record))
+            return;
+
         var source = Renderer.Internal.TypedRecordDelegates.Render(record);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(record.Namespace),
@@ -28,6 +24,6 @@ public void Generate(GirModel.Record record)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/TypedRecordHandle.cs b/src/Generation/Generator/Generator/Internal/TypedRecordHandle.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class TypedRecordHandle : Generator<GirModel.Record>
+internal class TypedRecordHandle(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public TypedRecordHandle(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsTyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.TypedRecordHandle.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/UntypedRecord.cs b/src/Generation/Generator/Generator/Internal/UntypedRecord.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class UntypedRecord : Generator<GirModel.Record>
+internal class UntypedRecord(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public UntypedRecord(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsUntyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.UntypedRecord.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/UntypedRecordData.cs b/src/Generation/Generator/Generator/Internal/UntypedRecordData.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class UntypedRecordData : Generator<GirModel.Record>
+internal class UntypedRecordData(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public UntypedRecordData(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsUntyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.UntypedRecordData.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Internal/UntypedRecordHandle.cs b/src/Generation/Generator/Generator/Internal/UntypedRecordHandle.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Internal;
 
-internal class UntypedRecordHandle : Generator<GirModel.Record>
+internal class UntypedRecordHandle(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public UntypedRecordHandle(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record obj)
     {
         if (!Record.IsUntyped(obj))
             return;
 
+        if (!Type.IsEnabled(obj))
+            return;
+
         var source = Renderer.Internal.UntypedRecordHandle.Render(obj);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(obj.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record obj)
             IsInternal: true
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Public/TypedRecord.cs b/src/Generation/Generator/Generator/Public/TypedRecord.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Public;
 
-internal class TypedRecord : Generator<GirModel.Record>
+internal class TypedRecord(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public TypedRecord(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record record)
     {
         if (!Record.IsTyped(record))
             return;
 
+        if (!Type.IsEnabled(record))
+            return;
+
         var source = Renderer.Public.TypedRecord.Render(record);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(record.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record record)
             IsInternal: false
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Generator/Public/UntypedRecord.cs b/src/Generation/Generator/Generator/Public/UntypedRecord.cs
@@ -2,20 +2,16 @@
 
 namespace Generator.Generator.Public;
 
-internal class UntypedRecord : Generator<GirModel.Record>
+internal class UntypedRecord(Publisher publisher) : Generator<GirModel.Record>
 {
-    private readonly Publisher _publisher;
-
-    public UntypedRecord(Publisher publisher)
-    {
-        _publisher = publisher;
-    }
-
     public void Generate(GirModel.Record record)
     {
         if (!Record.IsUntyped(record))
             return;
 
+        if (!Type.IsEnabled(record))
+            return;
+
         var source = Renderer.Public.UntypedRecord.Render(record);
         var codeUnit = new CodeUnit(
             Project: Namespace.GetCanonicalName(record.Namespace),
@@ -24,6 +20,6 @@ public void Generate(GirModel.Record record)
             IsInternal: false
         );
 
-        _publisher.Publish(codeUnit);
+        publisher.Publish(codeUnit);
     }
 }
diff --git a/src/Generation/Generator/Model/Type.Disable.cs b/src/Generation/Generator/Model/Type.Disable.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Generator.Model;
+
+internal static partial class Type
+{
+    private static readonly HashSet<GirModel.Type> Disabled = new();
+
+    public static void Disable(GirModel.Type type)
+    {
+        lock (Disabled)
+        {
+            Disabled.Add(type);
+        }
+    }
+
+    public static bool IsEnabled(GirModel.Type type)
+    {
+        //Does not need a lock as it is called only after all insertions are done.
+        return !Disabled.Contains(type);
+    }
+}
diff --git a/src/Generation/Generator/Model/Type.cs b/src/Generation/Generator/Model/Type.cs
@@ -2,7 +2,7 @@
 
 namespace Generator.Model;
 
-internal static class Type
+internal static partial class Type
 {
     public const string Pointer = "IntPtr";
     public const string PointerArray = "IntPtr[]";

diff --git a/src/Generation/Generator/Renderer/Public/Constructor/ConstructorRenderer.cs b/src/Generation/Generator/Renderer/Public/Constructor/ConstructorRenderer.cs
@@ -94,7 +94,7 @@ private static string RenderContent(IEnumerable<ParameterToNativeData> parameter
 
     private static string RenderCallStatement(GirModel.Constructor constructor, IEnumerable<ParameterToNativeData> parameters, Constructor.ConstructorData data)
     {
-        var variableName = "handle";
+        var variableName = $"{constructor.Parent.Name.ToLower()}Handle";
         var call = new StringBuilder();
         call.Append($"var {variableName} = Internal.{constructor.Parent.Name}.{Model.Constructor.GetName(constructor)}(");
         call.Append(string.Join(", ", parameters.Select(x => x.GetCallName())));