Bug #12264: Win32::Registry::API.DeleteKey and DeleteValue reference renamed constants

• Status: Closed
• Assignee: -
• Target version: -
• ruby -v: 2.1 and 2.2
• Backport: 2.1: REQUIRED, 2.2: DONE, 2.3: DONE

[jswatosh (Joe Swatosh)]

The fix for https://bugs.ruby-lang.org/issues/10820 (https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/49542) started using the wide version of the registry APIs.

---

--- D:/Ruby/ruby-2.1.8-i386-mingw32/lib/ruby/2.1.0/win32/registry.rb.original Tue Jan 12 05:21:04 2016
+++ D:/Ruby/ruby-2.1.8-i386-mingw32/lib/ruby/2.1.0/win32/registry.rb    Mon Apr  4 08:17:45 2016
@@ -321,11 +321,11 @@ For detail, see the MSDN[http://msdn.microsoft.com
       end

       def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, make_wstr(name))
+        check RegDeleteValueW.call(hkey, make_wstr(name))
       end
 
       def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, make_wstr(name))
+        check RegDeleteKeyW.call(hkey, make_wstr(name))
       end
 
       def FlushKey(hkey)

---

Is a follow up to make the referenced constants match the renames.... Thanks!

[jswatosh (Joe Swatosh)]

• File d.diff d.diff added

Made a mess of the patch. I had to try to recreate by hand so it may not apply directly, but the idea is simple enough.

[nobu (Nobuyoshi Nakada)]

• Description updated (diff)
• Backport changed from 2.1: UNKNOWN, 2.2: UNKNOWN, 2.3: UNKNOWN to 2.1: REQUIRED, 2.2: REQUIRED, 2.3: REQUIRED

[nobu (Nobuyoshi Nakada)]

• Status changed from Open to Closed

Applied in changeset r54529.

---

registry.rb: fix API names

• ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
  API names. [ruby-core:74863] [Bug #12264]

[naruse (Yui NARUSE)]

• Backport changed from 2.1: REQUIRED, 2.2: REQUIRED, 2.3: REQUIRED to 2.1: REQUIRED, 2.2: REQUIRED, 2.3: DONE

ruby_2_3 r54636 merged revision(s) 54529.

[usa (Usaku NAKAMURA)]

• Backport changed from 2.1: REQUIRED, 2.2: REQUIRED, 2.3: DONE to 2.1: REQUIRED, 2.2: DONE, 2.3: DONE

ruby_2_2 r54684 merged revision(s) 54529.