suke	2014-09-01 20:16:57 +0900 (Mon, 01 Sep 2014)

  New Revision: 47343

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47343

  Log:
    * ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond
      of Time object to millisecond of VT_DATE VARIANT.
    * test/win32ole/test_win32ole_variant.rb
      (test_conversion_time2date_with_msec): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32ole/win32ole.c
    trunk/test/win32ole/test_win32ole_variant.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47342)
+++ ChangeLog	(revision 47343)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Sep  1 20:11:02 2014  Masaki Suketa <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond
+	  of Time object to millisecond of VT_DATE VARIANT.
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_time2date_with_msec): ditto.
+
 Sun Aug 31 16:58:49 2014  Tanaka Akira  <akr@f...>
 
 	* lib/benchmark.rb: Fix a syntax error.
Index: ext/win32ole/win32ole.c
===================================================================
--- ext/win32ole/win32ole.c	(revision 47342)
+++ ext/win32ole/win32ole.c	(revision 47343)
@@ -26,7 +26,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/win32ole/win32ole.c#L26
 const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
 #endif
 
-#define WIN32OLE_VERSION "1.7.9"
+#define WIN32OLE_VERSION "1.8.0"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -406,6 +406,8 @@ rbtime2vtdate(VALUE tmobj) https://github.com/ruby/ruby/blob/trunk/ext/win32ole/win32ole.c#L406
 {
     SYSTEMTIME st;
     double t;
+    double nsec;
+
     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));
@@ -415,7 +417,17 @@ rbtime2vtdate(VALUE tmobj) https://github.com/ruby/ruby/blob/trunk/ext/win32ole/win32ole.c#L417
     st.wSecond = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
     st.wMilliseconds = FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0)) / 1000000;
     SystemTimeToVariantTime(&st, &t);
-    return t;
+
+    /*
+     * Unfortunately SystemTimeToVariantTime function always ignores the
+     * wMilliseconds of SYSTEMTIME struct.
+     * So, we need to calculate milliseconds by ourselves.
+     */
+    nsec =  FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
+    nsec /= 1000000.0;
+    nsec /= (24.0 * 3600.0);
+    nsec /= 1000;
+    return t + nsec;
 }
 
 static VALUE
Index: test/win32ole/test_win32ole_variant.rb
===================================================================
--- test/win32ole/test_win32ole_variant.rb	(revision 47342)
+++ test/win32ole/test_win32ole_variant.rb	(revision 47343)
@@ -396,6 +396,19 @@ if defined?(WIN32OLE_VARIANT) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_variant.rb#L396
       assert_equal(789, (t.nsec / 1000000).round)
     end
 
+    def test_conversion_time2date_with_msec
+      t0 = Time.new(2014, 8, 27, 12, 34, 56)
+      t0 += 0.789
+      t1 = WIN32OLE_VARIANT.new(t0).value
+      assert_equal("2014-08-27 12:34:56", t1.strftime('%Y-%m-%d %H:%M:%S'))
+      assert_equal(789, (t1.nsec / 1000000).round)
+
+      t0 = Time.now
+      t1 = WIN32OLE_VARIANT.new(t0).value
+      assert_equal(t0.strftime('%Y-%m-%d %H:%M:%S'), t1.strftime('%Y-%m-%d %H:%M:%S'))
+      assert_equal(t0.nsec.round(-6), t1.nsec.round(-6))
+    end
+
     # this test failed because of VariantTimeToSystemTime
     # and SystemTimeToVariantTime API ignores wMilliseconds
     # member of SYSTEMTIME  struct.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/