summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/win32ole/win32ole.c23
-rw-r--r--test/win32ole/test_win32ole_variant.rb8
3 files changed, 33 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 16ed13c2800..d383935c0a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Aug 27 19:52:33 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond
+ of VT_DATE VARIANT to nsec of Time object.
+ * test/win32ole/test_win32ole_variant.rb
+ (test_conversion_dbl2date_with_msec): ditto.
+
Wed Aug 27 09:57:29 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_complex.rb: removed unreachable code.
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 5b08d8e9900..b5f25565ff5 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -26,7 +26,7 @@
const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
#endif
-#define WIN32OLE_VERSION "1.7.8"
+#define WIN32OLE_VERSION "1.7.9"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -405,7 +405,7 @@ static double
rbtime2vtdate(VALUE tmobj)
{
SYSTEMTIME st;
- double t = 0;
+ double t;
memset(&st, 0, sizeof(SYSTEMTIME));
st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
@@ -423,8 +423,8 @@ vtdate2rbtime(double date)
{
SYSTEMTIME st;
VALUE v;
+ double msec;
VariantTimeToSystemTime(date, &st);
-
v = rb_funcall(rb_cTime, rb_intern("new"), 6,
INT2FIX(st.wYear),
INT2FIX(st.wMonth),
@@ -432,8 +432,21 @@ vtdate2rbtime(double date)
INT2FIX(st.wHour),
INT2FIX(st.wMinute),
INT2FIX(st.wSecond));
- if (st.wMilliseconds > 0) {
- return rb_funcall(v, rb_intern("+"), 1, rb_float_new((double)(st.wMilliseconds / 1000.0)));
+ /*
+ * Unfortunately VariantTimeToSystemTime always ignores the
+ * wMilliseconds of SYSTEMTIME struct(The wMilliseconds is 0).
+ * So, we need to calculate milliseconds by ourselves.
+ */
+ msec = fabs(date);
+ msec -= floor(date);
+ msec *= 24 * 60;
+ msec -= floor(msec);
+ msec *= 60;
+ msec -= st.wSecond;
+ msec = round(msec * 1000);
+ msec /= 1000;
+ if (msec != 0) {
+ return rb_funcall(v, rb_intern("+"), 1, rb_float_new(msec));
}
return v;
}
diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb
index 91e3c0d06a5..216449f102b 100644
--- a/test/win32ole/test_win32ole_variant.rb
+++ b/test/win32ole/test_win32ole_variant.rb
@@ -388,6 +388,14 @@ if defined?(WIN32OLE_VARIANT)
assert_equal(dt, obj.value)
end
+ def test_conversion_dbl2date_with_msec
+ # Date is "2014/8/27 12:34:56.789"
+ obj = WIN32OLE_VARIANT.new(41878.524268391200167, WIN32OLE::VARIANT::VT_DATE)
+ t = obj.value
+ assert_equal("2014-08-27 12:34:56", t.strftime('%Y-%m-%d %H:%M:%S'))
+ assert_equal(789, (t.nsec / 1000000).round)
+ end
+
# this test failed because of VariantTimeToSystemTime
# and SystemTimeToVariantTime API ignores wMilliseconds
# member of SYSTEMTIME struct.