From 9b3725b0b9b694bf67df7acedfbef374f78586bb Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Mon, 5 Nov 2018 18:41:16 -0800 Subject: [PATCH] Fix calling convention for 3 p/invoke test cases Commit migrated from https://github.com/dotnet/coreclr/commit/e250e6206fb7d20e436cb4d4ef0dd30da037e939 --- src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.cs | 2 +- src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs | 2 +- src/coreclr/tests/src/JIT/Directed/pinvoke/sin.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.cs b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.cs index bd081a6..a4d85c8 100644 --- a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.cs +++ b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.cs @@ -19,7 +19,7 @@ class Test internal const int ARRAY_SIZE = 100; //UnmanagedType.ByValTStr - [DllImport("SizeConstNative",CharSet = CharSet.Ansi)] + [DllImport("SizeConstNative",CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)] static extern bool TakeByValTStr(S_CHARArray_ByValTStr s, int size); static bool SizeConstByValTStr() diff --git a/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs index 2d4b5f6..35f75ab 100644 --- a/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs +++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs @@ -12,7 +12,7 @@ namespace PInvokeTest { internal class Test { - [DllImport("msvcrt", EntryPoint = "sin")] + [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); private static double g; diff --git a/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.cs b/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.cs index 3173cb8..2ad75e4 100644 --- a/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.cs +++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.cs @@ -10,10 +10,10 @@ namespace JitTest internal class Test { - [DllImport("msvcrt", EntryPoint = "sin")] + [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); - [DllImport("msvcrt", EntryPoint = "acos")] + [DllImport("msvcrt", EntryPoint = "acos", CallingConvention = CallingConvention.Cdecl)] private static extern double acos(double x); private static int Main() -- 2.7.4