From 4997572f7ee26f09a6983b35593766f5bcbbd4a8 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 11 Jul 2013 11:18:15 +0000 Subject: [PATCH] win32/registry.rb: remove workaround * ext/dl/win32/lib/win32/registry.rb (Win32::Registry::API#make_wstr): remove workaround to append WCHAR terminator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- ext/dl/win32/lib/win32/registry.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4632cf1bde..a130196c97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Thu Jul 11 20:18:08 2013 Nobuyoshi Nakada +Thu Jul 11 20:18:13 2013 Nobuyoshi Nakada + + * ext/dl/win32/lib/win32/registry.rb (Win32::Registry::API#make_wstr): + remove workaround to append WCHAR terminator. * transcode.c (str_encode_associate): fill terminator after conversion. diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb index 8a5d55969e..147830ae5d 100644 --- a/ext/dl/win32/lib/win32/registry.rb +++ b/ext/dl/win32/lib/win32/registry.rb @@ -267,7 +267,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr end def make_wstr(str) - str.encode(WCHAR) + WCHAR_NUL + str.encode(WCHAR) end def OpenKey(hkey, name, opt, desired)