1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond

Browse Source 
of VT_DATE VARIANT to nsec of Time object.
* test/win32ole/test_win32ole_variant.rb
  (test_conversion_dbl2date_with_msec): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-08-27 10:57:28 +00:00
parent 66c2bbdea3
commit ef7b9bf382
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Wed Aug 27 09:57:29 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_complex.rb: removed unreachable code. * test/ruby/test_complex.rb: removed unreachable code.

23
ext/win32ole/win32ole.c
View File

@ -26,7 +26,7 @@
const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}}; const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
#endif #endif
#define WIN32OLE_VERSION "1.7.8" #define WIN32OLE_VERSION "1.7.9"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -405,7 +405,7 @@ static double
rbtime2vtdate(VALUE tmobj) rbtime2vtdate(VALUE tmobj)
{ {
SYSTEMTIME st; SYSTEMTIME st;
double t = 0; double t;
memset(&st, 0, sizeof(SYSTEMTIME)); memset(&st, 0, sizeof(SYSTEMTIME));
st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0)); st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0)); st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
@ -423,8 +423,8 @@ vtdate2rbtime(double date)
{ {
SYSTEMTIME st; SYSTEMTIME st;
VALUE v; VALUE v;
double msec;
VariantTimeToSystemTime(date, &st); VariantTimeToSystemTime(date, &st);
v = rb_funcall(rb_cTime, rb_intern("new"), 6, v = rb_funcall(rb_cTime, rb_intern("new"), 6,
INT2FIX(st.wYear), INT2FIX(st.wYear),
INT2FIX(st.wMonth), INT2FIX(st.wMonth),
@ -432,8 +432,21 @@ vtdate2rbtime(double date)
INT2FIX(st.wHour), INT2FIX(st.wHour),
INT2FIX(st.wMinute), INT2FIX(st.wMinute),
INT2FIX(st.wSecond)); 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; return v;
} }

8
test/win32ole/test_win32ole_variant.rb
View File

@ -388,6 +388,14 @@ if defined?(WIN32OLE_VARIANT)
assert_equal(dt, obj.value) assert_equal(dt, obj.value)
end 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 # this test failed because of VariantTimeToSystemTime
# and SystemTimeToVariantTime API ignores wMilliseconds # and SystemTimeToVariantTime API ignores wMilliseconds
# member of SYSTEMTIME struct. # member of SYSTEMTIME struct.