From 5dbe0a5f318cb72a6cf9130997886a489128f76f Mon Sep 17 00:00:00 2001
From: Edward Brey <ebrey@watertight.com>
Date: Wed, 27 Aug 2025 10:58:47 -0500
Subject: [PATCH] Fix event subscriptions for certain parameter types on .NET
 9.

---
 Distribution/wwDotnetBridge.PRG           | 25 ++++++++---------------
 DotnetBridge/Utilities/EventSubscriber.cs |  7 +++++--
 Tests/EventSubscriberTests.cs             |  4 ++--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Distribution/wwDotnetBridge.PRG b/Distribution/wwDotnetBridge.PRG
index 92e1af2..8040fac 100644
--- a/Distribution/wwDotnetBridge.PRG
+++ b/Distribution/wwDotnetBridge.PRG
@@ -1838,34 +1838,25 @@ this.oBridge.InvokeMethodAsync(this,this.oSubscriber,"WaitForEvent")
 ENDFUNC
 
 ************************************************************************
-*  OnComplete
+*  OnCompleted
 ****************************************
 ***  Function: Event Proxy that forwards the event to a function 
 ***            named On{Event} with event's parameters.
 ************************************************************************
 FUNCTION OnCompleted(lvResult, lcMethod)
-LOCAL loParams,lParamText,lCount
+LOCAL lParamText, lCount
 
-IF ISNULL(lvResult) && If the call to WaitForEvent was canceled:
+IF ISNULL(lvResult) OR VARTYPE(THIS.oHandler) != "O" && If the call to WaitForEvent was canceled or the handler was unsubscribed:
 	RETURN
 ENDIF
 
-
-loParams=CREATEOBJECT("EMPTY") && Workaround to index into array of parameters. 
 lParamText = ""
-IF NOT ISNULL(lvResult.Params)
-	lCount = 0
-	FOR EACH lParam IN lvResult.Params
-		lCount = lCount + 1
-		AddProperty(loParams,"P" + ALLTRIM(STR(lCount)),lParam)
-		lParamText = lParamText + ",loParams.P" + ALLTRIM(STR(lCount))
-	ENDFOR
-ENDIF
+FOR lCount = 0 TO lvResult.Params.Count - 1
+	lParamText = lParamText + ",lvResult.Params.Item(" + ALLTRIM(STR(lCount)) + ")"
+ENDFOR
 
-IF VARTYPE(THIS.oHandler) = "O"
-	=EVALUATE("this.oHandler." + this.oPrefix + lvResult.Name + "("+SUBSTR(lParamText,2)+")")
-	this.HandleNextEvent()
-ENDIF
+=EVALUATE("this.oHandler." + this.oPrefix + lvResult.Name + "("+SUBSTR(lParamText,2)+")")
+this.HandleNextEvent()
 
 ENDFUNC
 
diff --git a/DotnetBridge/Utilities/EventSubscriber.cs b/DotnetBridge/Utilities/EventSubscriber.cs
index 2e134c1..264fa36 100644
--- a/DotnetBridge/Utilities/EventSubscriber.cs
+++ b/DotnetBridge/Utilities/EventSubscriber.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -69,7 +70,9 @@ public void Dispose()
 
         private void QueueInteropEvent(string name, object[] parameters)
         {
-            var interopEvent = new RaisedEvent { Name = name, Params = parameters };
+            var parametersArrayList = new ArrayList(parameters.Length);
+            parametersArrayList.AddRange(parameters);
+            var interopEvent = new RaisedEvent { Name = name, Params = parametersArrayList };
             if (!_completion.TrySetResult(interopEvent))
                 _raisedEvents.Enqueue(interopEvent);
         }
@@ -93,6 +96,6 @@ public RaisedEvent WaitForEvent()
     public class RaisedEvent
     {
         public string Name { get; internal set; }
-        public object[] Params { get; internal set; }
+        public ArrayList Params { get; internal set; }
     }
 }
diff --git a/Tests/EventSubscriberTests.cs b/Tests/EventSubscriberTests.cs
index 7ce016b..f5b3d14 100644
--- a/Tests/EventSubscriberTests.cs
+++ b/Tests/EventSubscriberTests.cs
@@ -35,9 +35,9 @@ public void EventSubscriber_WaitForFutureEvents()
         static void VerifyResults(EventSubscriber subscriber)
         {
             var result = subscriber.WaitForEvent();
-            Assert.IsTrue(result.Name == nameof(Loopback.NoParams) && result.Params.Length == 0);
+            Assert.IsTrue(result.Name == nameof(Loopback.NoParams) && result.Params.Count == 0);
             result = subscriber.WaitForEvent();
-            Assert.IsTrue(result.Name == nameof(Loopback.TwoParams) && result.Params.Length == 2 && (string)result.Params[0] == "A" && (int)result.Params[1] == 1);
+            Assert.IsTrue(result.Name == nameof(Loopback.TwoParams) && result.Params.Count == 2 && (string)result.Params[0] == "A" && (int)result.Params[1] == 1);
         }
     }