yugui	2010-07-01 11:04:49 +0900 (Thu, 01 Jul 2010)

  New Revision: 28496

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

  Log:
    merges r28403 from trunk into ruby_1_9_2.
    --
    * ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
      registry entry at first. [ruby-dev:41674] [Bug #3464]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/win32ole/win32ole.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28495)
+++ ruby_1_9_2/ChangeLog	(revision 28496)
@@ -1,3 +1,8 @@
+Wed Jun 23 21:32:08 2010  Masaki Suketa <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
+	  registry entry at first. [ruby-dev:41674] [Bug #3464]
+
 Thu Jul  1 04:21:10 2010  Tanaka Akira  <akr@f...>
 
 	* ext/socket/raddrinfo.c: don't use __P.
Index: ruby_1_9_2/ext/win32ole/win32ole.c
===================================================================
--- ruby_1_9_2/ext/win32ole/win32ole.c	(revision 28495)
+++ ruby_1_9_2/ext/win32ole/win32ole.c	(revision 28496)
@@ -130,7 +130,7 @@
 
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "1.4.8"
+#define WIN32OLE_VERSION "1.4.9"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -2353,10 +2353,15 @@
 reg_get_typelib_file_path(HKEY hkey)
 {
     VALUE path = Qnil;
+    path = reg_get_val2(hkey, "win64");
+    if (path != Qnil) {
+        return path;
+    }
     path = reg_get_val2(hkey, "win32");
-    if (path == Qnil) {
-        path = reg_get_val2(hkey, "win16");
+    if (path != Qnil) {
+        return path;
     }
+    path = reg_get_val2(hkey, "win16");
     return path;
 }
 

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