Add more tests and check if reversed and options are set both

Author: aisk

Lib/test/test_winreg.py

@@ -275,6 +275,16 @@ def test_registry_works_with_options(self):
                                                 reserved=REG_OPTION_VOLATILE)
             self._read_test_data(HKEY_CURRENT_USER, OpenKey=ok)
 
+        # TypeError cases
+        with self.assertRaises(TypeError):
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 0, KEY_READ, 0)
+        with self.assertRaises(TypeError):
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 0, KEY_READ, options=0)
+        with self.assertRaises(TypeError):
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 1, KEY_READ, reserved=1)
+        with self.assertRaises(TypeError):
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, options=1, reserved=1)
+
         self._delete_test_data(HKEY_CURRENT_USER)
 
     def test_create_only(self):

PC/winreg.c

@@ -1444,6 +1444,11 @@ winreg_OpenKeyEx_impl(PyObject *module, HKEY key, const wchar_t *sub_key,
                     (Py_ssize_t)access) < 0) {
         return NULL;
     }
+    if (options != 0 && reserved != 0) {
+        PyErr_SetString(PyExc_TypeError,
+            "cannot specify both 'options' and 'reserved' parameters");
+        return NULL;
+    }
     if (reserved != 0) {
         if (PyErr_WarnEx(PyExc_DeprecationWarning,
             "reserved is deprecated, use options instead.", 1))
@@ -1453,7 +1458,7 @@ winreg_OpenKeyEx_impl(PyObject *module, HKEY key, const wchar_t *sub_key,
         options = reserved;
     }
     Py_BEGIN_ALLOW_THREADS
-    rc = RegOpenKeyExW(key, sub_key, reserved, access, &retKey);
+    rc = RegOpenKeyExW(key, sub_key, options, access, &retKey);
     Py_END_ALLOW_THREADS
     if (rc != ERROR_SUCCESS) {
         PyErr_SetFromWindowsErrWithFunction(rc, "RegOpenKeyEx");