From f2fdab250e7803d5beeeb2474d82e7b59063650c Mon Sep 17 00:00:00 2001
From: thexai <58434170+thexai@users.noreply.github.com>
Date: Thu, 30 Jul 2026 12:56:10 +0200
Subject: [PATCH] gh-152433: Windows: Allow build ``winreg`` module for UWP

---
 ...-07-30-13-11-20.gh-issue-152433.KA0YBO.rst |   1 +
 PC/clinic/winreg.c.h                          | 194 ++----------------
 PC/config.c                                   |   4 +-
 PC/config_minimal.c                           |   4 +-
 PC/winreg.c                                   |   4 -
 5 files changed, 22 insertions(+), 185 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Windows/2026-07-30-13-11-20.gh-issue-152433.KA0YBO.rst

diff --git a/Misc/NEWS.d/next/Windows/2026-07-30-13-11-20.gh-issue-152433.KA0YBO.rst b/Misc/NEWS.d/next/Windows/2026-07-30-13-11-20.gh-issue-152433.KA0YBO.rst
new file mode 100644
index 000000000000000..980fe639c15531f
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2026-07-30-13-11-20.gh-issue-152433.KA0YBO.rst
@@ -0,0 +1 @@
+Allow build :mod:`!winreg` module for Universal Windows Platform.
diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index 92cf6e8a9be1876..b98e5231b10732f 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -9,8 +9,6 @@ preserve
 #include "pycore_long.h"          // _PyLong_UnsignedLong_Converter()
 #include "pycore_modsupport.h"    // _PyArg_CheckPositional()
 
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_HKEYType_Close__doc__,
 "Close($self, /)\n"
 "--\n"
@@ -31,10 +29,6 @@ winreg_HKEYType_Close(PyObject *self, PyObject *Py_UNUSED(ignored))
     return winreg_HKEYType_Close_impl((PyHKEYObject *)self);
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_HKEYType_Detach__doc__,
 "Detach($self, /)\n"
 "--\n"
@@ -61,10 +55,6 @@ winreg_HKEYType_Detach(PyObject *self, PyObject *Py_UNUSED(ignored))
     return winreg_HKEYType_Detach_impl((PyHKEYObject *)self);
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_HKEYType___enter____doc__,
 "__enter__($self, /)\n"
 "--\n"
@@ -82,10 +72,6 @@ winreg_HKEYType___enter__(PyObject *self, PyObject *Py_UNUSED(ignored))
     return winreg_HKEYType___enter___impl((PyHKEYObject *)self);
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_HKEYType___exit____doc__,
 "__exit__($self, exc_type, exc_value, traceback, /)\n"
 "--\n"
