From 73217c884caeca4bcfbb9cc93ffe4c90db79cf7a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 May 2019 13:20:23 -0700 Subject: Enable LCID marshalling and clean up our LCID marshalling tests. (#24642) * Enable LCID marshalling and clean up our LCID marshalling tests. * Fix return type. * Enable LCID IDispatch reverse marshalling * Add more tests for LCID marshalling. * Add testing for reverse-IDispatch. Fix bug in Thread::GetCulture when culture has not been initialized on the managed side. * PR Feedback. * Fix install command. --- src/vm/mscorlib.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/vm/mscorlib.h') diff --git a/src/vm/mscorlib.h b/src/vm/mscorlib.h index 50188f0407..d328d2a471 100644 --- a/src/vm/mscorlib.h +++ b/src/vm/mscorlib.h @@ -272,10 +272,8 @@ DEFINE_CLASS(CULTURE_INFO, Globalization, CultureInfo) DEFINE_METHOD(CULTURE_INFO, STR_CTOR, .ctor, IM_Str_RetVoid) DEFINE_FIELD(CULTURE_INFO, CURRENT_CULTURE, s_userDefaultCulture) DEFINE_PROPERTY(CULTURE_INFO, NAME, Name, Str) -#ifdef FEATURE_USE_LCID DEFINE_METHOD(CULTURE_INFO, INT_CTOR, .ctor, IM_Int_RetVoid) DEFINE_PROPERTY(CULTURE_INFO, ID, LCID, Int) -#endif DEFINE_FIELD(CULTURE_INFO, CULTURE, s_currentThreadCulture) DEFINE_FIELD(CULTURE_INFO, UI_CULTURE, s_currentThreadUICulture) DEFINE_STATIC_SET_PROPERTY(CULTURE_INFO, CURRENT_CULTURE, CurrentCulture, CultureInfo) -- cgit v1.2.3