зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
3047144ac2
Коммит
70db4f6ecd
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче