diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 07:15:28 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 07:15:28 +0000 |
| commit | e9ea9d6527b1f1db455d89ce6e5b6c3cfa40a184 (patch) | |
| tree | 23e48d94c317f9ad9901e559587fc80b451403b4 | |
| parent | c7458b51f754ad2cf6f397e319b12e7d1d7b6465 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/win32/lib/win32/registry.rb | 4 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Mon Aug 17 16:14:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide + versions of RegDeleteValue and RegDeleteKey. + [ruby-core:67958] [Bug #10820] + Tue Jul 7 13:39:46 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * ext/zlib/zlib.c: Fix indentation for rdoc. diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb index 74cc77dc9f..d1cc06e970 100644 --- a/ext/win32/lib/win32/registry.rb +++ b/ext/win32/lib/win32/registry.rb @@ -222,8 +222,8 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr "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 *)", @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.7" -#define RUBY_RELEASE_DATE "2015-07-07" -#define RUBY_PATCHLEVEL 379 +#define RUBY_RELEASE_DATE "2015-08-17" +#define RUBY_PATCHLEVEL 380 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |