Skip to content

Forward-port win32/resolv fixes from ruby/ruby#19030 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 3 commits into from
Sep 26, 2026
+7 −6
Merged

Forward-port win32/resolv fixes from ruby/ruby#19030 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
602615b
win32/resolv: Cast method functions with RUBY_METHOD_FUNC
hsbt Sep 25, 2026
94fa14d
Fix the Win32::Resolv guard in test_win32_config.rb
hsbt Sep 25, 2026
971a36e
Skip TestWin32Config without the win32/resolv extension
hsbt Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/win32/resolv/resolv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ InitVM_resolv(void)

reg_key_class = regkey;
rb_undef_alloc_func(regkey);
rb_define_private_method(singl, "get_dns_server_list", get_dns_server_list, 0);
rb_define_private_method(singl, "tcpip_params", tcpip_params_open, 0);
rb_define_method(regkey, "open", reg_open, 1);
rb_define_method(regkey, "each_key", reg_each_key, 0);
rb_define_method(regkey, "value", reg_value, 1);
rb_define_private_method(singl, "get_dns_server_list", RUBY_METHOD_FUNC(get_dns_server_list), 0);
rb_define_private_method(singl, "tcpip_params", RUBY_METHOD_FUNC(tcpip_params_open), 0);
rb_define_method(regkey, "open", RUBY_METHOD_FUNC(reg_open), 1);
rb_define_method(regkey, "each_key", RUBY_METHOD_FUNC(reg_each_key), 0);
rb_define_method(regkey, "value", RUBY_METHOD_FUNC(reg_value), 1);
}

void
Expand Down
3 changes: 2 additions & 1 deletion test/resolv/test_win32_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
require 'test/unit'
require 'resolv'

if defined?(Win32::Resolve)
# JRuby loads its bundled win32/resolv, which lacks the registry access of the extension.
if defined?(Win32::Resolv) && Win32::Resolv.respond_to?(:tcpip_params, true)
class TestWin32Config < Test::Unit::TestCase
def test_get_item_property_string
# Test reading a string registry value
Expand Down
Loading