diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-04 11:06:16 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-04 11:06:16 +0000 |
commit | b6dc09ae3268aef040852824757a411e5924b0e9 (patch) | |
tree | bd1e3f74e36013dc94cb801b7043074f21a8aa3f /ext | |
parent | baebdfa60108bf9f54db7c2920f205817fb32f06 (diff) | |
download | ruby-b6dc09ae3268aef040852824757a411e5924b0e9.tar.gz |
win32/registry.rb: registry type names
* ext/win32/lib/win32/registry.rb (Win32::Registry#read): show
registry type names instead of numeric values.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/win32/lib/win32/registry.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb index f3655b78d3..a88d7e63d0 100644 --- a/ext/win32/lib/win32/registry.rb +++ b/ext/win32/lib/win32/registry.rb @@ -643,7 +643,9 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr def read(name, *rtype) type, data = API.QueryValue(@hkey, name) unless rtype.empty? or rtype.include?(type) - raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)" + raise TypeError, "Type mismatch (expect [#{ + rtype.map{|t|Registry.type2name(t)}.join(', ')}] but #{ + Registry.type2name(type)} present)" end case type when REG_SZ, REG_EXPAND_SZ @@ -659,7 +661,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr when REG_QWORD [ type, API.unpackqw(data) ] else - raise TypeError, "Type #{type} is not supported." + raise TypeError, "Type #{Registry.type2name(type)} is not supported." end end @@ -682,7 +684,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr when REG_EXPAND_SZ Registry.expand_environ(data) else - raise TypeError, "Type #{type} is not supported." + raise TypeError, "Type #{Registry.type2name(type)} is not supported." end end @@ -755,7 +757,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr when REG_QWORD data = API.packqw(data.to_i) else - raise TypeError, "Unsupported type #{type}" + raise TypeError, "Unsupported type #{Registry.type2name(type)}" end API.SetValue(@hkey, name, type, data, data.bytesize + termsize) end |