Fix argument order and label

tristanlabelle · Dec 25, 2024 · f68aabc · f68aabc
1 parent f3a2ca9
commit f68aabc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Support/Sources/COM/COMDelegatingTearOff.swift b/Support/Sources/COM/COMDelegatingTearOff.swift
@@ -4,7 +4,7 @@ import COM_ABI
 public final class COMDelegatingTearOff: COMEmbedderEx {
     private var comEmbedding: COMEmbedding
 
-    public init(virtualTable: UnsafeRawPointer, owner: IUnknown) {
+    public init(owner: IUnknown, virtualTable: UnsafeRawPointer) {
         comEmbedding = .init(virtualTable: virtualTable, owner: nil)
         super.init(implementer: owner)
         comEmbedding.initOwner(self)

diff --git a/Support/Sources/COM/COMExportBase.swift b/Support/Sources/COM/COMExportBase.swift
@@ -24,12 +24,12 @@ open class COMExportBase<PrimaryInterfaceBinding: COMTwoWayBinding>: IUnknownPro
             case IAgileObjectBinding.interfaceID where Self.implementIAgileObject:
                 return toCOM().cast()
             case FreeThreadedMarshalBinding.interfaceID where Self.implementFreeThreadedMarshaling:
-                return try FreeThreadedMarshal(self).toCOM().cast()
+                return try FreeThreadedMarshal(owner: self).toCOM().cast()
             case ISupportErrorInfoBinding.interfaceID where Self.implementISupportErrorInfo:
-                return try SupportErrorInfoForAllInterfaces(self).toCOM().cast()
+                return try SupportErrorInfoForAllInterfaces(owner: self).toCOM().cast()
             default:
                 if let interfaceBinding = Self.queriableInterfaces.first(where: { $0.interfaceID == id }) {
-                    return COMDelegatingTearOff(virtualTable: interfaceBinding.virtualTablePointer, owner: self).toCOM()
+                    return COMDelegatingTearOff(owner: self, virtualTable: interfaceBinding.virtualTablePointer).toCOM()
                 }
                 throw COMError.noInterface
         }

diff --git a/Support/Sources/COM/FreeThreadedMarshal.swift b/Support/Sources/COM/FreeThreadedMarshal.swift
@@ -4,7 +4,7 @@ import COM_ABI
 public final class FreeThreadedMarshal: COMTearOffBase<FreeThreadedMarshalBinding> {
     private let marshaler: COMReference<SWRT_IMarshal>
 
-    public init(_ owner: IUnknown) throws {
+    public init(owner: IUnknown) throws {
         var marshalerUnknown: IUnknownPointer? = nil
         try COMError.fromABI(SWRT_CoCreateFreeThreadedMarshaler(/* pUnkOuter: */ nil, &marshalerUnknown))
         guard let marshalerUnknown else { throw COMError.noInterface }

diff --git a/Support/Sources/WindowsRuntime/ComposableClass.swift b/Support/Sources/WindowsRuntime/ComposableClass.swift
@@ -111,7 +111,7 @@ open class ComposableClass: IInspectableProtocol {
 
             // Check for additional implemented interfaces.
             if let interfaceBinding = type(of: owner).queriableInterfaces.first(where: { $0.interfaceID == id }) {
-                return COMDelegatingTearOff(virtualTable: interfaceBinding.virtualTablePointer, owner: owner).toCOM()
+                return COMDelegatingTearOff(owner: owner, virtualTable: interfaceBinding.virtualTablePointer).toCOM()
             }
 
             return try owner._queryInnerInterface(id)

diff --git a/Support/Sources/WindowsRuntime/ExportedDelegate.swift b/Support/Sources/WindowsRuntime/ExportedDelegate.swift
@@ -20,7 +20,9 @@ public final class ExportedDelegate<Binding: DelegateBinding>: COMEmbedderEx, IU
             case Binding.interfaceID, IUnknownBinding.interfaceID, IAgileObjectBinding.interfaceID:
                 return toCOM().cast()
             case FreeThreadedMarshalBinding.interfaceID:
-                return try FreeThreadedMarshal(self).toCOM().cast()
+                return try FreeThreadedMarshal(owner: self).toCOM().cast()
+            case ISupportErrorInfoBinding.interfaceID:
+                return try SupportErrorInfoForAllInterfaces(owner: self).toCOM().cast()
             default:
                 throw COMError.noInterface
         }