Commit: fa9e27de856fd4e659fa3b28f1724197450273b4 - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: fa9e27de856fd4e659fa3b28f1724197450273b4 (tree)
• Zeit: 2022-02-07 23:46:17
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Update for 8.2.4317

Remove a merged patch.

Ändern Zusammenfassung

• modified: series
• delete: win32-hook-python-exit.patch

Diff

diff -r 2cac77efbb9c -r fa9e27de856f series
--- a/series	Mon Feb 07 20:44:18 2022 +0900
+++ b/series	Mon Feb 07 23:46:17 2022 +0900
@@ -30,5 +30,4 @@
 wip-win32-vimdir-encoding.patch #+wip
 win32-directwrite-ambiwidth-auto.patch
 suppress-warnings.patch
-win32-hook-python-exit.patch
 fix-config_cache-removal.patch #+rejected

diff -r 2cac77efbb9c -r fa9e27de856f win32-hook-python-exit.patch
--- a/win32-hook-python-exit.patch	Mon Feb 07 20:44:18 2022 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-# HG changeset patch
-# Parent  4663988fb4ea1471b21985a8e37ebc6f7a6ef96d
-
-diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
---- a/runtime/doc/if_pyth.txt
-+++ b/runtime/doc/if_pyth.txt
-@@ -834,6 +834,19 @@ 3. You undefine PY_NO_RTLD_GLOBAL in aut
- Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
- 	:py vim.command("qall!")
- <
-+							*Exxxx*
-+This error can occur when python 3 cannot load the required modules.  This
-+means that your python 3 is not correctly installed or there are some mistakes
-+in your settings.  Please check the following items:
-+1. Make sure that python 3 is correctly installed.  Also check the version of
-+   python.
-+2. Check the 'pythonthreedll' option.
-+3. Check the 'pythonthreehome' option.
-+4. Check the PATH environment variable if you don't set 'pythonthreedll'.
-+   On MS-Windows, you can use where.exe to check which dll will be loaded.
-+   E.g. >
-+	where.exe python310.dll
-+5. Check the PYTHONPATH and PYTHONHOME environment variables.
- 
- 							*has-python*
- You can test what Python version is available with: >
-diff --git a/src/if_python3.c b/src/if_python3.c
---- a/src/if_python3.c
-+++ b/src/if_python3.c
-@@ -112,12 +112,18 @@ typedef PyObject PySliceObject_T;
- typedef PySliceObject PySliceObject_T;
- #endif
- 
-+#ifndef MSWIN
-+# define HINSTANCE void*
-+#endif
-+#if defined(DYNAMIC_PYTHON3) || defined(MSWIN)
-+static HINSTANCE hinstPy3 = 0; // Instance of python.dll
-+#endif
-+
- #if defined(DYNAMIC_PYTHON3) || defined(PROTO)
- 
- # ifndef MSWIN
- #  include <dlfcn.h>
- #  define FARPROC void*
--#  define HINSTANCE void*
- #  if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
- #   define load_dll(n) dlopen((n), RTLD_LAZY)
- #  else
-@@ -459,8 +465,6 @@ static void(*py3_PyObject_GC_Del)(void *
- static void(*py3_PyObject_GC_UnTrack)(void *);
- static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
- 
--static HINSTANCE hinstPy3 = 0; // Instance of python.dll
--
- // Imported exception objects
- static PyObject *p3imp_PyExc_AttributeError;
- static PyObject *p3imp_PyExc_IndexError;
-@@ -1032,13 +1036,8 @@ reset_stdin(void)
- {
-     FILE *(*py__acrt_iob_func)(unsigned) = NULL;
-     FILE *(*pyfreopen)(const char *, const char *, FILE *) = NULL;
--    HINSTANCE hinst;
-+    HINSTANCE hinst = hinstPy3;
- 
--# ifdef DYNAMIC_PYTHON3
--    hinst = hinstPy3;
--# else
--    hinst = GetModuleHandle(PYTHON3_DLL);
--# endif
-     if (hinst == NULL || is_stdin_readable())
- 	return;
- 
-@@ -1063,6 +1062,52 @@ reset_stdin(void)
- # define reset_stdin()
- #endif
- 
-+// Python 3.2 or later will abort inside Py_Initialize() when mandatory
-+// modules cannot be load. (e.g. 'pythonthreehome' is wrongly set.)
-+// Install a hook to python dll's exit() and recover from it.
-+#if defined(MSWIN) && (PY_VERSION_HEX >= 0x030200f0)
-+# define HOOK_EXIT
-+# include <setjmp.h>
-+
-+static jmp_buf jb;
-+static void *orig_exit = NULL;
-+
-+    static void
-+hooked_exit(int ret)
-+{
-+    // Recover from exit.
-+    longjmp(jb, 1);
-+}
-+
-+// Install a hook to python dll's exit().
-+    static void
-+hook_py_exit(void)
-+{
-+    HINSTANCE hinst = hinstPy3;
-+
-+    if (hinst == NULL || orig_exit != NULL)
-+	return;
-+
-+    orig_exit = hook_dll_import_func(hinst, "exit", (void*)hooked_exit);
-+}
-+
-+// Remove the hook.
-+    static void
-+restore_py_exit(void)
-+{
-+    HINSTANCE hinst = hinstPy3;
-+
-+    if (hinst == NULL)
-+	return;
-+
-+    if (orig_exit != NULL)
-+	hook_dll_import_func(hinst, "exit", orig_exit);
-+    orig_exit = NULL;
-+}
-+#else
-+# define restore_py_exit()
-+#endif
-+
-     static int
- Python3_Init(void)
- {
-@@ -1095,8 +1140,27 @@ Python3_Init(void)
- 
- 	PyImport_AppendInittab("vim", Py3Init_vim);
- 
-+#if !defined(DYNAMIC_PYTHON3) && defined(MSWIN)
-+	hinstPy3 = GetModuleHandle(PYTHON3_DLL);
-+#endif
- 	reset_stdin();
--	Py_Initialize();
-+
-+#ifdef HOOK_EXIT
-+	hook_py_exit();
-+	if (setjmp(jb) == 0)
-+#endif
-+	{
-+	    Py_Initialize();
-+	    restore_py_exit();
-+	}
-+#ifdef HOOK_EXIT
-+	else
-+	{
-+	    restore_py_exit();
-+	    emsg(_("Exxxx: Critical error in python3 initialization. Check your python3 installation."));
-+	    goto fail;
-+	}
-+#endif
- 
- #if PY_VERSION_HEX < 0x03090000
- 	// Initialise threads.  This is deprecated since Python 3.9.
-diff --git a/src/os_win32.c b/src/os_win32.c
---- a/src/os_win32.c
-+++ b/src/os_win32.c
-@@ -573,14 +573,18 @@ mch_is_gui_executable(void)
- }
- #endif
- 
--#if defined(DYNAMIC_ICONV) || defined(DYNAMIC_GETTEXT) || defined(PROTO)
-+#if defined(DYNAMIC_ICONV) || defined(DYNAMIC_GETTEXT) \
-+    || defined(FEAT_PYTHON3) || defined(PROTO)
- /*
-  * Get related information about 'funcname' which is imported by 'hInst'.
-  * If 'info' is 0, return the function address.
-  * If 'info' is 1, return the module name which the function is imported from.
-+ * If 'info' is 2, hook the function with 'ptr', and return the original
-+ * function address.
-  */
-     static void *
--get_imported_func_info(HINSTANCE hInst, const char *funcname, int info)
-+get_imported_func_info(HINSTANCE hInst, const char *funcname, int info,
-+	const void *ptr)
- {
-     PBYTE			pImage = (PBYTE)hInst;
-     PIMAGE_DOS_HEADER		pDOS = (PIMAGE_DOS_HEADER)hInst;
-@@ -612,12 +616,23 @@ get_imported_func_info(HINSTANCE hInst, 
- 					+ (UINT_PTR)(pINT->u1.AddressOfData));
- 	    if (strcmp((char *)pImpName->Name, funcname) == 0)
- 	    {
-+		void *original;
-+		DWORD old, new = PAGE_READWRITE;
-+
- 		switch (info)
- 		{
- 		    case 0:
- 			return (void *)pIAT->u1.Function;
- 		    case 1:
- 			return (void *)(pImage + pImpDesc->Name);
-+		    case 2:
-+			original = (void *)pIAT->u1.Function;
-+			VirtualProtect(&pIAT->u1.Function, sizeof(void *),
-+				new, &old);
-+			pIAT->u1.Function = (UINT_PTR)ptr;
-+			VirtualProtect(&pIAT->u1.Function, sizeof(void *),
-+				old, &new);
-+			return original;
- 		    default:
- 			return NULL;
- 		}
-@@ -635,7 +650,7 @@ find_imported_module_by_funcname(HINSTAN
- {
-     char    *modulename;
- 
--    modulename = (char *)get_imported_func_info(hInst, funcname, 1);
-+    modulename = (char *)get_imported_func_info(hInst, funcname, 1, NULL);
-     if (modulename != NULL)
- 	return GetModuleHandleA(modulename);
-     return NULL;
-@@ -647,7 +662,17 @@ find_imported_module_by_funcname(HINSTAN
-     void *
- get_dll_import_func(HINSTANCE hInst, const char *funcname)
- {
--    return get_imported_func_info(hInst, funcname, 0);
-+    return get_imported_func_info(hInst, funcname, 0, NULL);
-+}
-+
-+/*
-+ * Hook the function named 'funcname' which is imported by 'hInst' DLL,
-+ * and return the original function address.
-+ */
-+    void *
-+hook_dll_import_func(HINSTANCE hInst, const char *funcname, const void *hook)
-+{
-+    return get_imported_func_info(hInst, funcname, 2, hook);
- }
- #endif
- 
-diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
---- a/src/proto/os_win32.pro
-+++ b/src/proto/os_win32.pro
-@@ -4,6 +4,7 @@ HINSTANCE vimLoadLib(char *name);
- int mch_is_gui_executable(void);
- HINSTANCE find_imported_module_by_funcname(HINSTANCE hInst, const char *funcname);
- void *get_dll_import_func(HINSTANCE hInst, const char *funcname);
-+void *hook_dll_import_func(HINSTANCE hInst, const char *funcname, const void *hook);
- int dyn_libintl_init(void);
- void dyn_libintl_end(void);
- void PlatformId(void);