Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update native code for System.Globalization #446

Merged
merged 1 commit into from
Aug 23, 2017
Merged

Update native code for System.Globalization #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMake/Modules/FindNF_CoreCLR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ set(NF_CoreCLR_SRCS
corlib_native_System_GC.cpp
corlib_native_System_Globalization_CultureInfo.cpp
corlib_native_System_Globalization_DateTimeFormat.cpp
corlib_native_System_Globalization_DaylightTime.cpp
corlib_native_System_Guid.cpp
corlib_native_System_MarshalByRefObject.cpp
corlib_native_System_Math.cpp
Expand Down
15 changes: 1 addition & 14 deletions src/CLR/CorLib/corlib_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_AppDomain::GetAssemblies___SZARRAY_SystemReflectionAssembly,
Library_corlib_native_System_AppDomain::LoadInternal___SystemReflectionAssembly__STRING__BOOLEAN__I4__I4__I4__I4,
Library_corlib_native_System_AppDomain::CreateDomain___STATIC__SystemAppDomain__STRING,
Expand Down Expand Up @@ -369,12 +366,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Globalization_CultureInfo::get_CurrentUICultureInternal___STATIC__SystemGlobalizationCultureInfo,
Library_corlib_native_System_Globalization_CultureInfo::set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo,
NULL,
Library_corlib_native_System_Globalization_DateTimeFormat::FormatDigits___STATIC__STRING__I4__I4,
NULL,
NULL,
Expand Down Expand Up @@ -421,11 +413,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
NULL,
NULL,
Expand Down Expand Up @@ -913,6 +900,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
{
"mscorlib",
0xE1520B3E,
0x138C738A,
method_lookup
};
43 changes: 4 additions & 39 deletions src/CLR/CorLib/corlib_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,6 @@ struct Library_corlib_native_System_Collections_Hashtable__KeyCollection

};

struct Library_corlib_native_System_Globalization_Resources_CultureInfo
{
static const int FIELD_STATIC__manager = 0;


//--//

};

struct Library_corlib_native_System_AppDomain
{
static const int FIELD___appDomain = 1;
Expand Down Expand Up @@ -411,7 +402,6 @@ struct Library_corlib_native_System_Globalization_CultureInfo
static const int FIELD___parent = 5;

NANOCLR_NATIVE_DECLARE(get_CurrentUICultureInternal___STATIC__SystemGlobalizationCultureInfo);
NANOCLR_NATIVE_DECLARE(set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo);

//--//

Expand All @@ -427,35 +417,10 @@ struct Library_corlib_native_System_Globalization_DateTimeFormat

struct Library_corlib_native_System_Globalization_DateTimeFormatInfo
{
static const int FIELD___amDesignator = 1;
static const int FIELD___pmDesignator = 2;
static const int FIELD___dateSeparator = 3;
static const int FIELD___longTimePattern = 4;
static const int FIELD___shortTimePattern = 5;
static const int FIELD___generalShortTimePattern = 6;
static const int FIELD___generalLongTimePattern = 7;
static const int FIELD___timeSeparator = 8;
static const int FIELD___monthDayPattern = 9;
static const int FIELD___fullDateTimePattern = 10;
static const int FIELD___longDatePattern = 11;
static const int FIELD___shortDatePattern = 12;
static const int FIELD___yearMonthPattern = 13;
static const int FIELD___abbreviatedDayNames = 14;
static const int FIELD___dayNames = 15;
static const int FIELD___abbreviatedMonthNames = 16;
static const int FIELD___monthNames = 17;
static const int FIELD__CultureInfo = 18;


//--//

};

struct Library_corlib_native_System_Globalization_DaylightTime
{
static const int FIELD___daylightTimeStart = 1;
static const int FIELD___daylightTimeEnd = 2;
static const int FIELD___daylightTimeDelta = 3;
static const int FIELD___generalShortTimePattern = 1;
static const int FIELD___generalLongTimePattern = 2;
static const int FIELD___fullDateTimePattern = 3;
static const int FIELD__CultureInfo = 4;


//--//
Expand Down
10 changes: 0 additions & 10 deletions src/CLR/CorLib/corlib_native_System_Globalization_CultureInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,3 @@ HRESULT Library_corlib_native_System_Globalization_CultureInfo::get_CurrentUICul

NANOCLR_NOCLEANUP_NOLABEL();
}

HRESULT Library_corlib_native_System_Globalization_CultureInfo::set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo( CLR_RT_StackFrame& stack )
{
NATIVE_PROFILE_CLR_CORE();
NANOCLR_HEADER();

g_CLR_RT_ExecutionEngine.m_currentUICulture = stack.Arg0().Dereference();

NANOCLR_NOCLEANUP_NOLABEL();
}
8 changes: 0 additions & 8 deletions src/CLR/CorLib/corlib_native_System_Globalization_DaylightTime.cpp
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/CLR/CorLib/corlib_native_System_String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,7 @@ HRESULT Library_corlib_native_System_String::Concat( CLR_RT_StackFrame& stack, C
szTextSrc = ptrSrc->RecoverString();
if(szTextSrc)
{
// UNDONE: FIXME
// len = (CLR_UINT32)hal_strlen_s( szTextSrc );
len = (CLR_UINT32)hal_strlen_s( szTextSrc );

if(i==0)
{
Expand Down