naruse	2015-02-17 15:39:13 +0900 (Tue, 17 Feb 2015)

  New Revision: 49622

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

  Log:
    merge revision(s) 49542: [Backport #10820]
    
    * ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
      versions of RegDeleteValue and RegDeleteKey.
      [ruby-core:67958] [Bug #10820]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/win32/lib/win32/registry.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49621)
+++ ruby_2_2/ChangeLog	(revision 49622)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Feb 17 15:39:01 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
+	  versions of RegDeleteValue and RegDeleteKey.
+	  [ruby-core:67958] [Bug #10820]
+
 Tue Feb 17 11:50:06 2015  Yusuke Endoh  <mame@t...>
 
 	* string.c (str_discard): does not free for STR_NOFREE string.
Index: ruby_2_2/ext/win32/lib/win32/registry.rb
===================================================================
--- ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 49621)
+++ ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 49622)
@@ -233,8 +233,8 @@ For detail, see the MSDN[http://msdn.mic https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/win32/lib/win32/registry.rb#L233
         "long RegEnumKeyExW(void *, long, void *, void *, void *, void *, void *, void *)",
         "long RegQueryValueExW(void *, void *, void *, void *, void *, void *)",
         "long RegSetValueExW(void *, void *, long, long, void *, long)",
-        "long RegDeleteValue(void *, void *)",
-        "long RegDeleteKey(void *, void *)",
+        "long RegDeleteValueW(void *, void *)",
+        "long RegDeleteKeyW(void *, void *)",
         "long RegFlushKey(void *)",
         "long RegCloseKey(void *)",
         "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49621)
+++ ruby_2_2/version.h	(revision 49622)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-17"
-#define RUBY_PATCHLEVEL 50
+#define RUBY_PATCHLEVEL 51
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49542


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