Change our DateTime marshalling tests to be culture-independent. (#24362)

Fixes #24089

5 files changed, 33 insertions, 370 deletions

diff --git a/tests/src/Common/Platform/platformdefines.h b/tests/src/Common/Platform/platformdefines.h
index c76983b355..5f051185f9 100644
--- a/tests/src/Common/Platform/platformdefines.h
+++ b/tests/src/Common/Platform/platformdefines.h
@@ -148,6 +148,7 @@ typedef int error_t;
 typedef void* LPVOID;
 typedef unsigned char BYTE;
 typedef WCHAR OLECHAR;
+typedef double DATE;
 #endif
 
 typedef ULONG_PTR DWORD_PTR;
diff --git a/tests/src/Interop/CMakeLists.txt b/tests/src/Interop/CMakeLists.txt
index 99bd9937da..26a09be29e 100644
--- a/tests/src/Interop/CMakeLists.txt
+++ b/tests/src/Interop/CMakeLists.txt
@@ -74,7 +74,7 @@ if(WIN32)
     add_subdirectory(PInvoke/SafeHandles/ReleaseHandle)
     add_subdirectory(PInvoke/SafeHandles/Interface)
     add_subdirectory(PInvoke/NativeCallManagedComVisible)
-    # This test doesn't necessarily need to be Windows-only, but the implementation is very tied to Windows APIs
+    # Windows-only due to bug (fixed as part of dotnet/coreclr#21415)
     add_subdirectory(PInvoke/DateTime)
     add_subdirectory(PInvoke/IEnumerator)
     add_subdirectory(PInvoke/CustomMarshalers)
diff --git a/tests/src/Interop/PInvoke/DateTime/CMakeLists.txt b/tests/src/Interop/PInvoke/DateTime/CMakeLists.txt
index dadc5b18c8..b547be1f82 100644
--- a/tests/src/Interop/PInvoke/DateTime/CMakeLists.txt
+++ b/tests/src/Interop/PInvoke/DateTime/CMakeLists.txt
@@ -3,12 +3,7 @@ project (NativeDateTime)
 include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
 set(SOURCES 
     NativeDateTime.cpp 
-) 
-if(WIN32)
-    list(APPEND LINK_LIBRARIES_ADDITIONAL
-        OleAut32.lib
-    )
-endif(WIN32)
+)
 # add the executable 
 add_library (NativeDateTime SHARED ${SOURCES}) 
 target_link_libraries(NativeDateTime ${LINK_LIBRARIES_ADDITIONAL}) 
diff --git a/tests/src/Interop/PInvoke/DateTime/DateTimeTest.cs b/tests/src/Interop/PInvoke/DateTime/DateTimeTest.cs
index cc662b96e1..6389192028 100644
--- a/tests/src/Interop/PInvoke/DateTime/DateTimeTest.cs
+++ b/tests/src/Interop/PInvoke/DateTime/DateTimeTest.cs
@@ -7,172 +7,46 @@ using System.Text;
 using System.Runtime.InteropServices;
 using TestLibrary;
 
-#pragma warning disable 618
-[StructLayout(LayoutKind.Sequential)]
-public struct Stru_Seq_DateAsStructAsFld
+public struct DateWrapper
 {
-    [MarshalAs(UnmanagedType.Struct)]
-    public DateTime dt;
-
-    public int iInt;
-
-    [MarshalAs(UnmanagedType.BStr)]
-    public string bstr;
+    public DateTime date;
 }
 
-[StructLayout(LayoutKind.Explicit)]
-public struct Stru_Exp_DateAsStructAsFld
+class NativeDateTime
 {
+    [DllImport(nameof(NativeDateTime))]
+    public static extern DateTime GetTomorrow(DateTime today);
 
-    [FieldOffset(0)]
-    public int iInt;
+    [DllImport(nameof(NativeDateTime))]
+    public static extern void GetTomorrowByRef(DateTime today, out DateTime tomorrow);
 
-    [FieldOffset(8)]
-    [MarshalAs(UnmanagedType.Struct)]
-    public DateTime dt;
+    [DllImport(nameof(NativeDateTime))]
+    public static extern DateWrapper GetTomorrowWrapped(DateWrapper today);
 }
 
