Skip to content

winreg: patch cleanup #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

winreg: patch cleanup #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/Setup.bootstrap.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ _symtable symtablemodule.c
@MODULE_PWD_TRUE@pwd pwdmodule.c

# build-in modules for windows platform:
@USE_WIN32_MODULE@winreg ../PC/winreg.c
@MODULE_WINREG_TRUE@winreg ../PC/winreg.c
@MODULE_MSVCRT_TRUE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
@MODULE__WINAPI_TRUE@_winapi _winapi.c
19 changes: 0 additions & 19 deletions PC/winreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,6 @@
#include "structmember.h" // PyMemberDef
#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

#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM) || defined(MS_WINDOWS_GAMES)

typedef struct {
Expand Down
8 changes: 1 addition & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4633,13 +4633,6 @@ case $host in
CFLAGS_NODIST="$CFLAGS_NODIST -D_WIN32_WINNT=0x0602";;
esac

# Determine if windows modules should be used.
AC_SUBST(USE_WIN32_MODULE)
USE_WIN32_MODULE='#'
case $host in
*-*-mingw*) USE_WIN32_MODULE=;;
esac

# Templates for things AC_DEFINEd more than once.
# For a single AC_DEFINE, no template is needed.
AH_TEMPLATE([_REENTRANT],
Expand Down Expand Up @@ -8059,6 +8052,7 @@ PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes],
[$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS])

dnl windows specific modules
PY_STDLIB_MOD([winreg], [test "$MACHDEP" = "win32"])
PY_STDLIB_MOD([msvcrt], [test "$MACHDEP" = "win32"])
PY_STDLIB_MOD([_winapi], [test "$MACHDEP" = "win32"])
PY_STDLIB_MOD([_msi], [test "$MACHDEP" = "win32"], [], [],
Expand Down
Loading