From abc0b2f10b8bcbd1aa62e11b864e81c0aca3ab1d Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 9 Jul 2013 01:04:05 +0000 Subject: [PATCH] * ext/{dl,fiddle}/win32/lib/win32/registry.rb (Win32::Registry::Error#initialize): use suitable encoding for the string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/dl/win32/lib/win32/registry.rb | 2 +- ext/fiddle/win32/lib/win32/registry.rb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c88cb602f1..9f30781f80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 9 10:02:45 2013 NAKAMURA Usaku + + * ext/{dl,fiddle}/win32/lib/win32/registry.rb + (Win32::Registry::Error#initialize): use suitable encoding for the + string. + Tue Jul 9 09:46:53 2013 NAKAMURA Usaku * ext/dl/win32/lib/win32/registry.rb (Win32::Registry.expand_environ): diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb index cca578ce01..abe9e36f9b 100644 --- a/ext/dl/win32/lib/win32/registry.rb +++ b/ext/dl/win32/lib/win32/registry.rb @@ -174,7 +174,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr msg = WCHAR_SPACE * 1024 len = FormatMessageW.call(0x1200, 0, code, 0, msg, 1024, 0) msg = msg[0, len].encode - super msg.tr("\r", '').chomp + super msg.tr("\r".encode(msg.encoding), '').chomp end attr_reader :code end diff --git a/ext/fiddle/win32/lib/win32/registry.rb b/ext/fiddle/win32/lib/win32/registry.rb index 099bfd7751..1c881ee300 100644 --- a/ext/fiddle/win32/lib/win32/registry.rb +++ b/ext/fiddle/win32/lib/win32/registry.rb @@ -174,7 +174,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr msg = WCHAR_SPACE * 1024 len = FormatMessageW.call(0x1200, 0, code, 0, msg, 1024, 0) msg = msg[0, len].encode - super msg.tr("\r", '').chomp + super msg.tr("\r".encode(msg.encoding), '').chomp end attr_reader :code end