Merge 3.3

briancurtin · briancurtin · commit 4482b01d2308 · 2012-12-27T10:15:54.000-06:00
diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py
@@ -323,6 +323,18 @@ def test_reflection_unsupported(self):
         finally:
             DeleteKey(HKEY_CURRENT_USER, test_key_name)
 
+    def test_setvalueex_value_range(self):
+        # Test for Issue #14420, accept proper ranges for SetValueEx.
+        # Py2Reg, which gets called by SetValueEx, was using PyLong_AsLong,
+        # thus raising OverflowError. The implementation now uses
+        # PyLong_AsUnsignedLong to match DWORD's size.
+        try:
+            with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck:
+                self.assertNotEqual(ck.handle, 0)
+                SetValueEx(ck, "test_name", None, REG_DWORD, 0x80000000)
+        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
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #14420: Support the full DWORD (unsigned long) range in Py2Reg
+  when passed a REG_DWORD value. Fixes OverflowError in winreg.SetValueEx.
+
 - Issue #11939: Set the st_dev attribute of stat_result to allow Windows to
   take advantage of the os.path.samefile/sameopenfile/samestat implementations
   used by other platforms.
diff --git a/PC/winreg.c b/PC/winreg.c
@@ -785,7 +785,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
                 memcpy(*retDataBuf, &zero, sizeof(DWORD));
             }
             else {
-                DWORD d = PyLong_AsLong(value);
+                DWORD d = PyLong_AsUnsignedLong(value);
                 memcpy(*retDataBuf, &d, sizeof(DWORD));
             }
             break;

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ Py2Reg(PyObject value, DWORD typ, BYTE retDataBuf, DWORD retDataSize)`
`785`	`785`	`memcpy(*retDataBuf, &zero, sizeof(DWORD));`
`786`	`786`	`}`
`787`	`787`	`else {`
`788`		`- DWORD d = PyLong_AsLong(value);`
	`788`	`+ DWORD d = PyLong_AsUnsignedLong(value);`
`789`	`789`	`memcpy(*retDataBuf, &d, sizeof(DWORD));`
`790`	`790`	`}`
`791`	`791`	`break;`