kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64

Browse source 
registry entry at first. [ruby-dev:41674] [Bug #3464]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2010-06-23 12:41:26 +00:00
parent eab33b597d
commit 0864df17fb
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jun 23 21:32:08 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
registry entry at first. [ruby-dev:41674] [Bug #3464]
Wed Jun 23 21:17:32 2010 Tanaka Akira <akr@fsij.org> Wed Jun 23 21:17:32 2010 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for * ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for

13
ext/win32ole/win32ole.c
View file

@ -130,7 +130,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define WC2VSTR(x) ole_wc2vstr((x), TRUE) #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "1.4.8" #define WIN32OLE_VERSION "1.4.9"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -2353,10 +2353,15 @@ static VALUE
reg_get_typelib_file_path(HKEY hkey) reg_get_typelib_file_path(HKEY hkey)
{ {
VALUE path = Qnil; VALUE path = Qnil;
path = reg_get_val2(hkey, "win32"); path = reg_get_val2(hkey, "win64");
if (path == Qnil) { if (path != Qnil) {
path = reg_get_val2(hkey, "win16"); return path;
} }
path = reg_get_val2(hkey, "win32");
if (path != Qnil) {
return path;
}
path = reg_get_val2(hkey, "win16");
return path; return path;
} }