-class DatetimeTest
+class DateTimeTest
 {
-    private static DateTime ExpectedRetdate;
-
-    #region PInvoke
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    private static extern bool Marshal_In_stdcall([In][MarshalAs(UnmanagedType.Struct)] DateTime t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.Cdecl)]
-    private static extern bool Marshal_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref DateTime t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    private static extern bool Marshal_Out_stdcall([Out][MarshalAs(UnmanagedType.Struct)] out DateTime t);
-
-    [DllImport("NativeDateTime.dll")]
-    private static extern DateTime PassThroughDate(DateTime d);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.Cdecl)]
-    private static extern bool MarshalSeqStruct_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref Stru_Seq_DateAsStructAsFld t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.Cdecl)]
-    private static extern bool MarshalExpStruct_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref Stru_Exp_DateAsStructAsFld t);
-    #endregion
-
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    delegate bool Del_Marshal_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref DateTime t);
-
-    #region delegatePinvoke
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    [return: MarshalAs(UnmanagedType.FunctionPtr)]
-    private static extern Del_Marshal_InOut_cdecl GetDel_Marshal_InOut_cdecl();
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate bool Del_Marshal_Out_stdcall([Out][MarshalAs(UnmanagedType.Struct)] out DateTime t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    private static extern Del_Marshal_Out_stdcall GetDel_Marshal_Out_stdcall();
-
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    delegate bool Del_MarshalSeqStruct_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref Stru_Seq_DateAsStructAsFld t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    private static extern Del_MarshalSeqStruct_InOut_cdecl GetDel_Del_MarshalSeqStruct_InOut_cdecl();
-
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    delegate bool Del_MarshalExpStruct_InOut_cdecl([In, Out][MarshalAs(UnmanagedType.Struct)] ref Stru_Exp_DateAsStructAsFld t);
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.StdCall)]
-    private static extern Del_MarshalExpStruct_InOut_cdecl GetDel_Del_MarshalExpStruct_InOut_cdecl();
-
-    #endregion
-
-    #region ReversePInvoke
-
-    [DllImport("NativeDateTime.dll", CallingConvention = CallingConvention.Cdecl)]
-    private static extern bool RevP_Marshal_InOut_cdecl(Del_Marshal_InOut_cdecl d);
-
-    public static bool RevPMethod_Marshal_InOut_cdecl(ref DateTime d)
-    {
-        ExpectedRetdate = new DateTime(1947, 8, 15);
-        Assert.AreEqual(ExpectedRetdate, d, "RevPMethod_Marshal_InOut_cdecl : Date didn't match to expected date");
-        d = d.AddDays(-1);
-        return true;
-    }
-
-    #endregion
-
     static int Main(string[] args)
     {
-        try{
-            ExpectedRetdate = new DateTime(1947, 8, 15);
-
-            #region Pinvoke
-            DateTime Date1 = new DateTime(2008, 7, 4);
-            Assert.IsTrue(Marshal_In_stdcall(Date1), "Marshal_In_stdcall : Returned false");
-            Assert.IsTrue(Marshal_InOut_cdecl(ref Date1), "Marshal_InOut_cdecl : Returned false");
-            Assert.AreEqual(ExpectedRetdate, Date1, "Marshal_InOut_cdecl : Returned date is wrong");
-            
-            DateTime Date2;
-            Assert.IsTrue(Marshal_Out_stdcall(out Date2), "Marshal_In_stdcall : Returned false");
-            Assert.AreEqual(ExpectedRetdate, Date2, "Marshal_InOut_cdecl : Returned date is wrong");
-
-            Stru_Seq_DateAsStructAsFld StDate1;
-            StDate1.dt = new DateTime(2008, 7, 4);
-            StDate1.iInt = 100;
-            StDate1.bstr = "Managed";
-            Assert.IsTrue(MarshalSeqStruct_InOut_cdecl(ref StDate1), "MarshalSeqStruct_InOut_cdecl : Native side check failed");
-            Assert.AreEqual(ExpectedRetdate, StDate1.dt, "MarshalSeqStruct_InOut_cdecl : Returned date is wrong");
+        try
+        {
+            DateTime currentDate = new DateTime(2019, 5, 2);
 
-            Stru_Exp_DateAsStructAsFld StDate2;
-            StDate2.dt = new DateTime(2008, 7, 4);
-            StDate2.iInt = 100;
-            Assert.IsTrue(MarshalExpStruct_InOut_cdecl(ref StDate2), "MarshalExpStruct_InOut_cdecl : Native side check failed");
-            Assert.AreEqual(ExpectedRetdate, StDate2.dt, "MarshalExpStruct_InOut_cdecl : Returned date is wrong");
+            Assert.AreEqual(currentDate.AddDays(1), NativeDateTime.GetTomorrow(currentDate));
 
-            DateTime date3 = new DateTime(2008, 7, 4);
-            Assert.AreEqual(date3, PassThroughDate(date3));
-
-            #endregion
-
-            #region DelegatePInvoke
-
-            Del_Marshal_InOut_cdecl del1 = GetDel_Marshal_InOut_cdecl();
-            DateTime Date4 = new DateTime(2008, 7, 4);
-            Assert.IsTrue(del1(ref Date4), "GetDel_Marshal_InOut_cdecl : Returned false");
-            Assert.AreEqual(ExpectedRetdate, Date4, "GetDel_Marshal_InOut_cdecl : Returned date is wrong");
-
-            Del_Marshal_Out_stdcall del3 = GetDel_Marshal_Out_stdcall();
-            DateTime Date6;
-            Assert.IsTrue(del3(out Date6), "GetDel_Marshal_Out_stdcall : Returned false");
-            Assert.AreEqual(ExpectedRetdate, Date6, "GetDel_Marshal_Out_stdcall : Returned date is wrong");
+            NativeDateTime.GetTomorrowByRef(currentDate, out DateTime nextDay);
             
-            Stru_Seq_DateAsStructAsFld StDate3;
-            StDate3.dt = new DateTime(2008, 7, 4);
-            StDate3.iInt = 100;
-            StDate3.bstr = "Managed";
-            Del_MarshalSeqStruct_InOut_cdecl del4 = GetDel_Del_MarshalSeqStruct_InOut_cdecl();
-            Assert.IsTrue(del4(ref StDate3), "MarshalSeqStruct_InOut_cdecl : Native side check failed");
-            Assert.AreEqual(ExpectedRetdate, StDate3.dt, "MarshalSeqStruct_InOut_cdecl : Returned date is wrong");
-
-            Stru_Exp_DateAsStructAsFld StDate4;
-            StDate4.dt = new DateTime(2008, 7, 4);
-            StDate4.iInt = 100;
+            Assert.AreEqual(currentDate.AddDays(1), nextDay);
 
-            Del_MarshalExpStruct_InOut_cdecl del5 = GetDel_Del_MarshalExpStruct_InOut_cdecl();
-            Assert.IsTrue(del5(ref StDate4), "MarshalExpStruct_InOut_cdecl : Native side check failed");
-            Assert.AreEqual(ExpectedRetdate, StDate4.dt, "MarshalExpStruct_InOut_cdecl : Returned date is wrong");
+            DateWrapper wrapper = new DateWrapper { date = currentDate };
 
-            #endregion
-
-            #region ReversePInvoke
-            Assert.IsTrue(RevP_Marshal_InOut_cdecl(new Del_Marshal_InOut_cdecl(RevPMethod_Marshal_InOut_cdecl)), "RevP_Marshal_InOut_cdecl : Returned false");
-            #endregion
-            
-            return 100;
-        } catch (Exception e){
+            Assert.AreEqual(currentDate.AddDays(1), NativeDateTime.GetTomorrowWrapped(wrapper).date);
+        }
+        catch (Exception e)
+        {
             Console.WriteLine($"Test Failure: {e}"); 
             return 101; 
         }
+        return 100;
     }
 }
