Rewrite Type.GetTypeFromProgID in C# #42546
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
jkotas
commented
Sep 21, 2020
jkotas
commented
- Move CoreRT managed implementation of Type.GetTypeFromProgID to CoreCLR
- Delete dead code and unnecessary levels of indirection
- Add tests for Type.GetTypeFromProgID and Type.GetTypeFromCLSID
- Move CoreRT managed implementation of Type.GetTypeFromProgID to CoreCLR - Delete dead code and unnecessary levels of indirection - Add tests for Type.GetTypeFromProgID and Type.GetTypeFromCLSID
jkotas
requested review from
akoeplinger,
EgorBo,
marek-safar,
steveisok and
vargaz
as code owners
jkotas
added
area-System.Runtime.InteropServices
and removed
area-Infrastructure-coreclr
labels
jkotas
commented
Sep 21, 2020
| #else // FEATURE_COMINTEROP_UNMANAGED_ACTIVATION | ||
| internal static Type GetTypeFromProgIDImpl(string progID, string? server, bool throwOnError) | ||
| { | ||
| throw new NotImplementedException("CoreCLR_REMOVED -- Unmanaged activation removed"); |
There was a problem hiding this comment.
Calling Type.GetTypeFromProgID on Unix gives this today:
Unhandled exception. System.NotImplementedException: CoreCLR_REMOVED -- Unmanaged activation removed
at System.RuntimeType.GetTypeFromProgIDImpl(String progID, String server, Boolean throwOnError)
at System.Type.GetTypeFromProgID(String progID)
This change is changing it to nice COM interop not support PlatformNotSupportedException.
jkotas
commented
Sep 21, 2020
| Assert.Same(type, Marshal.GetTypeFromCLSID(guid)); | ||
| Assert.Same(type, Marshal.GetTypeFromCLSID(TestCLSID)); | ||
|
|
||
| Assert.Same(type, Type.GetTypeFromCLSID(TestCLSID)); |
There was a problem hiding this comment.
We did not have any test coverage for Type.GetTypeFromCLSID and Type.GetTypeFromProgID
jkotas
commented
Sep 21, 2020
| if (throwOnError) | ||
| throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); | ||
|
|
||
| return null; |
There was a problem hiding this comment.
We will return null instead of throwing when throwOnError is false. It matches what we do in other similar situations.
jkotas
commented
Sep 21, 2020
| @@ -1318,171 +1318,6 @@ FCIMPL2(Object*, MarshalNative::GetObjectsForNativeVariants, VARIANT* aSrcNative | |||
| } | |||
| FCIMPLEND | |||
|
|
|||
| FCIMPL2(void, MarshalNative::DoGetTypeLibGuid, GUID * result, Object* refTlbUNSAFE) | |||
There was a problem hiding this comment.
Dead code that I have run into along the way
AaronRobinsonMSFT
approved these changes
Sep 22, 2020
src/coreclr/src/vm/interoputil.h
Outdated
| //-------------------------------------------------------------------------- | ||
| // GetComClassFromCLSID used by reflection class to setup a Class based on CLSID | ||
| void GetComClassFromCLSID(REFCLSID clsid, STRINGREF srefServer, OBJECTREF* pRef); | ||
| void GetComClassFromCLSID(REFCLSID clsid, __in_opt PCWSTR wszServer, OBJECTREF* pRef); |
There was a problem hiding this comment.
__in_opt is SAL. The SAL2 version is _In_opt_z_ for this one.
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.