diff options
| author | Dan Moseley <danmose@microsoft.com> | 2018-06-11 14:42:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 14:42:35 -0700 |
| commit | 8b7d6a0e4f357e86e2092101acbe7b6458ee40af (patch) | |
| tree | 1f3d5eeb67fd2b4134c6ea188360e195b43b5714 /src/dlls | |
| parent | 5c556d13b09e8f7c702da04d8ab2ece8ef9b71a6 (diff) | |
| download | coreclr-8b7d6a0e4f357e86e2092101acbe7b6458ee40af.tar.gz coreclr-8b7d6a0e4f357e86e2092101acbe7b6458ee40af.tar.bz2 coreclr-8b7d6a0e4f357e86e2092101acbe7b6458ee40af.zip | |
Reword invalid program exception message (#18409)
* Reword invalid program exception message
* Reword
* Update msg
Diffstat (limited to 'src/dlls')
| -rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 5 | ||||
| -rw-r--r-- | src/dlls/mscorrc/resource.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index 42c0be4f83..21a24c9698 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -1417,7 +1417,7 @@ BEGIN IDS_EE_ARRAY_DIMENSIONS_EXCEEDED "Array dimensions exceeded supported range." - IDS_EE_CANNOT_LOAD_JIT "Unable to load Jit Compiler: (%s): file may be missing or corrupt. Please check or rerun setup." + IDS_EE_CANNOT_LOAD_JIT "Unable to load JIT Compiler: (%s): file may be missing or corrupt. Please check or rerun setup." IDS_EE_PROFILING_FAILURE "Profiling failure" @@ -1527,8 +1527,7 @@ BEGIN IDS_EE_WRONG_METADATA_VERSION "'%1' has an incompatible metadata format. The assembly must be compiled using metadata format '%2'." IDS_CLASSLOAD_COLLECTIBLEFIXEDVTATTR "Collectible type '%1' has unsupported FixedAddressValueTypeAttribute applied to a field." - IDS_EE_JIT_COMPILER_ERROR "JIT Compiler encountered an internal limitation." - IDS_UNMARSHALABLE_DEMAND_OBJECT "The security object (Permission or PermissionSet) used for performing a Demand caused an error relating to serialization/deserialization." + IDS_EE_JIT_COMPILER_ERROR "The JIT compiler encountered invalid IL code or an internal limitation." IDS_EE_OBJECT_TO_VARIANT_NOT_SUPPORTED "Invalid managed/unmanaged type combination (Marshaling to and from COM VARIANTs isn't supported)." IDS_EE_OBJECT_TO_ITF_NOT_SUPPORTED "Invalid managed/unmanaged type combination (Marshaling to and from COM interface pointers isn't supported)." diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h index 49f1d0e69d..676d28fef5 100644 --- a/src/dlls/mscorrc/resource.h +++ b/src/dlls/mscorrc/resource.h @@ -748,7 +748,6 @@ #define IDS_CLASSLOAD_GENERICTYPE_RECURSIVE 0x207D #define IDS_LOADINTROSPECTION_DISALLOWED 0x207E #define IDS_EE_JIT_COMPILER_ERROR 0x207F -#define IDS_UNMARSHALABLE_DEMAND_OBJECT 0x2080 #define BFA_TYPE_FWD_CHAIN_TOO_LONG 0x2081 #define IDS_ER_APPLICATION 0x2082 |