-#pragma warning restore 618
-
diff --git a/tests/src/Interop/PInvoke/DateTime/NativeDateTime.cpp b/tests/src/Interop/PInvoke/DateTime/NativeDateTime.cpp
index 6c3b4c72e8..9414523dd5 100644
--- a/tests/src/Interop/PInvoke/DateTime/NativeDateTime.cpp
+++ b/tests/src/Interop/PInvoke/DateTime/NativeDateTime.cpp
@@ -2,231 +2,24 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-// NativeDateTime.cpp : Defines the exported functions for the DLL application.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <windows.h>
-#include <oleauto.h>
 #include <xplatform.h>
 
-#define LCID_ENGLISH MAKELCID(MAKELANGID(0x09, 0x01), SORT_DEFAULT)
-
-#pragma pack (push)
-#pragma pack (8)
-struct Stru_Seq_DateAsStructAsFld // size = 16 bytes
-{
-    DATE dt;
-    INT iInt;
-    BSTR bstr;
-};
-#pragma pack (pop)
-
-#pragma pack (push)
-#pragma pack (1)
-struct Stru_Exp_DateAsStructAsFld // size = 16 bytes
-{
-    INT iInt;
-    INT padding;
-    DATE dt;
-};
-#pragma pack (pop)
-
-extern "C" BOOL VerifySeqStruct(struct Stru_Seq_DateAsStructAsFld* StDate)
-{
-    BSTR str;
-    VarBstrFromDate(StDate->dt, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-    if(TP_wcmp_s(L"7/4/2008", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! InDATE expected '07/04/2008' but received: %s\n", str);
-        return FALSE;
-    }
-    if(StDate->iInt != 100)
-    {
-        wprintf(L"FAILURE! iInt expected 100 but received: %d\n", StDate->iInt);
-        return FALSE;
-    }
-    if(TP_wcmp_s(L"Managed", (wchar_t *)(StDate->bstr)) != 0 )
-    {
-        wprintf(L"FAILURE! bstr expected 'Managed' but received: %s\n", StDate->bstr);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-extern "C" BOOL VerifyExpStruct(struct Stru_Exp_DateAsStructAsFld* StDate)
-{
-    BSTR str;
-    VarBstrFromDate(StDate->dt, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-    if(TP_wcmp_s(L"7/4/2008", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! InDATE expected '07/04/2008' but received: %s\n", str);
-        return FALSE;
-    }
-    if(StDate->iInt != 100)
-    {
-        wprintf(L"FAILURE! iInt expected 100 but received: %d\n", StDate->iInt);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-extern "C" void ChangeStru_Seq_DateAsStructAsFld(Stru_Seq_DateAsStructAsFld * StDate)
-{
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, &(StDate->dt));
-}
-
-extern "C" void ChangeStru_Exp_DateAsStructAsFld(Stru_Exp_DateAsStructAsFld * StDate)
+extern "C" DLL_EXPORT DATE STDMETHODCALLTYPE GetTomorrow(DATE today)
 {
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, &(StDate->dt));
+    return today + 1;
 }
 
-extern "C" DLL_EXPORT BOOL __stdcall Marshal_In_stdcall(DATE d)
+extern "C" DLL_EXPORT void STDMETHODCALLTYPE GetTomorrowByRef(DATE today, DATE* tomorrow)
 {
-    BSTR str;
-    //DATE ptoD;
-    
-    // always use the ENGLISH locale so that the string comes out as 11/16/1977 as opposed to 
-    // say 16/11/1977 for German locale; otherwise this test would fail on non-ENU locales
-
-    VarBstrFromDate(d, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-
-    if(TP_wcmp_s(L"7/4/2008", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! InDATE expected '07/04/2008' but received: %s\n", str);
-        return FALSE;
-    }
-
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, &d);
-    return TRUE;
-
+    *tomorrow = today + 1;
 }
 
-extern "C" DLL_EXPORT BOOL __cdecl Marshal_InOut_cdecl(/*[in,out]*/ DATE* d)
-{
-    BSTR str;
-    //DATE ptoD;
-    
-    // always use the ENGLISH locale so that the string comes out as 11/16/1977 as opposed to 
-    // say 16/11/1977 for German locale; otherwise this test would fail on non-ENU locales
-
-    VarBstrFromDate(*d, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-
-    if(TP_wcmp_s(L"7/4/2008", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! InDATE expected '07/04/2008' but received: %s\n", str);
-        return FALSE;
-    }
-
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, d);
-    return TRUE;
-}
-
-extern "C" DLL_EXPORT BOOL __stdcall Marshal_Out_stdcall(/*[out]*/ DATE* d)
-{
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, d);
-    return TRUE;
-}
-
-extern "C" DLL_EXPORT DATE __stdcall Marshal_Ret_stdcall()
-{
-    DATE d;
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, &d);
-    return d;
-}
-
-typedef BOOL (__cdecl * Datetime_Del_Marshal_InOut_cdecl)(/*[in,out]*/ DATE* t);
-extern "C" DLL_EXPORT Datetime_Del_Marshal_InOut_cdecl __stdcall GetDel_Marshal_InOut_cdecl()
-{
-    return Marshal_InOut_cdecl;
-}
-
-typedef DATE (__stdcall * Datetime_Del_Marshal_Ret_stdcall)();
-extern "C" DLL_EXPORT Datetime_Del_Marshal_Ret_stdcall __stdcall GetDel_Marshal_Ret_stdcall()
-{
-    return Marshal_Ret_stdcall;
-}
-
-
-typedef BOOL (__stdcall * Datetime_Del_Marshal_Out_stdcall)(/*[out]*/ DATE* t);
-extern "C" DLL_EXPORT  Datetime_Del_Marshal_Out_stdcall __stdcall GetDel_Marshal_Out_stdcall()
-{
-    return Marshal_Out_stdcall;
-}
-
-extern "C" DLL_EXPORT BOOL __cdecl RevP_Marshal_InOut_cdecl(Datetime_Del_Marshal_InOut_cdecl d)
-{
-    DATE ptoD;
-    BSTR str;
-
-    VarDateFromStr(SysAllocString(L"8/15/1947"), 0, 0, &ptoD);
-    if(d(&ptoD) == FALSE)
-    {
-        wprintf(L"FAILURE! RevP_Marshal_InOut_cdecl : Date on managed side didn't match\n");
-        return FALSE;
-    }
-    
-    //Verify the changes are visible
-    VarBstrFromDate(ptoD, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-    if(TP_wcmp_s(L"8/14/1947", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! RevP_Marshal_InOut_cdecl : InDATE expected '8/14/1947' but received: %s\n", str);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-
-extern "C" DLL_EXPORT BOOL __stdcall RevP_Marshal_Ret_stdcall(Datetime_Del_Marshal_Ret_stdcall d)
+struct DateWrapper
 {
     DATE date;
-    BSTR str;
-
-    date = d();
-
-    VarBstrFromDate(date, LCID_ENGLISH, VAR_FOURDIGITYEARS, &str);
-    if(TP_wcmp_s(L"7/4/2008", (wchar_t *)str) != 0 )
-    {
-        wprintf(L"FAILURE! RevP_Marshal_Ret_stdcall : InDATE expected '07/04/2008' but received: %s\n", str);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-extern "C" DLL_EXPORT BOOL __cdecl MarshalSeqStruct_InOut_cdecl(/*[in,out]*/ struct Stru_Seq_DateAsStructAsFld * t)
-{
-    if(!VerifySeqStruct(t))
-        return FALSE;
-    
-    ChangeStru_Seq_DateAsStructAsFld(t);
-    return TRUE;
-}
-
-extern "C" DLL_EXPORT BOOL __cdecl MarshalExpStruct_InOut_cdecl(/*[in,out]*/ struct Stru_Exp_DateAsStructAsFld * t)
-{
-    if(!VerifyExpStruct(t))
-        return FALSE;
-
-    ChangeStru_Exp_DateAsStructAsFld(t);
-    return TRUE;
-}
-
-
-typedef BOOL (__cdecl * Datetime_Del_MarshalExpStruct_InOut_cdecl)(/*[in,out]*/ struct Stru_Exp_DateAsStructAsFld * t);
-extern "C" DLL_EXPORT Datetime_Del_MarshalExpStruct_InOut_cdecl __stdcall GetDel_Del_MarshalExpStruct_InOut_cdecl()
-{
-    return MarshalExpStruct_InOut_cdecl;
-}
-
-
-typedef BOOL (__cdecl * Datetime_Del_MarshalSeqStruct_InOut_cdecl)(/*[in,out]*/ struct Stru_Seq_DateAsStructAsFld * t);
-extern "C" DLL_EXPORT Datetime_Del_MarshalSeqStruct_InOut_cdecl __stdcall GetDel_Del_MarshalSeqStruct_InOut_cdecl()
-{
-    return MarshalSeqStruct_InOut_cdecl;
-}
+};
 
-extern "C" DATE DLL_EXPORT STDMETHODCALLTYPE PassThroughDate(DATE d)
+extern "C" DLL_EXPORT DateWrapper STDMETHODCALLTYPE GetTomorrowWrapped(DateWrapper today)
 {
-    return d;
+    return { today.date + 1 };
 }