Files
MINGW-packages/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch
2018-04-16 10:51:53 +03:00

60 lines
1.9 KiB
Diff

diff -Naur Python-3.6.5-orig/configure.ac Python-3.6.5/configure.ac
--- Python-3.6.5-orig/configure.ac 2018-04-16 09:53:11.975829000 +0300
+++ Python-3.6.5/configure.ac 2018-04-16 09:53:12.248430700 +0300
@@ -3035,6 +3035,14 @@
fi])
AC_MSG_RESULT($with_dbmliborder)
+
+# Determine if windows modules should be used.
+AC_SUBST(USE_WIN32_MODULE)
+USE_WIN32_MODULE='#'
+case $host in
+ *-*-mingw*) USE_WIN32_MODULE=;;
+esac
+
# This is used to generate Setup.config
AC_SUBST(USE_THREAD_MODULE)
USE_THREAD_MODULE=""
diff -Naur Python-3.6.5-orig/Modules/Setup.config.in Python-3.6.5/Modules/Setup.config.in
--- Python-3.6.5-orig/Modules/Setup.config.in 2018-04-16 09:53:11.991429000 +0300
+++ Python-3.6.5/Modules/Setup.config.in 2018-04-16 09:53:12.264030700 +0300
@@ -9,5 +9,8 @@
# Threading
@USE_THREAD_MODULE@_thread _threadmodule.c
+# build-in modules for windows platform:
+@USE_WIN32_MODULE@winreg ../PC/winreg.c
+
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
diff -Naur Python-3.6.5-orig/PC/winreg.c Python-3.6.5/PC/winreg.c
--- Python-3.6.5-orig/PC/winreg.c 2018-03-28 12:19:31.000000000 +0300
+++ Python-3.6.5/PC/winreg.c 2018-04-16 09:53:12.279630800 +0300
@@ -16,6 +16,25 @@
#include "structmember.h"
#include "windows.h"
+#ifndef SIZEOF_HKEY
+/* used only here */
+#if defined(MS_WIN64)
+# define SIZEOF_HKEY 8
+#elif defined(MS_WIN32)
+# define SIZEOF_HKEY 4
+#else
+# error "SIZEOF_HKEY is not defined"
+#endif
+#endif
+
+#ifndef REG_LEGAL_CHANGE_FILTER
+#define REG_LEGAL_CHANGE_FILTER (\
+ REG_NOTIFY_CHANGE_NAME |\
+ REG_NOTIFY_CHANGE_ATTRIBUTES |\
+ REG_NOTIFY_CHANGE_LAST_SET |\
+ REG_NOTIFY_CHANGE_SECURITY )
+#endif
+
static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK);
static BOOL clinic_HKEY_converter(PyObject *ob, void *p);
static PyObject *PyHKEY_FromHKEY(HKEY h);