@@ -118,10 +104,6 @@ winreg_HKEYType___exit__(PyObject *self, PyObject *const *args, Py_ssize_t nargs
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_CloseKey__doc__,
 "CloseKey($module, hkey, /)\n"
 "--\n"
@@ -137,9 +119,7 @@ PyDoc_STRVAR(winreg_CloseKey__doc__,
 #define WINREG_CLOSEKEY_METHODDEF    \
     {"CloseKey", (PyCFunction)winreg_CloseKey, METH_O, winreg_CloseKey__doc__},
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_ConnectRegistry__doc__,
 "ConnectRegistry($module, computer_name, key, /)\n"
@@ -203,9 +183,7 @@ winreg_ConnectRegistry(PyObject *module, PyObject *const *args, Py_ssize_t nargs
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
 PyDoc_STRVAR(winreg_CreateKey__doc__,
 "CreateKey($module, key, sub_key, /)\n"
@@ -272,10 +250,6 @@ winreg_CreateKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_CreateKeyEx__doc__,
 "CreateKeyEx($module, /, key, sub_key, reserved=0,\n"
 "            access=winreg.KEY_WRITE)\n"
@@ -398,10 +372,6 @@ winreg_CreateKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_DeleteKey__doc__,
 "DeleteKey($module, key, sub_key, /)\n"
 "--\n"
@@ -456,10 +426,6 @@ winreg_DeleteKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_DeleteKeyEx__doc__,
 "DeleteKeyEx($module, /, key, sub_key, access=winreg.KEY_WOW64_64KEY,\n"
 "            reserved=0)\n"
@@ -575,10 +541,6 @@ winreg_DeleteKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_DeleteValue__doc__,
 "DeleteValue($module, key, value, /)\n"
 "--\n"
@@ -631,10 +593,6 @@ winreg_DeleteValue(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_EnumKey__doc__,
 "EnumKey($module, key, index, /)\n"
 "--\n"
@@ -679,10 +637,6 @@ winreg_EnumKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_EnumValue__doc__,
 "EnumValue($module, key, index, /)\n"
 "--\n"
@@ -736,10 +690,6 @@ winreg_EnumValue(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_ExpandEnvironmentStrings__doc__,
 "ExpandEnvironmentStrings($module, string, /)\n"
 "--\n"
@@ -775,9 +725,7 @@ winreg_ExpandEnvironmentStrings(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_FlushKey__doc__,
 "FlushKey($module, key, /)\n"
@@ -819,9 +767,9 @@ winreg_FlushKey(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_LoadKey__doc__,
 "LoadKey($module, key, sub_key, file_name, /)\n"
@@ -899,9 +847,7 @@ winreg_LoadKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
 PyDoc_STRVAR(winreg_OpenKey__doc__,
 "OpenKey($module, /, key, sub_key, reserved=0, access=winreg.KEY_READ)\n"
@@ -1019,10 +965,6 @@ winreg_OpenKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_OpenKeyEx__doc__,
 "OpenKeyEx($module, /, key, sub_key, reserved=0, access=winreg.KEY_READ)\n"
 "--\n"
@@ -1139,10 +1081,6 @@ winreg_OpenKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_QueryInfoKey__doc__,
 "QueryInfoKey($module, key, /)\n"
 "--\n"
@@ -1179,10 +1117,6 @@ winreg_QueryInfoKey(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_QueryValue__doc__,
 "QueryValue($module, key, sub_key, /)\n"
 "--\n"
@@ -1244,10 +1178,6 @@ winreg_QueryValue(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_QueryValueEx__doc__,
 "QueryValueEx($module, key, name, /)\n"
 "--\n"
@@ -1305,9 +1235,7 @@ winreg_QueryValueEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_SaveKey__doc__,
 "SaveKey($module, key, file_name, /)\n"
@@ -1366,9 +1294,7 @@ winreg_SaveKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
 PyDoc_STRVAR(winreg_SetValue__doc__,
 "SetValue($module, key, sub_key, type, value, /)\n"
@@ -1448,10 +1374,6 @@ winreg_SetValue(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES))
-
 PyDoc_STRVAR(winreg_SetValueEx__doc__,
 "SetValueEx($module, key, value_name, reserved, type, value, /)\n"
 "--\n"
@@ -1545,9 +1467,7 @@ winreg_SetValueEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) */
-
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_DisableReflectionKey__doc__,
 "DisableReflectionKey($module, key, /)\n"
@@ -1585,9 +1505,9 @@ winreg_DisableReflectionKey(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_EnableReflectionKey__doc__,
 "EnableReflectionKey($module, key, /)\n"
@@ -1623,9 +1543,9 @@ winreg_EnableReflectionKey(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_DeleteTree__doc__,
 "DeleteTree($module, key, sub_key=None, /)\n"
@@ -1687,9 +1607,9 @@ winreg_DeleteTree(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
-#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
 
 PyDoc_STRVAR(winreg_QueryReflectionKey__doc__,
 "QueryReflectionKey($module, key, /)\n"
@@ -1723,64 +1643,12 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
     return return_value;
 }
 
-#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)) && (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
-
-#ifndef WINREG_HKEYTYPE_CLOSE_METHODDEF
-    #define WINREG_HKEYTYPE_CLOSE_METHODDEF
-#endif /* !defined(WINREG_HKEYTYPE_CLOSE_METHODDEF) */
-
-#ifndef WINREG_HKEYTYPE_DETACH_METHODDEF
-    #define WINREG_HKEYTYPE_DETACH_METHODDEF
-#endif /* !defined(WINREG_HKEYTYPE_DETACH_METHODDEF) */
-
-#ifndef WINREG_HKEYTYPE___ENTER___METHODDEF
-    #define WINREG_HKEYTYPE___ENTER___METHODDEF
-#endif /* !defined(WINREG_HKEYTYPE___ENTER___METHODDEF) */
-
-#ifndef WINREG_HKEYTYPE___EXIT___METHODDEF
-    #define WINREG_HKEYTYPE___EXIT___METHODDEF
-#endif /* !defined(WINREG_HKEYTYPE___EXIT___METHODDEF) */
-
-#ifndef WINREG_CLOSEKEY_METHODDEF
-    #define WINREG_CLOSEKEY_METHODDEF
-#endif /* !defined(WINREG_CLOSEKEY_METHODDEF) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
 
 #ifndef WINREG_CONNECTREGISTRY_METHODDEF
     #define WINREG_CONNECTREGISTRY_METHODDEF
 #endif /* !defined(WINREG_CONNECTREGISTRY_METHODDEF) */
 
-#ifndef WINREG_CREATEKEY_METHODDEF
-    #define WINREG_CREATEKEY_METHODDEF
-#endif /* !defined(WINREG_CREATEKEY_METHODDEF) */
-
-#ifndef WINREG_CREATEKEYEX_METHODDEF
-    #define WINREG_CREATEKEYEX_METHODDEF
-#endif /* !defined(WINREG_CREATEKEYEX_METHODDEF) */
-
-#ifndef WINREG_DELETEKEY_METHODDEF
-    #define WINREG_DELETEKEY_METHODDEF
-#endif /* !defined(WINREG_DELETEKEY_METHODDEF) */
-
-#ifndef WINREG_DELETEKEYEX_METHODDEF
-    #define WINREG_DELETEKEYEX_METHODDEF
-#endif /* !defined(WINREG_DELETEKEYEX_METHODDEF) */
-
-#ifndef WINREG_DELETEVALUE_METHODDEF
-    #define WINREG_DELETEVALUE_METHODDEF
-#endif /* !defined(WINREG_DELETEVALUE_METHODDEF) */
-
-#ifndef WINREG_ENUMKEY_METHODDEF
-    #define WINREG_ENUMKEY_METHODDEF
-#endif /* !defined(WINREG_ENUMKEY_METHODDEF) */
-
-#ifndef WINREG_ENUMVALUE_METHODDEF
-    #define WINREG_ENUMVALUE_METHODDEF
-#endif /* !defined(WINREG_ENUMVALUE_METHODDEF) */
-
-#ifndef WINREG_EXPANDENVIRONMENTSTRINGS_METHODDEF
-    #define WINREG_EXPANDENVIRONMENTSTRINGS_METHODDEF
-#endif /* !defined(WINREG_EXPANDENVIRONMENTSTRINGS_METHODDEF) */
-
 #ifndef WINREG_FLUSHKEY_METHODDEF
     #define WINREG_FLUSHKEY_METHODDEF
 #endif /* !defined(WINREG_FLUSHKEY_METHODDEF) */
@@ -1789,38 +1657,10 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
     #define WINREG_LOADKEY_METHODDEF
 #endif /* !defined(WINREG_LOADKEY_METHODDEF) */
 
-#ifndef WINREG_OPENKEY_METHODDEF
-    #define WINREG_OPENKEY_METHODDEF
-#endif /* !defined(WINREG_OPENKEY_METHODDEF) */
-
-#ifndef WINREG_OPENKEYEX_METHODDEF
-    #define WINREG_OPENKEYEX_METHODDEF
-#endif /* !defined(WINREG_OPENKEYEX_METHODDEF) */
-
-#ifndef WINREG_QUERYINFOKEY_METHODDEF
-    #define WINREG_QUERYINFOKEY_METHODDEF
-#endif /* !defined(WINREG_QUERYINFOKEY_METHODDEF) */
-
-#ifndef WINREG_QUERYVALUE_METHODDEF
-    #define WINREG_QUERYVALUE_METHODDEF
-#endif /* !defined(WINREG_QUERYVALUE_METHODDEF) */
-
-#ifndef WINREG_QUERYVALUEEX_METHODDEF
-    #define WINREG_QUERYVALUEEX_METHODDEF
-#endif /* !defined(WINREG_QUERYVALUEEX_METHODDEF) */
-
 #ifndef WINREG_SAVEKEY_METHODDEF
     #define WINREG_SAVEKEY_METHODDEF
 #endif /* !defined(WINREG_SAVEKEY_METHODDEF) */
 
-#ifndef WINREG_SETVALUE_METHODDEF
-    #define WINREG_SETVALUE_METHODDEF
-#endif /* !defined(WINREG_SETVALUE_METHODDEF) */
-
-#ifndef WINREG_SETVALUEEX_METHODDEF
-    #define WINREG_SETVALUEEX_METHODDEF
-#endif /* !defined(WINREG_SETVALUEEX_METHODDEF) */
-
 #ifndef WINREG_DISABLEREFLECTIONKEY_METHODDEF
     #define WINREG_DISABLEREFLECTIONKEY_METHODDEF
 #endif /* !defined(WINREG_DISABLEREFLECTIONKEY_METHODDEF) */
@@ -1836,4 +1676,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
 #ifndef WINREG_QUERYREFLECTIONKEY_METHODDEF
     #define WINREG_QUERYREFLECTIONKEY_METHODDEF
 #endif /* !defined(WINREG_QUERYREFLECTIONKEY_METHODDEF) */
-/*[clinic end generated code: output=97295995db2c24e9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b86605d6531ccd78 input=a9049054013a1b77]*/
diff --git a/PC/config.c b/PC/config.c
index dcccc6a3a6d0167..a5d2b5eba53057e 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -54,7 +54,7 @@ extern PyObject* PyInit__symtable(void);
 extern PyObject* PyInit_mmap(void);
 extern PyObject* PyInit__csv(void);
 extern PyObject* PyInit__sre(void);
-#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)
+#ifdef MS_WINDOWS
 extern PyObject* PyInit_winreg(void);
 #endif
 extern PyObject* PyInit__struct(void);
@@ -145,7 +145,7 @@ struct _inittab _PyImport_Inittab[] = {
 #endif
     {"_csv", PyInit__csv},
     {"_sre", PyInit__sre},
-#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)
+#ifdef MS_WINDOWS
     {"winreg", PyInit_winreg},
 #endif
     {"_struct", PyInit__struct},
diff --git a/PC/config_minimal.c b/PC/config_minimal.c
index 9a66ea1d1cd3482..654d0f7e29e6b9a 100644
--- a/PC/config_minimal.c
+++ b/PC/config_minimal.c
@@ -16,7 +16,7 @@ extern PyObject* PyInit__tracemalloc(void);
 extern PyObject* PyInit_gc(void);
 extern PyObject* PyInit_nt(void);
 extern PyObject* PyInit__signal(void);
-#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)
+#ifdef MS_WINDOWS
 extern PyObject* PyInit_winreg(void);
 #endif
 
@@ -39,7 +39,7 @@ struct _inittab _PyImport_Inittab[] = {
     {"_tokenize", PyInit__tokenize},
     {"_tracemalloc", PyInit__tracemalloc},
 
-#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)
+#ifdef MS_WINDOWS
     {"winreg", PyInit_winreg},
 #endif
 
diff --git a/PC/winreg.c b/PC/winreg.c
index 26bcd259efd9879..278509966eb98cc 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -18,8 +18,6 @@
 
 #include <windows.h>
 
-#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)
-
 typedef struct {
     PyTypeObject *PyHKEY_Type;
 } winreg_state;
@@ -2236,5 +2234,3 @@ PyMODINIT_FUNC PyInit_winreg(void)
 {
     return PyModuleDef_Init(&winregmodule);
 }
-
-#endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM || MS_WINDOWS_GAMES */