From 33e05e7905c00f601e4d1fea9ec0df0b3b9cb39c Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Thu, 27 Dec 2012 14:37:06 -0600 Subject: Fix #16759. Convert DWORD registry values using unsigned long. When converting REG_DWORD registry values into Python, the conversion needs to be made from an *unsigned* long (k instead of i) to match the DWORD type. --- Lib/test/test_winreg.py | 17 +++++++++++++++++ Misc/NEWS | 4 ++++ PC/_winreg.c | 4 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index c4ae737..2799e19 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -326,6 +326,23 @@ class LocalWinregTests(BaseWinregTests): finally: DeleteKey(HKEY_CURRENT_USER, test_key_name) + def test_queryvalueex_return_value(self): + # Test for Issue #16759, return unsigned int from QueryValueEx. + # Reg2Py, which gets called by QueryValueEx, was returning a value + # generated by PyLong_FromLong. The implmentation now uses + # PyLong_FromUnsignedLong to match DWORD's size. + try: + with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck: + self.assertNotEqual(ck.handle, 0) + test_val = 0x80000000 + SetValueEx(ck, "test_name", None, REG_DWORD, test_val) + ret_val, ret_type = QueryValueEx(ck, "test_name") + self.assertEqual(ret_type, REG_DWORD) + self.assertEqual(ret_val, test_val) + finally: + DeleteKey(HKEY_CURRENT_USER, test_key_name) + + @unittest.skipUnless(REMOTE_NAME, "Skipping remote registry tests") class RemoteWinregTests(BaseWinregTests): diff --git a/Misc/NEWS b/Misc/NEWS index 9f8c89a..6c0e000 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,10 @@ What's New in Python 2.7.4 Core and Builtins ----------------- +- Issue #16759: Support the full DWORD (unsigned long) range in Reg2Py + when retreiving a REG_DWORD value. This corrects functions like + winreg.QueryValueEx that may have been returning truncated values. + - Issue #14420: Support the full DWORD (unsigned long) range in Py2Reg when passed a REG_DWORD value. Fixes ValueError in winreg.SetValueEx when given a long. diff --git a/PC/_winreg.c b/PC/_winreg.c index 813e993..d60b151 100644 --- a/PC/_winreg.c +++ b/PC/_winreg.c @@ -918,9 +918,9 @@ Reg2Py(char *retDataBuf, DWORD retDataSize, DWORD typ) switch (typ) { case REG_DWORD: if (retDataSize == 0) - obData = Py_BuildValue("i", 0); + obData = Py_BuildValue("k", 0); else - obData = Py_BuildValue("i", + obData = Py_BuildValue("k", *(int *)retDataBuf); break; case REG_SZ: -- cgit v0.12