File 0001-Fix-implementation-of-capturing-our-activa... of Package mingw64-python

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-implementation-of-capturing-our-activation-conte.patch of Package mingw64-python (Revision bcfd5f97b530a7a36f2b6263b4930812)

Currently displaying revision bcfd5f97b530a7a36f2b6263b4930812 , Show latest

From 2d356e5adfcee8a2b9e1494e0d547da4757034fe Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 24 May 2019 18:42:21 +0200
Subject: [PATCH] bpo-37025: Fix implementation of capturing our activation context

This commit contains three fixes:

1. Fix AddRefActCtx() not returning a value
2. Calling AddRefActCtx() only make sense with a valid and not zero
   context returned by GetCurrentActCtx()
3. Fix printing an error message in case the current activation context
   could not be loaded

see https://bugs.python.org/issue37025
---
 PC/dl_nt.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/PC/dl_nt.c b/PC/dl_nt.c
index ef1ce09..6b1b578 100644
--- a/PC/dl_nt.c
+++ b/PC/dl_nt.c
@@ -33,8 +33,8 @@ const char *PyWin_DLLVersionString = dllVersionBuffer;
 typedef BOOL (WINAPI * PFN_GETCURRENTACTCTX)(HANDLE *);
 typedef BOOL (WINAPI * PFN_ACTIVATEACTCTX)(HANDLE, ULONG_PTR *);
 typedef BOOL (WINAPI * PFN_DEACTIVATEACTCTX)(DWORD, ULONG_PTR);
-typedef BOOL (WINAPI * PFN_ADDREFACTCTX)(HANDLE);
-typedef BOOL (WINAPI * PFN_RELEASEACTCTX)(HANDLE);
+typedef void (WINAPI * PFN_ADDREFACTCTX)(HANDLE);
+typedef void (WINAPI * PFN_RELEASEACTCTX)(HANDLE);
 
 // locals and function pointers for this activation context magic.
 static HANDLE PyWin_DLLhActivationContext = NULL; // one day it might be public
@@ -91,8 +91,12 @@ BOOL    WINAPI  DllMain (HANDLE hInst,
             _LoadActCtxPointers();
             if (pfnGetCurrentActCtx && pfnAddRefActCtx)
                 if ((*pfnGetCurrentActCtx)(&PyWin_DLLhActivationContext))
-                    if (!(*pfnAddRefActCtx)(PyWin_DLLhActivationContext))
-                        OutputDebugString("Python failed to load the default activation context\n");
+                {
+                    if (PyWin_DLLhActivationContext)
+                        (*pfnAddRefActCtx)(PyWin_DLLhActivationContext);
+                }
+                else
+                    OutputDebugString("Python failed to load the default activation context\n");
             break;
 
         case DLL_PROCESS_DETACH:
-- 
1.8.4.5

Places

File 0001-Fix-implementation-of-capturing-our-activation-conte.patch of Package mingw64-python (Revision bcfd5f97b530a7a36f2b6263b4930812)

Places