merges r30377 from trunk into ruby_1_9_2.

--
* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]

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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bcd981bd9..db064b2624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
+
+	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
+	  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
+
 Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
index 7b5a469c40..6edd85b8fb 100644
--- a/ext/dl/win32/lib/win32/registry.rb
+++ b/ext/dl/win32/lib/win32/registry.rb
@@ -210,7 +210,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
       dlload "advapi32.dll"
       [
         "long RegOpenKeyExA(void *, void *, long, long, void *)",
-        "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, void *)",
+        "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, void *, void *)",
         "long RegEnumValueA(void *, long, void *, void *, void *, void *, void *, void *)",
         "long RegEnumKeyExA(void *, long, void *, void *, void *, void *, void *, void *)",
         "long RegQueryValueExA(void *, void *, void *, void *, void *, void *)",
diff --git a/version.h b/version.h
index cb5e9916d1..afc89d02d1 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 139
+#define RUBY_PATCHLEVEL 140
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1