From 79e826d7f12a7ca916b2000b49a7fe9afb96e48e Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 18 Apr 2016 08:54:57 +0000 Subject: [PATCH] merge revision(s) 54529: [Backport #12264] * ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix API names. [ruby-core:74863] [Bug #12264] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32/lib/win32/registry.rb | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc7d825387..86bef6accd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 18 17:54:40 2016 Joe Swatosh + + * ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix + API names. [ruby-core:74863] [Bug #12264] + Mon Apr 18 17:27:30 2016 Nobuyoshi Nakada * compile.c (iseq_peephole_optimize): should not replace the diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb index 1f8f2d0112..f3655b78d3 100644 --- a/ext/win32/lib/win32/registry.rb +++ b/ext/win32/lib/win32/registry.rb @@ -333,11 +333,11 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr end def DeleteValue(hkey, name) - check RegDeleteValue.call(hkey, make_wstr(name)) + check RegDeleteValueW.call(hkey, make_wstr(name)) end def DeleteKey(hkey, name) - check RegDeleteKey.call(hkey, make_wstr(name)) + check RegDeleteKeyW.call(hkey, make_wstr(name)) end def FlushKey(hkey) diff --git a/version.h b/version.h index e8a1d3b8c3..3678999336 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-18" -#define RUBY_PATCHLEVEL 91 +#define RUBY_PATCHLEVEL 92 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4