Piotr Caban : oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate.

Alexandre Julliard julliard at winehq.org
Fri Feb 22 14:14:00 CST 2013


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Feb 22 18:43:26 2013 +0100

oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate.

---

 dlls/oleaut32/tests/vartype.c |    1 +
 dlls/oleaut32/vartype.c       |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 8ad549e..e925fa5 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -4951,6 +4951,7 @@ static void test_VarBstrFromDate(void)
   BSTR_DATE(365.25, "12/30/1900 6:00:00 AM");
   BSTR_DATE(1461.0, "12/31/1903");
   BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM");
+  BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM");
   todo_wine { BSTR_DATE(-657434.0, "1/1/100"); }
   BSTR_DATE(2958465.0, "12/31/9999");
 
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 2d27f9d..8632055 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -6619,7 +6619,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
 
     if (whole == 0.0)
       dwFlags |= VAR_TIMEVALUEONLY;
-    else if (partial < 1e-12)
+    else if (partial > -1e-12 && partial < 1e-12)
       dwFlags |= VAR_DATEVALUEONLY;
   }
 




More information about the wine-cvs mailing list