Cleanup ArgumentNull_Obj references in unmanaged runtime (#21738)

4 files changed, 22 insertions, 22 deletions

diff --git a/src/debug/ee/funceval.cpp b/src/debug/ee/funceval.cpp
index 1edd0b0c57..5fcd37315f 100644
--- a/src/debug/ee/funceval.cpp
+++ b/src/debug/ee/funceval.cpp
@@ -739,7 +739,7 @@ static void GetFuncEvalArgValue(DebuggerEval *pDE,
 
                 if (pAddr == NULL)
                 {
-                    COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+                    COMPlusThrow(kArgumentNullException);
                 }
             }
 
@@ -961,7 +961,7 @@ static void GetFuncEvalArgValue(DebuggerEval *pDE,
 
                     if (o1 == NULL)
                     {
-                        COMPlusThrow(kArgumentException, W("ArgumentNull_Obj"));
+                        COMPlusThrow(kArgumentNullException);
                     }
 
 
@@ -997,7 +997,7 @@ static void GetFuncEvalArgValue(DebuggerEval *pDE,
                     OBJECTREF* op1 = (OBJECTREF*)ArgSlotToPtr(*pArgument);
                     if (op1 == NULL)
                     {
-                        COMPlusThrow(kArgumentException, W("ArgumentNull_Obj"));
+                        COMPlusThrow(kArgumentNullException);
                     }
                     OBJECTREF o1 = *op1;
 
@@ -1018,7 +1018,7 @@ static void GetFuncEvalArgValue(DebuggerEval *pDE,
 
                     if (o1 == NULL)
                     {
-                        COMPlusThrow(kArgumentException, W("ArgumentNull_Obj"));
+                        COMPlusThrow(kArgumentNullException);
                     }
 
                     _ASSERTE(o1->GetMethodTable()->IsValueType());
@@ -1663,7 +1663,7 @@ void BoxFuncEvalThisParameter(DebuggerEval *pDE,
 
                         if (pAddr == NULL)
                         {
-                            COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+                            COMPlusThrow(kArgumentNullException);
                         }
                     }
 
@@ -1694,7 +1694,7 @@ void BoxFuncEvalThisParameter(DebuggerEval *pDE,
                 *pObjectRefArg = typeHandle.GetMethodTable()->Box(pAddr);
                 if (Nullable::IsNullableType(typeHandle.GetMethodTable()) && (*pObjectRefArg == NULL))
                 {
-                    COMPlusThrow(kArgumentNullException, W("ArgumentNull_Obj"));
+                    COMPlusThrow(kArgumentNullException);
                 }
                 GCPROTECT_END();
 
@@ -1890,7 +1890,7 @@ void BoxFuncEvalArguments(DebuggerEval *pDE,
 
                 if (pAddr == NULL)
                 {
-                    COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+                    COMPlusThrow(kArgumentNullException);
                 }
             }
 
@@ -1984,7 +1984,7 @@ void GatherFuncEvalMethodInfo(DebuggerEval *pDE,
         //
         if ((argData[0].argHome.kind == RAK_NONE) && (argData[0].argAddr == NULL))
         {
-            COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+            COMPlusThrow(kArgumentNullException);
         }
 
         //
@@ -2056,7 +2056,7 @@ void GatherFuncEvalMethodInfo(DebuggerEval *pDE,
         //
         if (objRef == NULL)
         {
-            COMPlusThrow(kArgumentNullException, W("ArgumentNull_Obj"));
+            COMPlusThrow(kArgumentNullException);
         }
 
         //
@@ -2226,7 +2226,7 @@ void CopyArgsToBuffer(DebuggerEval *pDE,
 
                 if (pAddr == NULL)
                 {
-                    COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+                    COMPlusThrow(kArgumentNullException);
                 }
 
                 *pDest = *pAddr;
diff --git a/src/vm/commodule.cpp b/src/vm/commodule.cpp
index 4d63e0c26f..c55da6b51f 100644
--- a/src/vm/commodule.cpp
+++ b/src/vm/commodule.cpp
@@ -484,7 +484,7 @@ INT32 QCALLTYPE COMModule::GetMemberRefOfMethodInfo(QCall::ModuleHandle pModule,
     BEGIN_QCALL;
     
     if (!pMeth)  
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Obj"));
+        COMPlusThrow(kArgumentNullException);
 
     // Otherwise, we want to return memberref token.
     if (pMeth->IsArray())
diff --git a/src/vm/comthreadpool.cpp b/src/vm/comthreadpool.cpp
index b6d4106f9c..c7492a4c2d 100644
--- a/src/vm/comthreadpool.cpp
+++ b/src/vm/comthreadpool.cpp
@@ -391,7 +391,7 @@ FCIMPL5(LPVOID, ThreadPoolNative::CorRegisterWaitForSingleObject,
     HELPER_METHOD_FRAME_BEGIN_RET_PROTECT(gc);  // Eventually calls BEGIN_SO_INTOLERANT_CODE_NOTHROW
 
     if(gc.waitObject == NULL)
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Obj"));
+        COMPlusThrow(kArgumentNullException);
 
     _ASSERTE(gc.registeredWaitObject != NULL);
 
diff --git a/src/vm/marshalnative.cpp b/src/vm/marshalnative.cpp
index 7614ddd6a0..a2cb827d34 100644
--- a/src/vm/marshalnative.cpp
+++ b/src/vm/marshalnative.cpp
@@ -1827,7 +1827,7 @@ FCIMPL2(void, MarshalNative::DoGetTypeLibGuid, GUID * result, Object* refTlbUNSA
     GCPROTECT_BEGININTERIOR (result);
 
     if (refTlb == NULL)
-        COMPlusThrowArgumentNull(W("pTLB"), W("ArgumentNull_Generic"));
+        COMPlusThrowArgumentNull(W("pTLB"));
 
     // Ensure COM is started up.
     EnsureComStarted();
@@ -1862,7 +1862,7 @@ FCIMPL1(LCID, MarshalNative::GetTypeLibLcid, Object* refTlbUNSAFE)
     HELPER_METHOD_FRAME_BEGIN_RET_1(refTlb);
 
     if (refTlb == NULL)
-        COMPlusThrowArgumentNull(W("pTLB"), W("ArgumentNull_Generic"));
+        COMPlusThrowArgumentNull(W("pTLB"));
 
     // Ensure COM is started up.
     EnsureComStarted();
@@ -1896,7 +1896,7 @@ FCIMPL3(void, MarshalNative::GetTypeLibVersion, Object* refTlbUNSAFE, int *pMajo
     HELPER_METHOD_FRAME_BEGIN_1(refTlb);
 
     if (refTlb == NULL)
-        COMPlusThrowArgumentNull(W("typeLibrary"), W("ArgumentNull_Generic"));
+        COMPlusThrowArgumentNull(W("typeLibrary"));
 
     // Ensure COM is started up.
     EnsureComStarted();
@@ -1931,7 +1931,7 @@ FCIMPL2(void, MarshalNative::DoGetTypeInfoGuid, GUID * result, Object* refTypeIn
     GCPROTECT_BEGININTERIOR (result);
 
     if (refTypeInfo == NULL)
-        COMPlusThrowArgumentNull(W("typeInfo"), W("ArgumentNull_Generic"));
+        COMPlusThrowArgumentNull(W("typeInfo"));
 
     // Ensure COM is started up.
     EnsureComStarted();
@@ -2020,7 +2020,7 @@ FCIMPL1(int, MarshalNative::GetStartComSlot, ReflectClassBaseObject* tUNSAFE)
     HELPER_METHOD_FRAME_BEGIN_RET_1(t);
 
     if (!(t))
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
     
     MethodTable *pTMT = t->GetMethodTable();
     if (pTMT != g_pRuntimeTypeClass)
@@ -2028,7 +2028,7 @@ FCIMPL1(int, MarshalNative::GetStartComSlot, ReflectClassBaseObject* tUNSAFE)
 
     MethodTable *pMT = t->GetType().GetMethodTable();
     if (NULL == pMT)
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
 
     // The service does not make any sense to be called for non COM visible types.
     if (!::IsTypeVisibleFromCom(TypeHandle(pMT)))
@@ -2053,7 +2053,7 @@ FCIMPL1(int, MarshalNative::GetEndComSlot, ReflectClassBaseObject* tUNSAFE)
     int StartSlot = -1;
 
     if (!(t))
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
     
     MethodTable *pTMT = t->GetMethodTable();
     if (pTMT != g_pRuntimeTypeClass)
@@ -2062,7 +2062,7 @@ FCIMPL1(int, MarshalNative::GetEndComSlot, ReflectClassBaseObject* tUNSAFE)
     TypeHandle classTH = t->GetType();
     MethodTable *pMT = classTH.GetMethodTable();
     if (NULL == pMT)
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
 
     // The service does not make any sense to be called for non COM visible types.
     if (!::IsTypeVisibleFromCom(classTH))
@@ -2131,7 +2131,7 @@ FCIMPL3(Object*, MarshalNative::GetMethodInfoForComSlot, ReflectClassBaseObject*
     OBJECTREF MemberInfoObj = NULL;
 
     if (!(t))
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
     
     MethodTable *pTMT = t->GetMethodTable();
     if (pTMT != g_pRuntimeTypeClass)
@@ -2140,7 +2140,7 @@ FCIMPL3(Object*, MarshalNative::GetMethodInfoForComSlot, ReflectClassBaseObject*
     TypeHandle type = t->GetType();
     MethodTable *pMT= type.GetMethodTable();
     if (NULL == pMT)
-        COMPlusThrow(kArgumentNullException, W("ArgumentNull_Generic"));
+        COMPlusThrow(kArgumentNullException);
 
     // The service does not make any sense to be called for non COM visible types.
     if (!::IsTypeVisibleFromCom(type))