Re: VarDateFromStr parses yyyy-mm-dd as yyyy-dd-mm in European locales

[John Fremlin]

Dan Kegel <d...@kegel.com> writes:

> Nikolay wrote:
>>> Who has authority to approve it?
>> A patch? Alexandre Julliard, he's the only project maintainer.
>> Send a patch to wine-patches at winehq.org when you think
>> it's ready and you'll get some feedback if it's not.
>
> Be sure to send it to winetestbot first, and fix any problems it finds;
> see http://wiki.winehq.org/SubmittingPatches

I added an additional testcase as requested.

winetestbot didn't find any problems (proving I think that native never
prefers y-d-m, as one might expect).

I've submitted it to wine-patches. Should I have subscribed to that list
first? I'm willing to jump though any hoop to get this trivial one-liner
in :-)


diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 2026cce..d5b3a48 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -3458,6 +3458,9 @@ static void test_VarDateFromStr(void)
   DFS("02.01.1970"); EXPECT_DBL(25570.0);
   DFS("02.13.1970"); EXPECT_DBL(25612.0);
   DFS("02-13-1970"); EXPECT_DBL(25612.0);
+  DFS("2020-01-11"); EXPECT_DBL(43841.0);
+  DFS("2173-10-14"); EXPECT_DBL(100000.0);
+  
   DFS("02.01.1970 00:00:00"); EXPECT_DBL(25570.0);
   lcid = MAKELCID(MAKELANGID(LANG_SPANISH,SUBLANG_SPANISH),SORT_DEFAULT);
   DFS("02.01.1970"); EXPECT_MISMATCH;
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 8f54eae..2d4d4e3 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -7282,7 +7282,7 @@ VARIANT_MakeDate_Start:
       switch (iDate)
       {
       case 0:  dwTry = dwAllOrders & ~(ORDER_DMY|ORDER_YDM); break;
-      case 1:  dwTry = dwAllOrders & ~(ORDER_MDY|ORDER_YMD|ORDER_MYD); break;
+      case 1:  dwTry = dwAllOrders & ~(ORDER_MDY|ORDER_YDM|ORDER_MYD); break;
       default: dwTry = dwAllOrders & ~(ORDER_DMY|ORDER_YDM); break;
       }
     }