Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -790,16 +790,22 @@ public unsafe IntPtr GetOrCreateComInterfaceForObject(object instance, CreateCom

ManagedObjectWrapperHolder managedObjectWrapper = _managedObjectWrapperTable.GetOrAdd(instance, static (c, state) =>
{
ManagedObjectWrapper* value = state.This.CreateManagedObjectWrapper(c, state.flags);
ManagedObjectWrapper* value = state.ComWrappers.CreateManagedObjectWrapper(c, state.Flags);
return new ManagedObjectWrapperHolder(value, c);
}, new { This = this, flags });
}, new CreateManagedObjectWrapperState(this, flags));

managedObjectWrapper.AddRef();
RegisterManagedObjectWrapperForDiagnostics(instance, managedObjectWrapper);

return managedObjectWrapper.ComIp;
}

private readonly struct CreateManagedObjectWrapperState(ComWrappers comWrappers, CreateComInterfaceFlags flags)
{
public readonly ComWrappers ComWrappers = comWrappers;
public readonly CreateComInterfaceFlags Flags = flags;
}

private static void RegisterManagedObjectWrapperForDiagnostics(object instance, ManagedObjectWrapperHolder wrapper)
{
if (!Debugger.IsSupported)
Expand Down
Loading