Fix issues with calling convention in tests. (#19548)

diff --git a/tests/src/Interop/BestFitMapping/BestFitMappingNative.cpp b/tests/src/Interop/BestFitMapping/BestFitMappingNative.cpp
index 065f83df388f0e442a1798d87f0c56eaaf4f1279..46ee1b2e2673bc1cdfae139f9df607b68ce233b2 100755 (executable)
--- a/tests/src/Interop/BestFitMapping/BestFitMappingNative.cpp
+++ b/tests/src/Interop/BestFitMapping/BestFitMappingNative.cpp
@@ -19,7 +19,7 @@ static int ReportFailure(const char* s)
     return (++fails);
 }
 
-extern  "C" DLL_EXPORT int GetResult()
+extern  "C" DLL_EXPORT int _cdecl GetResult()
 {
     return fails;
 }
@@ -169,7 +169,7 @@ extern "C" DLL_EXPORT LPSTR _cdecl CLPStr_InOutByRef(LPSTR* ppStr)
 
 
 typedef LPSTR (_cdecl* delegate_cdecl)(LPSTR* ppstr);
-extern "C" DLL_EXPORT delegate_cdecl CLPStr_DelegatePInvoke()
+extern "C" DLL_EXPORT delegate_cdecl _cdecl CLPStr_DelegatePInvoke()
 {
     return CLPStr_InOutByRef;
 }

diff --git a/tests/src/Interop/RefCharArray/RefCharArrayNative.cpp b/tests/src/Interop/RefCharArray/RefCharArrayNative.cpp
index 0d0af2741220a6885a99968843cbf908bb3bbaaa..3762b7a4f77fd95371b67611e196b16d9e5e0ac5 100755 (executable)
--- a/tests/src/Interop/RefCharArray/RefCharArrayNative.cpp
+++ b/tests/src/Interop/RefCharArray/RefCharArrayNative.cpp
@@ -47,7 +47,7 @@ extern "C" BOOL DLL_EXPORT __stdcall MarshalRefCharArray_Stdcall(char ** pstr)
 }
 
 typedef BOOL(_cdecl *CdeclCallBack)(char ** pstr);
-extern "C" BOOL DLL_EXPORT DoCallBack_MarshalRefCharArray_Cdecl(CdeclCallBack caller)
+extern "C" BOOL DLL_EXPORT _cdecl DoCallBack_MarshalRefCharArray_Cdecl(CdeclCallBack caller)
 {
     char * str = (char*)CoTaskMemAlloc(LEN);
     for(int i = 0;i<LEN;i++)
@@ -68,7 +68,7 @@ extern "C" BOOL DLL_EXPORT DoCallBack_MarshalRefCharArray_Cdecl(CdeclCallBack ca
 }
 
 typedef BOOL(__stdcall *StdCallBack)(char ** pstr);
-extern "C" BOOL DLL_EXPORT DoCallBack_MarshalRefCharArray_Stdcall(StdCallBack caller)
+extern "C" BOOL DLL_EXPORT __stdcall DoCallBack_MarshalRefCharArray_Stdcall(StdCallBack caller)
 {
     char * str = (char*)CoTaskMemAlloc(LEN);
     for(int i = 0;i<LEN;i++)
@@ -90,13 +90,13 @@ extern "C" BOOL DLL_EXPORT DoCallBack_MarshalRefCharArray_Stdcall(StdCallBack ca
 }
 
 typedef BOOL (_cdecl * DelegatePInvoke_Cdecl)(char **pstr);
-extern "C" DLL_EXPORT DelegatePInvoke_Cdecl DelegatePinvoke_Cdecl()
+extern "C" DLL_EXPORT DelegatePInvoke_Cdecl _cdecl DelegatePinvoke_Cdecl()
 {
     return MarshalRefCharArray_Cdecl;
 }
 
 typedef BOOL (__stdcall * DelegatePInvoke_Stdcall)(char **pstr);
-extern "C" DLL_EXPORT DelegatePInvoke_Stdcall DelegatePinvoke_Stdcall()
+extern "C" DLL_EXPORT DelegatePInvoke_Stdcall __stdcall DelegatePinvoke_Stdcall()
 {
     return MarshalRefCharArray_Stdcall;
 }
\ No newline at end of file

diff --git a/tests/src/Interop/RefCharArray/RefCharArrayTest.cs b/tests/src/Interop/RefCharArray/RefCharArrayTest.cs
index dc0ad0a8d9603287d47c5d878834330afde76da2..52eeb88067db2806766ae66bd21aca9c193ef30e 100644 (file)
Binary files a/tests/src/Interop/RefCharArray/RefCharArrayTest.cs and b/tests/src/Interop/RefCharArray/RefCharArrayTest.cs differ

diff --git a/tests/src/Interop/SizeConst/SizeConstNative.cpp b/tests/src/Interop/SizeConst/SizeConstNative.cpp
index 8bb822a0e987347ff68fd1ba71f0415f58af6027..2a9e661aa31da7e8f8ccff0495e2a7d13115fa43 100644 (file)
--- a/tests/src/Interop/SizeConst/SizeConstNative.cpp
+++ b/tests/src/Interop/SizeConst/SizeConstNative.cpp
@@ -6,7 +6,7 @@
 
 const int ARRAY_SIZE = 100;
 typedef struct { char  arr[ARRAY_SIZE]; } S_CHARByValArray;
-extern "C" DLL_EXPORT BOOL TakeByValTStr(S_CHARByValArray s, int size)
+extern "C" DLL_EXPORT BOOL _cdecl TakeByValTStr(S_CHARByValArray s, int size)
 {
     return true;
-}
\ No newline at end of file
+}

diff --git a/tests/src/JIT/Directed/pinning/object-pin/Object-Pin.il b/tests/src/JIT/Directed/pinning/object-pin/Object-Pin.il
index 321029e304cf107f81eee65333f34714a8457b0f..6b4ab09bc545da9ebea7b823fcb963a50ec3ead3 100644 (file)
--- a/tests/src/JIT/Directed/pinning/object-pin/Object-Pin.il
+++ b/tests/src/JIT/Directed/pinning/object-pin/Object-Pin.il
@@ -85,8 +85,8 @@ LOOP1:
 
 .class auto ansi Pin1_Test
 {
-  .method public static pinvokeimpl("mirror" cdecl) int32 Ret_Ptr(void *) il managed preservesig{ }
-  .method public static pinvokeimpl("mirror" cdecl) void Set_Val(void*,int32 c) il managed preservesig { }
+  .method public static pinvokeimpl("mirror" winapi) int32 Ret_Ptr(void *) il managed preservesig{ }
+  .method public static pinvokeimpl("mirror" winapi) void Set_Val(void*,int32 c) il managed preservesig { }
   .method public static int32 Main(class [mscorlib]System.String[] args) il managed
   {
     .entrypoint