Piotr Caban : oleaut32: Ignore milliseconds in VarDateFromUdate implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f7a07ebe397fbef6fbb0aac1ade7c21db11f8aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f7a07ebe397fbef6fbb0aac1a...

Author: Piotr Caban <piotr.caban(a)gmail.com>
Date:   Wed Nov 18 19:02:21 2009 +0100

oleaut32: Ignore milliseconds in VarDateFromUdate implementation.

---

 dlls/msi/tests/automation.c   |    3 +--
 dlls/oleaut32/tests/vartest.c |    3 +++
 dlls/oleaut32/variant.c       |    1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 4af37aa..29a7cd2 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -1506,8 +1506,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in
 
         hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var));
         ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr);
-        /* FIXME: Off by one second */
-        todo_wine ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult));
+        ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult));
         VariantClear(&varresult);
         VariantClear(&var);
 
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 68a4edf..05f4be3 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -1646,6 +1646,9 @@ static void test_VarDateFromUdate(void)
   UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0);  /* 31 Dec 9999 - Max */
   UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err  */
 
+  UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00  */
+  UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds  */
+
   UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */
   todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */
   todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index cd99814..10bc8ed 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -1388,7 +1388,6 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT
   dateVal += ud.st.wHour / 24.0;
   dateVal += ud.st.wMinute / 1440.0;
   dateVal += ud.st.wSecond / 86400.0;
-  dateVal += ud.st.wMilliseconds / 86400000.0;
 
   TRACE("Returning %g\n", dateVal);
   *pDateOut = dateVal;