merge revision(s) 49542: [Backport ruby#10820]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: unak

ChangeLog

@@ -1,3 +1,9 @@
+Mon Aug 17 16:14:38 2015  Nobuyoshi Nakada  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ext/zlib/zlib.c: Fix indentation for rdoc.

ext/win32/lib/win32/registry.rb

@@ -222,8 +222,8 @@ module API
         "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 *)",

version.h

@@ -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"