diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2019-04-19 09:05:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 09:05:23 -0700 |
| commit | df6b6f621898915e5a8ba0579c2dc8a6a6cd6ec3 (patch) | |
| tree | bcb34fca0b47715049fed1dc69b25667d7c185f6 /src/dlls | |
| parent | 4049a3e9bb28eb4ed7963adf691e2a58a982eb32 (diff) | |
| download | coreclr-df6b6f621898915e5a8ba0579c2dc8a6a6cd6ec3.tar.gz coreclr-df6b6f621898915e5a8ba0579c2dc8a6a6cd6ec3.tar.bz2 coreclr-df6b6f621898915e5a8ba0579c2dc8a6a6cd6ec3.zip | |
Block usage of default interfaces feature in COM scenarios (#23970)
* Block default interface usage in COM scenarios
Add additional test cases and move some CCW functions to a more
consolidated layout.
Diffstat (limited to 'src/dlls')
| -rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 3 | ||||
| -rw-r--r-- | src/dlls/mscorrc/resource.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index c733f694ee..3576b48b04 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -913,8 +913,9 @@ BEGIN IDS_EE_COM_INVISIBLE_PARENT "Type '%1' has a ComVisible(false) parent '%2' in its hierarchy, therefore QueryInterface calls for IDispatch or class interfaces are disallowed." - IDS_EE_COMIMPORT_METHOD_NO_INTERFACE "Method '%1' in ComImport class '%2' must implement an interface method." IDS_EE_ATTEMPT_TO_CREATE_GENERIC_CCW "Generic types cannot be marshaled to COM interface pointers." + IDS_EE_ATTEMPT_TO_CREATE_NON_ABSTRACT_CCW "Types with non-abstract methods cannot be marshaled to COM interface pointers." + IDS_EE_COMIMPORT_METHOD_NO_INTERFACE "Method '%1' in ComImport class '%2' must implement an interface method." IDS_CLASSLOAD_BAD_METHOD_COUNT "Metadata method count does not match method enumeration length for type '%1' from assembly '%2'." IDS_CLASSLOAD_BAD_FIELD_COUNT "Metadata field count does not match field enumeration length for type '%1' from assembly '%2'." diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h index f11aa12fec..01982d324c 100644 --- a/src/dlls/mscorrc/resource.h +++ b/src/dlls/mscorrc/resource.h @@ -440,7 +440,7 @@ #define IDS_EE_PROFILING_FAILURE 0x1aa8 #define IDS_EE_ATTEMPT_TO_CREATE_GENERIC_CCW 0x1aa9 - +#define IDS_EE_ATTEMPT_TO_CREATE_NON_ABSTRACT_CCW 0x1aaa #define IDS_EE_COMIMPORT_METHOD_NO_INTERFACE 0x1aab #define IDS_EE_OUT_OF_MEMORY_WITHIN_RANGE 0x1aac #define IDS_EE_ARRAY_DIMENSIONS_EXCEEDED 0x1aad |