From 90bb4594deb21221b853038924fce16522c0f708 Mon Sep 17 00:00:00 2001 From: James Ko Date: Wed, 25 Jan 2017 17:26:22 -0500 Subject: Use FCThrowArgumentVoid --- src/classlibnative/bcltype/arraynative.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classlibnative/bcltype/arraynative.cpp b/src/classlibnative/bcltype/arraynative.cpp index d45c2b00c9..b9e517207e 100644 --- a/src/classlibnative/bcltype/arraynative.cpp +++ b/src/classlibnative/bcltype/arraynative.cpp @@ -1054,10 +1054,10 @@ FCIMPL6(void, ArrayNative::ArrayCopy, ArrayBase* m_pSrc, INT32 m_iSrcIndex, Arra FCThrowArgumentOutOfRangeVoid(W("destinationIndex"), W("ArgumentOutOfRange_ArrayLB")); if ((DWORD)(m_iSrcIndex - srcLB + m_iLength) > srcLen) - FCThrowResVoid(kArgumentException, W("Arg_LongerThanSrcArray")); + FCThrowArgumentVoid(W("sourceArray"), W("Arg_LongerThanSrcArray")); if ((DWORD)(m_iDstIndex - destLB + m_iLength) > destLen) - FCThrowResVoid(kArgumentException, W("Arg_LongerThanDestArray")); + FCThrowArgumentVoid(W("destinationArray"), W("Arg_LongerThanDestArray")); int r = 0; -- cgit v1.2.3 From 64700c3f88ec547d3b41bdfc4b801c0a4491cf8a Mon Sep 17 00:00:00 2001 From: James Ko Date: Wed, 25 Jan 2017 21:40:48 -0500 Subject: Fix parameter names for Array.Copy --- src/classlibnative/bcltype/arraynative.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/classlibnative/bcltype/arraynative.cpp b/src/classlibnative/bcltype/arraynative.cpp index 58fa4dd3e6..d45c2b00c9 100644 --- a/src/classlibnative/bcltype/arraynative.cpp +++ b/src/classlibnative/bcltype/arraynative.cpp @@ -1021,7 +1021,7 @@ FCIMPL6(void, ArrayNative::ArrayCopy, ArrayBase* m_pSrc, INT32 m_iSrcIndex, Arra // cannot pass null for source or destination if (gc.pSrc == NULL || gc.pDst == NULL) { - FCThrowArgumentNullVoid(gc.pSrc==NULL ? W("source") : W("dest")); + FCThrowArgumentNullVoid(gc.pSrc==NULL ? W("sourceArray") : W("destinationArray")); } // source and destination must be arrays @@ -1048,10 +1048,10 @@ FCIMPL6(void, ArrayNative::ArrayCopy, ArrayBase* m_pSrc, INT32 m_iSrcIndex, Arra FCThrowArgumentOutOfRangeVoid(W("length"), W("ArgumentOutOfRange_NeedNonNegNum")); if (m_iSrcIndex < srcLB || (m_iSrcIndex - srcLB < 0)) - FCThrowArgumentOutOfRangeVoid(W("srcIndex"), W("ArgumentOutOfRange_ArrayLB")); + FCThrowArgumentOutOfRangeVoid(W("sourceIndex"), W("ArgumentOutOfRange_ArrayLB")); if (m_iDstIndex < destLB || (m_iDstIndex - destLB < 0)) - FCThrowArgumentOutOfRangeVoid(W("dstIndex"), W("ArgumentOutOfRange_ArrayLB")); + FCThrowArgumentOutOfRangeVoid(W("destinationIndex"), W("ArgumentOutOfRange_ArrayLB")); if ((DWORD)(m_iSrcIndex - srcLB + m_iLength) > srcLen) FCThrowResVoid(kArgumentException, W("Arg_LongerThanSrcArray")); -- cgit v1.2.3 From 5d82a0eae7edaed8ec3db03433237d45483d7572 Mon Sep 17 00:00:00 2001 From: James Ko Date: Wed, 25 Jan 2017 22:28:32 -0500 Subject: Fix corelib.txt message --- src/mscorlib/src/System.Private.CoreLib.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mscorlib/src/System.Private.CoreLib.txt b/src/mscorlib/src/System.Private.CoreLib.txt index 81647f92a5..6871732b37 100644 --- a/src/mscorlib/src/System.Private.CoreLib.txt +++ b/src/mscorlib/src/System.Private.CoreLib.txt @@ -330,8 +330,8 @@ Arg_MemberInfoNullModule = The Module object containing the member cannot be nul Arg_ParameterInfoNullMember = The MemberInfo object defining the parameter cannot be null. Arg_ParameterInfoNullModule = The Module object containing the parameter cannot be null. Arg_AssemblyNullModule = The manifest module of the assembly cannot be null. -Arg_LongerThanSrcArray = Source array was not long enough. Check srcIndex and length, and the array's lower bounds. -Arg_LongerThanDestArray = Destination array was not long enough. Check destIndex and length, and the array's lower bounds. +Arg_LongerThanSrcArray = Source array was not long enough. Check the source index, length, and the array's lower bounds. +Arg_LongerThanDestArray = Destination array was not long enough. Check the destination index, length, and the array's lower bounds. Arg_LowerBoundsMustMatch = The arrays' lower bounds must be identical. Arg_MustBeBoolean = Object must be of type Boolean. Arg_MustBeByte = Object must be of type Byte. -- cgit v1.2.3