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

Integrate read_s and read_s_expand with get_item_property for Win32::Registry

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2025-02-04 17:32:51 +09:00
parent 333bc26d82
commit 4b5bcba2e2
Notes: git 2025-02-04 22:37:18 +00:00 
Merged: https://github.com/ruby/ruby/pull/12616
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/win32/lib/win32/resolv.rb
View File

@ -67,15 +67,7 @@ module Win32
class << self class << self
private private
def get_hosts_dir def get_hosts_dir
if defined?(Win32::Registry) get_item_property(TCPIP_NT, 'DataBasePath', expand: true)
Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
reg.read_s_expand('DataBasePath')
end
else
cmd = "Get-ItemProperty -Path 'HKLM:\\#{TCPIP_NT}' -Name 'DataBasePath' -ErrorAction SilentlyContinue | Select-Object -ExpandProperty DataBasePath"
output, _ = Open3.capture2('powershell', '-Command', cmd)
output.strip
end
end end
def get_info def get_info
@ -134,10 +126,10 @@ module Win32
[ search.uniq, nameserver.uniq ] [ search.uniq, nameserver.uniq ]
end end
def get_item_property(path, name) def get_item_property(path, name, expand: false)
if defined?(Win32::Registry) if defined?(Win32::Registry)
Registry::HKEY_LOCAL_MACHINE.open(path) do |reg| Registry::HKEY_LOCAL_MACHINE.open(path) do |reg|
reg.read_s(key) expand ? reg.read_s_expand(name) : reg.read_s(name)
rescue Registry::Error rescue Registry::Error
"" ""
end end