summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-24 07:35:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-24 07:35:12 +0000
commit14695c4c1aed1067d73dca044d3367c54f3b5565 (patch)
treefdc43a782d88d86b2ef3bbcd25dd3c7af6634b1d
parent4cf9b6694f12c84a1095a950e1ab6eaafca79c56 (diff)
win32/registry.rb: fix runtime errors
* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumKey): size of the name is in WCHARs, not in bytes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/win32/lib/win32/registry.rb2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b3d07a7..a3e21e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 24 16:35:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumKey):
+ size of the name is in WCHARs, not in bytes.
+
Tue Sep 24 14:07:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
* gc.c (free_method_cache_entry_i): unused function
@@ -31,7 +36,7 @@ Tue Sep 24 12:51:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
Constants.
* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumValue):
- size of the name is in WCHARs, not in bytes
+ size of the name is in WCHARs, not in bytes.
Mon Sep 23 22:16:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb
index 0b4e587..d989bc0 100644
--- a/ext/win32/lib/win32/registry.rb
+++ b/ext/win32/lib/win32/registry.rb
@@ -298,7 +298,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
size = packdw(Constants::MAX_KEY_LENGTH)
wtime = ' ' * 8
check RegEnumKeyExW.call(hkey, index, name, size, 0, 0, 0, wtime)
- [ name[0, unpackdw(size)/WCHAR_SIZE].encode, unpackqw(wtime) ]
+ [ name[0, unpackdw(size)].encode, unpackqw(wtime) ]
end
def QueryValue(hkey, name)