yugui	2011-01-16 15:30:22 +0900 (Sun, 16 Jan 2011)

  New Revision: 30557

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

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/dl/win32/lib/win32/registry.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30556)
+++ ruby_1_9_2/ChangeLog	(revision 30557)
@@ -1,3 +1,8 @@
+Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@g...>
+
+	* 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@r...>
 
 	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
Index: ruby_1_9_2/ext/dl/win32/lib/win32/registry.rb
===================================================================
--- ruby_1_9_2/ext/dl/win32/lib/win32/registry.rb	(revision 30556)
+++ ruby_1_9_2/ext/dl/win32/lib/win32/registry.rb	(revision 30557)
@@ -210,7 +210,7 @@
       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 *)",
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30556)
+++ ruby_1_9_2/version.h	(revision 30557)
@@ -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

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