1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32/registry.rb: size in bytes

Browse Source 
* ext/win32/lib/win32/registry.rb (Win32::Registry#write): data size
  is in bytes, not chars.  terminators should be placed automatically.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-09-24 07:41:17 +00:00
parent 79e880c90d
commit 360c66732c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Sep 24 16:41:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32/lib/win32/registry.rb (Win32::Registry#write): data size
is in bytes, not chars. terminators should be placed automatically.
Tue Sep 24 16:39:36 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Sep 24 16:39:36 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32/lib/win32/registry.rb (Win32::Registry#each_value): encode * ext/win32/lib/win32/registry.rb (Win32::Registry#each_value): encode

9
ext/win32/lib/win32/registry.rb
View File

@ -725,11 +725,14 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
# method returns. # method returns.
# #
def write(name, type, data) def write(name, type, data)
termsize = 0
case type case type
when REG_SZ, REG_EXPAND_SZ when REG_SZ, REG_EXPAND_SZ
data = data.to_s + "\0" data = data.encode(WCHAR)
termsize = WCHAR_SIZE
when REG_MULTI_SZ when REG_MULTI_SZ
data = data.to_a.join("\0") + "\0\0" data = data.to_a.map {|s| s.encode(WCHAR)}.join(WCHAR_NUL) << WCHAR_NUL
termsize = WCHAR_SIZE
when REG_BINARY when REG_BINARY
data = data.to_s data = data.to_s
when REG_DWORD when REG_DWORD
@ -741,7 +744,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
else else
raise TypeError, "Unsupported type #{type}" raise TypeError, "Unsupported type #{type}"
end end
API.SetValue(@hkey, name, type, data, data.length) API.SetValue(@hkey, name, type, data, data.bytesize + termsize)
end end
# #