Port CustomMarshalers.dll to C# and .NET Core #21343

jkoritzinsky · 2018-12-04T00:16:33Z

Port the CustomMarshalers.dll from .NET Framework to .NET Core and put the code in System.Private.CoreLib.

Adds the System.Runtime.InteropServices.CustomMarshalers namespace with the types that are relevant/implementable on .NET Core.

Also adds relevant (Windows-only) tests.

Supercedes dotnet/corefx#33773

src/System.Private.CoreLib/shared/System/Collections/IEnumerable.cs

src/vm/mlinfo.cpp

...CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumerableToDispatchMarshaler.cs

...eLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumeratorToEnumVariantMarshaler.cs

src/System.Private.CoreLib/src/System/Runtime/InteropServices/IDispatch.cs

src/vm/classnames.h

...e.CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumVariantViewOfEnumerator.cs

...e.CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumeratorViewOfEnumVariant.cs

AaronRobinsonMSFT · 2018-12-04T02:02:28Z

...e.CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumeratorViewOfEnumVariant.cs

+            int hr = _enumVariantObject.Reset();
+            if (hr < 0)
+            {
+                Marshal.ThrowExceptionForHR(hr);


Is this a case where the interop definition of the interface doesn't expose the HRESULT?

This is an implementation of the IEnumerator.Reset method. The IEnumVARIANT interface exposes the HRESULT, so I was planning on throwing the exception in managed code.

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp

…m.Runtime.InteropServices.CustomMarshalers.

… in the tests.

… in an incorrect type into DoQueryInterface.

tests/src/Interop/common/ComHelpers.h

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.cs

…mVariantMarshaler.

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h

AaronRobinsonMSFT · 2018-12-04T23:51:22Z

There are a bunch of duplicate issues that I have already commented on. I am not going to comment on each instance. Please be proactive and consider all my style comments and usage issues across the entire change.

jkoritzinsky · 2018-12-04T23:52:39Z

Sorry about that. I'm trying to fix them all but am not being as thorough as I should be. I'll be sure to be more careful.

…he custom marshalers.

src/System.Private.CoreLib/ILLinkTrim.xml

jkoritzinsky · 2018-12-05T18:06:00Z

@dotnet-bot test Windows_NT x64 full_opt ryujit CoreCLR Perf Tests Correctness
@dotnet-bot test Windows_NT x64 min_opt ryujit CoreCLR Perf Tests Correctness
@dotnet-bot test Windows_NT x86 full_opt ryujit CoreCLR Perf Tests Correctness
@dotnet-bot test Windows_NT x86 min_opt ryujit CoreCLR Perf Tests Correctness

jkotas

My concerns are addressed. @AaronRobinsonMSFT Could you please sign-off as well?

AaronRobinsonMSFT

LGTM.

AaronRobinsonMSFT · 2018-12-06T05:31:14Z

src/vm/mngstdinterfaces.cpp

    {
-        // In desktop CLR we'll attempt to call through IDispatch(DISPID_NEWENUM)
-        // This is not supported in CoreCLR
-        COMPlusThrow(kPlatformNotSupportedException, IDS_EE_ERROR_IDISPATCH);


Please make sure to remove IDS_EE_ERROR_IDISPATCH if it isn't used anywhere else.

* Import CustomMarshalers from corefx PR. * Add tests for marshalling IEnumerator and IEnumerable using the System.Runtime.InteropServices.CustomMarshalers. * Verify that the marshaller is used in the managed -> native direction in the tests. * Remove #if's * PR Feedback. * Move ComHelpers.h into interop common headers. * Add some template machinery to ensure that we don't accidentally pass in an incorrect type into DoQueryInterface. * Add VariantClear * Make marshalers internal and root them in ILLinkTrim.xml * Revert enable-if machinery. * Add tests for the pass-through unwrapping done by the EnumeratorToEnumVariantMarshaler. * Remove some of my helper code. * Added todo about exposing EnumerableToDispatchMarshaler. * PR Feedback. * Removed the last placement new. * Use the runtime hooks to enable us to not have to publically expose the custom marshalers. * Remove out of date comments. Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

jjxtra · 2019-01-28T03:06:59Z

Is this going to make it into .net core 2.x?

jkotas · 2019-01-28T03:18:51Z

The change is part of larger set of changes for full COM support in .NET Core. We do not plan to port the full COM support back to 2.x.

* Import CustomMarshalers from corefx PR. * Add tests for marshalling IEnumerator and IEnumerable using the System.Runtime.InteropServices.CustomMarshalers. * Verify that the marshaller is used in the managed -> native direction in the tests. * Remove #if's * PR Feedback. * Move ComHelpers.h into interop common headers. * Add some template machinery to ensure that we don't accidentally pass in an incorrect type into DoQueryInterface. * Add VariantClear * Make marshalers internal and root them in ILLinkTrim.xml * Revert enable-if machinery. * Add tests for the pass-through unwrapping done by the EnumeratorToEnumVariantMarshaler. * Remove some of my helper code. * Added todo about exposing EnumerableToDispatchMarshaler. * PR Feedback. * Removed the last placement new. * Use the runtime hooks to enable us to not have to publically expose the custom marshalers. * Remove out of date comments. Commit migrated from dotnet/coreclr@5955967

jkoritzinsky added the area-Interop label Dec 4, 2018

jkoritzinsky requested review from AaronRobinsonMSFT and jkotas December 4, 2018 00:16

jkoritzinsky mentioned this pull request Dec 4, 2018

Port CustomMarshalers.dll to C# and .NET Core dotnet/corefx#33773

Closed

jkotas reviewed Dec 4, 2018

View reviewed changes

src/System.Private.CoreLib/shared/System/Collections/IEnumerable.cs Show resolved Hide resolved

jkotas reviewed Dec 4, 2018

View reviewed changes

src/vm/mlinfo.cpp Outdated Show resolved Hide resolved

jkotas reviewed Dec 4, 2018

View reviewed changes

...CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumerableToDispatchMarshaler.cs Outdated Show resolved Hide resolved

jkotas reviewed Dec 4, 2018

View reviewed changes

...eLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumeratorToEnumVariantMarshaler.cs Outdated Show resolved Hide resolved

jkotas reviewed Dec 4, 2018

View reviewed changes

src/System.Private.CoreLib/src/System/Runtime/InteropServices/IDispatch.cs Outdated Show resolved Hide resolved

jkotas reviewed Dec 4, 2018

View reviewed changes

src/vm/classnames.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

...e.CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumVariantViewOfEnumerator.cs Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

...e.CoreLib/src/System/Runtime/InteropServices/CustomMarshalers/EnumeratorViewOfEnumVariant.cs Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp Show resolved Hide resolved

jkoritzinsky added 9 commits December 4, 2018 12:00

Import CustomMarshalers from corefx PR.

c76188f

Add tests for marshalling IEnumerator and IEnumerable using the Syste…

8d83914

…m.Runtime.InteropServices.CustomMarshalers.

Verify that the marshaller is used in the managed -> native direction…

4370f03

… in the tests.

Remove #if's

4b73dbe

PR Feedback.

8c70ef4

Move ComHelpers.h into interop common headers.

6061767

Add some template machinery to ensure that we don't accidentally pass…

c71a96e

… in an incorrect type into DoQueryInterface.

Add VariantClear

d4310b1

Make marshalers internal and root them in ILLinkTrim.xml

1094542

jkoritzinsky force-pushed the custom-marshalers branch from bbf33ab to 1094542 Compare December 4, 2018 20:02

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/common/ComHelpers.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp Outdated Show resolved Hide resolved

Revert enable-if machinery.

53b1e52

jkotas reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.cs Outdated Show resolved Hide resolved

jkoritzinsky added 3 commits December 4, 2018 15:11

Add tests for the pass-through unwrapping done by the EnumeratorToEnu…

7c878a9

…mVariantMarshaler.

Remove some of my helper code.

f35b143

Added todo about exposing EnumerableToDispatchMarshaler.

9ddf7a5

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.cpp Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h Outdated Show resolved Hide resolved

AaronRobinsonMSFT reviewed Dec 4, 2018

View reviewed changes

tests/src/Interop/PInvoke/IEnumerator/IEnumeratorNative.h Outdated Show resolved Hide resolved

PR Feedback.

f54b8aa

Removed the last placement new.

faa7ef3

jkoritzinsky added 2 commits December 4, 2018 17:04

Use the runtime hooks to enable us to not have to publically expose t…

37b41cb

…he custom marshalers.

Remove out of date comments.

df6d66a

jkotas reviewed Dec 5, 2018

View reviewed changes

src/System.Private.CoreLib/ILLinkTrim.xml Show resolved Hide resolved

jkotas approved these changes Dec 6, 2018

View reviewed changes

AaronRobinsonMSFT approved these changes Dec 6, 2018

View reviewed changes

jkoritzinsky merged commit 5955967 into dotnet:master Dec 6, 2018

jkoritzinsky deleted the custom-marshalers branch December 6, 2018 17:56

AaronRobinsonMSFT mentioned this pull request Aug 5, 2024

Remove managed interfaces impls defined in CoreCLR dotnet/runtime#105965

Merged

AaronRobinsonMSFT mentioned this pull request Nov 14, 2025

.NET 10: COM interop: IDispatchEx RCWs no longer support IReflect dotnet/runtime#121635

Closed

Port CustomMarshalers.dll to C# and .NET Core #21343

Port CustomMarshalers.dll to C# and .NET Core #21343

Uh oh!

Conversation

jkoritzinsky commented Dec 4, 2018

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AaronRobinsonMSFT Dec 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jkoritzinsky Dec 4, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AaronRobinsonMSFT commented Dec 4, 2018

Uh oh!

jkoritzinsky commented Dec 4, 2018

Uh oh!

Uh oh!

jkoritzinsky commented Dec 5, 2018

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

AaronRobinsonMSFT left a comment

Choose a reason for hiding this comment

Uh oh!

AaronRobinsonMSFT Dec 6, 2018

Choose a reason for hiding this comment

Uh oh!

jjxtra commented Jan 28, 2019

Uh oh!

jkotas commented Jan 28, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AaronRobinsonMSFT Dec 4, 2018 •

edited

Loading