Skip to content

Commit 4462c47

Browse files
committed
fix: another small refactor
1 parent f06e0b5 commit 4462c47

File tree

4 files changed

+93
-193
lines changed

4 files changed

+93
-193
lines changed

managed/Plugify/Marshalling.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,7 @@ internal static unsafe void MarshalReturnValue(object? paramValue, Type paramTyp
244244
}
245245
case ValueType.Any:
246246
{
247-
var var = (Variant256*)outValue;
248-
NativeMethods.DestroyVariant(var);
249-
NativeMethods.SetVariantData(var, paramValue);
247+
NativeMethods.AssignVariant((Variant256*)outValue, paramValue);
250248
return;
251249
}
252250
case ValueType.ArrayBool:
@@ -607,7 +605,7 @@ private static unsafe Func<object[], object> ExternalInvoke(nint funcAddress, Me
607605
JitCall call = new JitCall(funcAddress, parameterTypes, returnType);
608606
if (call.Function == null)
609607
{
610-
throw new InvalidOperationException($"Method '{methodInfo.Name}' has JIT generation error: {call.Error}");
608+
throw new InvalidOperationException($"{methodInfo.Name} (jit error: {call.Error})");
611609
}
612610

613611
return parameters =>
@@ -1579,7 +1577,7 @@ public static nint GetFunctionPointerForDelegate(Delegate d)
15791577
nint function = callback.Function;
15801578
if (function == nint.Zero)
15811579
{
1582-
throw new InvalidOperationException($"Method '{methodInfo.Name}' has JIT generation error: {callback.Error}");
1580+
throw new InvalidOperationException($"{methodInfo.Name} (jit error: {callback.Error})");
15831581
}
15841582

15851583
CachedDelegates.Add(d, callback);

0 commit comments

Comments
 (0)