Applying: Fix Windows 7 crash after connecting when Python plugin init fails

.github/workflows/windows-build.yml

@@ -113,6 +113,26 @@ jobs:
             New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
           }
 
+      - uses: actions/setup-python@v6
+        with:
+          python-version: '3.8.10'
+          architecture: ${{ matrix.arch }}
+
+      - name: Prepare Python 3.8
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install cffi
+
+          $pyRoot = $env:pythonLocation
+          if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
+
+          foreach ($pyDir in @("C:\gtk-build\python-3.8.10", "C:\gtk-build\python-3.8")) {
+            New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
+            $target = Join-Path $pyDir "${{ matrix.platform }}"
+            if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+            New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
+          }
+
       - name: Build
         run: |
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
@@ -124,12 +144,33 @@ jobs:
             exit /b 1
           )
 
+          set "PYTHON38_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
+          if not exist "%PYTHON38_DIR%\libs\python38.lib" (
+            echo Missing %PYTHON38_DIR%\libs\python38.lib
+            dir "%PYTHON38_DIR%\libs"
+            exit /b 1
+          )
+          if not exist "%PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd" (
+            echo Missing %PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd
+            exit /b 1
+          )
+
           set "LIB=%PYTHON_DIR%\libs;%LIB%"
           set "INCLUDE=%PYTHON_DIR%\include;%INCLUDE%"
 
           powershell -NoProfile -ExecutionPolicy Bypass -Command "$archiveLib='C:\gtk-build\gtk\x64\release\lib\libarchive.lib'; if (-not (Test-Path $archiveLib)) { $archiveDll = Get-ChildItem 'C:\gtk-build\gtk\x64\release\bin\libarchive*.dll' | Select-Object -First 1; if ($archiveDll) { Push-Location 'C:\gtk-build\gtk\x64\release\lib'; & 'C:\gtk-build\gendef\gendef.exe' $archiveDll.FullName | Out-Null; $archiveDef = Get-ChildItem 'libarchive*.def' | Select-Object -First 1; if ($archiveDef) { & lib /def:$archiveDef.Name /machine:${{ matrix.platform }} /out:libarchive.lib | Out-Null }; Pop-Location } }"
 
           msbuild win32\zoitechat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
+          if errorlevel 1 exit /b 1
+
+          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\plugins\hcpython38.dll" (
+            echo hcpython38.dll was not built
+            exit /b 1
+          )
+          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\_cffi_backend.cp38*.pyd" (
+            echo _cffi_backend for Python 3.8 was not staged for the installer
+            exit /b 1
+          )
         shell: cmd
 
       - name: Preparing Artifacts

plugins/python/generate_plugin.py

@@ -53,6 +53,16 @@ builder.set_source('_zoitechat_embedded', '''
 #include "config.h"
 #include "zoitechat-plugin.h"
 
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+
 static zoitechat_plugin *ph;
 CFFI_DLLEXPORT int _on_plugin_init(char **, char **, char **, char *, char *);
 CFFI_DLLEXPORT int _on_plugin_deinit(void);
@@ -61,6 +71,20 @@ int zoitechat_plugin_init(zoitechat_plugin *plugin_handle,
                         char **name_out, char **description_out,
                         char **version_out, char *arg)
 {
+#ifdef _WIN32
+    /* CPython cannot be removed from a process once Py_Initialize has run.
+       If the embedded interpreter fails to start (e.g. _cffi_backend is
+       missing), the host responds to our 0 return by g_module_close()ing
+       this plugin, which would also drop the last reference to pythonXY.dll
+       and unload it mid-flight; the leftover process-global state then
+       crashes the process later, e.g. when a server connection spawns the
+       next thread.  Pin this module so FreeLibrary can never unload it. */
+    HMODULE self_handle;
+    GetModuleHandleExW (GET_MODULE_HANDLE_EX_FLAG_PIN |
+                        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
+                        (LPCWSTR)&zoitechat_plugin_init, &self_handle);
+#endif
+
     if (ph != NULL)
     {
         puts ("Python plugin already loaded\\n");

plugins/python/python38.vcxproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v142</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D58924D2-1492-4AC3-B058-7A214424EEDC}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>python38</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="..\..\win32\zoitechat.props" />
+  <PropertyGroup>
+    <TargetName>$(Python38Output)</TargetName>
+    <OutDir>$(ZoiteChatRel)plugins\</OutDir>
+  </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;Py_NO_LINK_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UndefinePreprocessorDefinitions>_DEBUG;Py_DEBUG;Py_REF_DEBUG;Py_TRACE_REFS;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+      <AdditionalOptions>/U_DEBUG /UPy_DEBUG /UPy_REF_DEBUG /UPy_TRACE_REFS %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(Glib);$(Python38Path)\include;..\..\src\common;$(ZoiteChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>python.def</ModuleDefinitionFile>
+      <AdditionalDependencies>"$(Python38Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python38Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PreBuildEvent>
+      <Command>"$(Python38Path)\python.exe" generate_plugin.py ..\..\src\common\zoitechat-plugin.h python.py "$(IntDir)python.c"</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="generate_plugin.py" />
+    <None Include="zoitechat.py" />
+    <None Include="python.def" />
+    <None Include="python.py" />
+    <None Include="xchat.py" />
+    <None Include="hexchat.py" />
+    <None Include="_zoitechat.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(IntDir)python.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
+
+
+
+

src/common/plugin.c

@@ -25,6 +25,7 @@
 
 #ifdef WIN32
 #include <io.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
@@ -56,6 +57,36 @@ typedef struct session zoitechat_context;
 #endif
 
 #define DEBUG(x) {x;}
+#ifdef WIN32
+
+/* Python >= 3.9 dropped support for Windows versions before 10, so those
+ * systems get a Python 3.8 build of the plugin instead.  RtlGetVersion is
+ * used because GetVersionEx reports a version capped by the compatibility
+ * manifest rather than the real one. */
+static gboolean
+plugin_windows_needs_python38 (void)
+{
+	typedef LONG (WINAPI *rtl_get_version_func) (PRTL_OSVERSIONINFOW);
+	rtl_get_version_func rtl_get_version;
+	RTL_OSVERSIONINFOW version;
+	HMODULE ntdll;
+
+	ntdll = GetModuleHandleW (L"ntdll.dll");
+	if (ntdll == NULL)
+		return FALSE;
+
+	rtl_get_version = (rtl_get_version_func) GetProcAddress (ntdll, "RtlGetVersion");
+	if (rtl_get_version == NULL)
+		return FALSE;
+
+	memset (&version, 0, sizeof (version));
+	version.dwOSVersionInfoSize = sizeof (version);
+	if (rtl_get_version (&version) != 0)
+		return FALSE;
+
+	return version.dwMajorVersion < 10;
+}
+#endif
 
 /* crafted to be an even 32 bytes */
 struct _zoitechat_hook
@@ -491,7 +522,10 @@ plugin_auto_load (session *sess)
 	for_files (lib_dir, "hcfishlim.dll", plugin_auto_load_cb);
 	for_files(lib_dir, "hclua.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
-	for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
+	if (plugin_windows_needs_python38 ())
+		for_files (lib_dir, "hcpython38.dll", plugin_auto_load_cb);
+	else
+		for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcupd.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcsysinfo.dll", plugin_auto_load_cb);
 #else

src/common/text.c

@@ -1695,117 +1695,6 @@ pevent_load (char *filename)
 	return 0;
 }
 
-
-static gboolean
-text_event_uses_color (const char *text, int color)
-{
-	const char *p;
-
-	if (!text || color < 0 || color > 31)
-		return FALSE;
-
-	for (p = text; *p; p++)
-	{
-		int value;
-		int digits;
-
-		if ((unsigned char) *p == 3)
-			p++;
-		else if (*p == '%' && p[1] == 'C')
-			p += 2;
-		else
-			continue;
-
-		if (!g_ascii_isdigit (*p))
-		{
-			p--;
-			continue;
-		}
-
-		value = *p - '0';
-		digits = 1;
-		if (g_ascii_isdigit (p[1]))
-		{
-			value = value * 10 + p[1] - '0';
-			digits = 2;
-		}
-
-		if (value == color)
-			return TRUE;
-
-		p += digits - 1;
-		if (*p == ',' && g_ascii_isdigit (p[1]))
-		{
-			p++;
-			value = *p - '0';
-			if (g_ascii_isdigit (p[1]))
-			{
-				value = value * 10 + p[1] - '0';
-				p++;
-			}
-			if (value == color)
-				return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-char *
-text_color_event_list (int color)
-{
-	GString *events;
-	GString *tip;
-	int count = 0;
-	int line_len = 0;
-	int i;
-
-	events = g_string_new (NULL);
-
-	for (i = 0; i < NUM_XP; i++)
-	{
-		const char *name;
-		const char *text = pntevts_text[i] ? pntevts_text[i] : te[i].def;
-		int name_len;
-
-		if (!text_event_uses_color (text, color))
-			continue;
-
-		name = _(te[i].name);
-		name_len = strlen (name);
-		if (count)
-		{
-			if (line_len + name_len + 2 > 76)
-			{
-				g_string_append (events, ",\n");
-				line_len = 0;
-			}
-			else
-			{
-				g_string_append (events, ", ");
-				line_len += 2;
-			}
-		}
-
-		g_string_append (events, name);
-		line_len += name_len;
-		count++;
-	}
-
-	if (!count)
-	{
-		g_string_free (events, TRUE);
-		return g_strdup (_("No text events use this color."));
-	}
-
-	tip = g_string_new (NULL);
-	g_string_append_printf (tip, _("Text events using this color (%d):"), count);
-	g_string_append_c (tip, '\n');
-	g_string_append (tip, events->str);
-	g_string_free (events, TRUE);
-	return g_string_free (tip, FALSE);
-}
-
 static void
 pevent_check_all_loaded (void)
 {

src/common/text.h

@@ -53,7 +53,6 @@ int pevt_build_string (const char *input, char **output, int *max_arg);
 int pevent_load (char *filename);
 void pevent_make_pntevts (void);
 int text_color_of (char *name);
-char *text_color_event_list (int color);
 void text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
 		time_t timestamp);
 int text_emit_by_name (char *name, session *sess, time_t timestamp,

src/fe-gtk/maingui.c

@@ -3388,19 +3388,10 @@ mg_topicbar_update_height (GtkWidget *topic)
 
 		if (parent && GTK_IS_SCROLLED_WINDOW (parent))
 		{
-			GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW (parent);
-			int max_height = gtk_scrolled_window_get_max_content_height (scrolled);
-
-			if (max_height != -1 && target_height > max_height)
-			{
-				gtk_scrolled_window_set_max_content_height (scrolled, target_height);
-				gtk_scrolled_window_set_min_content_height (scrolled, target_height);
-			}
-			else
-			{
-				gtk_scrolled_window_set_min_content_height (scrolled, target_height);
-				gtk_scrolled_window_set_max_content_height (scrolled, target_height);
-			}
+			gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), -1);
+			gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), -1);
+			gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
+			gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
 			gtk_widget_set_size_request (parent, -1, target_height);
 		}
 	}

src/fe-gtk/meson.build

@@ -50,7 +50,7 @@ zoitechat_gtk_deps = [
 
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
 
-zoitechat_theme_deps = [gtk_dep, zoitechat_common_dep]
+zoitechat_theme_deps = [gtk_dep]
 
 if host_machine.system() != 'windows'
   appindicator_opt = get_option('appindicator')

src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c

@@ -70,13 +70,6 @@ load_text_events (void)
 {
 }
 
-char *
-text_color_event_list (int color)
-{
-        (void)color;
-        return g_strdup ("No text events use this color.");
-}
-
 gboolean
 theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
 {

src/fe-gtk/theme/theme-access.c

@@ -52,13 +52,14 @@ static const guint8 theme_default_99_mirc_colors[THEME_XTEXT_MIRC_COLS][3] = {
 };
 
 static void
-theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len)
+theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len, gboolean apply_base)
 {
 	size_t i;
+	size_t start = apply_base ? 0 : 32;
 
 	if (palette_len == 0)
 		return;
-	for (i = 32; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
+	for (i = start; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
 	{
 		palette[i].red = theme_default_99_mirc_colors[i][0] / 255.0;
 		palette[i].green = theme_default_99_mirc_colors[i][1] / 255.0;
@@ -147,10 +148,11 @@ gboolean
 theme_get_mirc_color (unsigned int mirc_index, GdkRGBA *out_rgba)
 {
 	ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
+	gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 
 	if (mirc_index >= THEME_XTEXT_MIRC_COLS)
 		return FALSE;
-	if (mirc_index >= 32)
+	if (!has_user_colors || mirc_index >= 32)
 	{
 		out_rgba->red = theme_default_99_mirc_colors[mirc_index][0] / 255.0;
 		out_rgba->green = theme_default_99_mirc_colors[mirc_index][1] / 255.0;
@@ -171,10 +173,11 @@ gboolean
 theme_get_mirc_color_rgb16 (unsigned int mirc_index, guint16 *red, guint16 *green, guint16 *blue)
 {
 	ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
+	gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 
 	if (mirc_index >= THEME_XTEXT_MIRC_COLS)
 		return FALSE;
-	if (mirc_index >= 32)
+	if (!has_user_colors || mirc_index >= 32)
 	{
 		*red = (guint16) (theme_default_99_mirc_colors[mirc_index][0] * 257);
 		*green = (guint16) (theme_default_99_mirc_colors[mirc_index][1] * 257);
@@ -224,6 +227,7 @@ void
 theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_t palette_len)
 {
 	ThemeWidgetStyleValues style_values;
+	gboolean has_user_colors;
 	GdkRGBA marker_color;
 
 	if (!palette)
@@ -231,8 +235,9 @@ theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_
 
 	theme_get_widget_style_values_for_widget (widget, &style_values);
 	theme_runtime_get_xtext_colors (palette, palette_len);
+	has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 	if (palette_len >= THEME_XTEXT_MIRC_COLS)
-		theme_access_apply_default_99_palette (palette, palette_len);
+		theme_access_apply_default_99_palette (palette, palette_len, !has_user_colors);
 	if (palette_len > THEME_XTEXT_MARK_FG_INDEX)
 	{
 		palette[THEME_XTEXT_MARK_FG_INDEX].red = style_values.selection_foreground.red;

src/fe-gtk/theme/theme-preferences.c

@@ -38,7 +38,6 @@
 #include "theme-runtime.h"
 
 extern void load_text_events (void);
-extern char *text_color_event_list (int color);
 
 typedef struct
 {
@@ -269,15 +268,6 @@ theme_preferences_manager_ui_free (gpointer data)
         g_free (ui);
 }
 
-static char *
-theme_preferences_color_events_tooltip (ThemeSemanticToken token)
-{
-        if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31)
-                return NULL;
-
-        return text_color_event_list (token - THEME_TOKEN_MIRC_0);
-}
-
 static void
 theme_preferences_manager_update_preview (theme_color_manager_ui *ui)
 {
@@ -894,20 +884,6 @@ theme_preferences_create_color_manager_dialog (GtkWindow *parent, gboolean *colo
                 if (theme_preferences_staged_get_color (token, &rgba))
                         theme_preferences_manager_row_apply (row, &rgba);
 
-                {
-                        char *tip = theme_preferences_color_events_tooltip (token);
-                        if (tip)
-                        {
-                                gtk_widget_set_tooltip_text (list_row, tip);
-                                gtk_widget_set_tooltip_text (hbox, tip);
-                                gtk_widget_set_tooltip_text (name, tip);
-                                gtk_widget_set_tooltip_text (preview, tip);
-                                gtk_widget_set_tooltip_text (button, tip);
-                                gtk_widget_set_tooltip_text (entry, tip);
-                                g_free (tip);
-                        }
-                }
-
                 g_signal_connect (G_OBJECT (button), "clicked",
                                   G_CALLBACK (theme_preferences_manager_pick_cb), row);
                 g_object_set_data (G_OBJECT (button), "zoitechat-theme-color-manager-ui", ui);
@@ -1222,15 +1198,6 @@ theme_preferences_create_color_button (GtkWidget *table,
         g_object_set_data (G_OBJECT (but), "zoitechat-color-box", box);
         g_object_set_data (G_OBJECT (but), "zoitechat-theme-token", GINT_TO_POINTER (token));
         g_object_set_data (G_OBJECT (but), "zoitechat-theme-color-change", color_change_flag);
-        {
-                char *tip = theme_preferences_color_events_tooltip (token);
-                if (tip)
-                {
-                        gtk_widget_set_tooltip_text (but, tip);
-                        gtk_widget_set_tooltip_text (box, tip);
-                        g_free (tip);
-                }
-        }
         gtk_grid_attach (GTK_GRID (table), but, col, row, 1, 1);
         g_signal_connect (G_OBJECT (but), "clicked", G_CALLBACK (theme_preferences_color_cb), parent);
         if (theme_preferences_staged_get_color (token, &color))

win32/copy/copy.vcxproj

@@ -66,6 +66,7 @@
       <None Include="$(DepsRoot)\bin\*zlib*.dll" />
       <None Include="$(DepsRoot)\bin\*girepository*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
       <None Include="$(Python3Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python3Enabled)'=='true'" />
+      <None Include="$(Python38Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python38Enabled)'=='true'" />
 
       <LuaLib Include="$(LuaLibDir)\**\*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
       <LuaShare Include="$(LuaShareDir)\*.lua" Condition="'$(LuaEnabled)'=='true' and '$(LuaShareDir)'!=''" />
@@ -105,10 +106,10 @@
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(ZoiteChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(ZoiteChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(ZoiteChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
-    <Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
 
     <WriteLinesToFile File="$(ZoiteChatRel)portable-mode" Lines="2" Overwrite="true" />
 

win32/installer/zoitechat.iss.tt

@@ -16,7 +16,7 @@ AppUpdatesURL=http://zoitechat.org/downloads.html
 LicenseFile=share\doc\zoitechat\COPYING
 UninstallDisplayIcon={app}\zoitechat.exe
 UninstallDisplayName=ZoiteChat
-DefaultDirName={pf64}\ZoiteChat
+DefaultDirName={commonpf64}\ZoiteChat
 DisableDirPage=no
 DefaultGroupName=ZoiteChat
 AllowNoIcons=yes
@@ -28,11 +28,11 @@ OutputBaseFilename={#APPNAM}-{#APPVER}_x64
 FlatComponentsList=no
 PrivilegesRequired=none
 ShowComponentSizes=no
-CreateUninstallRegKey=not IsTaskSelected('portable')
-Uninstallable=not IsTaskSelected('portable')
+CreateUninstallRegKey=not WizardIsTaskSelected('portable')
+Uninstallable=not WizardIsTaskSelected('portable')
 ArchitecturesAllowed=x64compatible
 ArchitecturesInstallIn64BitMode=x64compatible
-MinVersion=6.1
+MinVersion=6.1sp1
 WizardImageFile={#PROJECTDIR}wizardimage.bmp
 WizardSmallImageFile={#PROJECTDIR}wizardsmallimage.bmp
 SetupIconFile={#PROJECTDIR}..\..\data\icons\zoitechat.ico
@@ -59,7 +59,7 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags:
 Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning
 Name: "langs\lua"; Description: "Lua (LuaJIT 2.1)"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "langs\perl"; Description: "Perl (Strawberry Perl 5.42.0.1)"; Types: custom; Flags: disablenouninstallwarning
-Name: "langs\python"; Description: "Python (Python 3.14.3)"; Types: custom; Flags: disablenouninstallwarning
+Name: "langs\python"; Description: "Python (Python 3.14.3, or 3.8.10 before Windows 10)"; Types: custom; Flags: disablenouninstallwarning
 Name: "themes"; Description: "GTK3 Themes"; Types: normal minimal custom; Flags: disablenouninstallwarning
 Name: "themes\windows10"; Description: "Windows 10"; Types: normal minimal custom; Flags: disablenouninstallwarning
 Name: "themes\windows10dark"; Description: "Windows 10 Dark"; Types: normal minimal custom; Flags: disablenouninstallwarning
@@ -181,7 +181,8 @@ Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 
 Source: "python\*.py"; DestDir: "{app}\python"; Flags: ignoreversion; Components: langs\python
 
-Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python
+Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python; Check: not NeedsLegacyPython
+Source: "plugins\hcpython38.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\python; Check: NeedsLegacyPython
 Source: "_cffi_backend.cp3*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\python
 
 Source: "zoitechat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -328,6 +329,32 @@ begin
 		Result := DirExists(ExpandConstant('{localappdata}') + '\enchant\myspell');
 end;
 
+// Python >= 3.9 dropped support for Windows versions before 10;
+// those systems get Python 3.8 and the matching plugin instead.
+function NeedsLegacyPython(): Boolean;
+var
+	Version: TWindowsVersion;
+begin
+	GetWindowsVersionEx(Version);
+	Result := Version.NTPlatform and (Version.Major < 10);
+end;
+
+function PythonURL(): String;
+begin
+	if NeedsLegacyPython() then
+		Result := 'https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe'
+	else
+		Result := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
+end;
+
+function PythonDLL(): String;
+begin
+	if NeedsLegacyPython() then
+		Result := 'python38.dll'
+	else
+		Result := 'python314.dll';
+end;
+
 /////////////////////////////////////////////////////////////////////
 // Sets up the automatic downloads
 /////////////////////////////////////////////////////////////////////
@@ -345,34 +372,34 @@ begin
   begin
     idpClearFiles;
 
-	if IsComponentSelected('themes\windows10') then
+	if WizardIsComponentSelected('themes\windows10') then
 		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
 
-	if IsComponentSelected('themes\windows10dark') then
+	if WizardIsComponentSelected('themes\windows10dark') then
 		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
 
-	if not IsTaskSelected('portable') then
+	if not WizardIsTaskSelected('portable') then
 	begin
 
 		REDIST := 'https://aka.ms/vs/17/release/vc_redist.x64.exe';
 		PERL := 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54201_64bit/strawberry-perl-5.42.0.1-64bit.msi';
-		PY3 := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
-		SPELL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/ZoiteChat.Spelling.Dictionaries.r2.exe';
+		PY3 := PythonURL();
+		SPELL := 'https://github.com/hexchat/gvsbuild/releases/download/hexchat-2.16.2/HexChat.Spelling.Dictionaries.r2.exe';
 
-		if IsComponentSelected('deps\vcredist2015') and not CheckVCInstall() then
+		if WizardIsComponentSelected('deps\vcredist2015') and not CheckVCInstall() then
 			idpAddFile(REDIST, ExpandConstant('{tmp}\vcredist.exe'));
 
-		if IsComponentSelected('spell') and not CheckSpellInstall() then
+		if WizardIsComponentSelected('spell') and not CheckSpellInstall() then
 			idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe'));
 
 		if not WizardSilent() then
 		begin
-			if IsComponentSelected('langs\perl') and not CheckDLL('perl542.dll') then
+			if WizardIsComponentSelected('langs\perl') and not CheckDLL('perl542.dll') then
 			begin
 				idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi'))
 			end;
 
-			if IsComponentSelected('langs\python') and not CheckDLL('python314.dll') then
+			if WizardIsComponentSelected('langs\python') and not CheckDLL(PythonDLL()) then
                 idpAddFile(PY3, ExpandConstant('{tmp}\python.exe'));
 		end;
 	end;
@@ -397,7 +424,7 @@ begin
 
 	if (CurPageID = wpSelectTasks) then
 		if (WizardForm.TasksList.Checked[1] = True) then
-			if (WizardDirValue() = ExpandConstant('{pf64}\ZoiteChat')) then
+			if (WizardDirValue() = ExpandConstant('{commonpf64}\ZoiteChat')) then
 			begin
 				WizardForm.TasksList.Checked[1] := False
 				MsgBox('Portable mode is only intended for use on portable drives and has been disabled.', mbInformation, MB_OK)
@@ -405,21 +432,21 @@ begin
 
 	if CurPageID = wpReady then
 	begin
-		if IsComponentSelected('themes\windows10') and not FileExists(ExpandConstant('{tmp}\Windows-10-3.2.1.zip')) then
+		if WizardIsComponentSelected('themes\windows10') and not FileExists(ExpandConstant('{tmp}\Windows-10-3.2.1.zip')) then
 		begin
 			MsgBox('Windows 10 GTK3 theme could not be downloaded. Please retry setup and rerun setup.', mbError, MB_OK);
 			Result := False;
 			Exit;
 		end;
 
-		if IsComponentSelected('themes\windows10dark') and not FileExists(ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip')) then
+		if WizardIsComponentSelected('themes\windows10dark') and not FileExists(ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip')) then
 		begin
 			MsgBox('Windows 10 Dark GTK3 theme could not be downloaded. Please retry setup and rerun setup.', mbError, MB_OK);
 			Result := False;
 			Exit;
 		end;
 
-		if IsComponentSelected('deps\vcredist2015') and not CheckVCInstall() and not FileExists(ExpandConstant('{tmp}\vcredist.exe')) then
+		if WizardIsComponentSelected('deps\vcredist2015') and not CheckVCInstall() and not FileExists(ExpandConstant('{tmp}\vcredist.exe')) then
 		begin
 			MsgBox('Visual C++ Redistributable could not be downloaded. Please retry setup or install it manually and rerun setup.', mbError, MB_OK);
 			Result := False;
@@ -486,7 +513,7 @@ end;
 /////////////////////////////////////////////////////////////////////
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
-	if not (IsTaskSelected('portable')) then
+	if not (WizardIsTaskSelected('portable')) then
 	begin
 		if (CurStep=ssInstall) then
 		begin

win32/zoitechat.props

@@ -8,6 +8,7 @@
 		<YourGendefPath>c:\gtk-build\gendef</YourGendefPath>
 		<YourPerlPath>c:\gtk-build\perl-5.42.0.1</YourPerlPath>
 		<YourPython3Path>c:\gtk-build\python-3.14</YourPython3Path>
+		<YourPython38Path>c:\gtk-build\python-3.8</YourPython38Path>
 		<YourWinSparklePath>c:\gtk-build\WinSparkle</YourWinSparklePath>
 
 		<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->
@@ -32,6 +33,12 @@
 		<Python3Enabled Condition="Exists('$(Python3Path)\\python.exe') and Exists('$(Python3Path)\\libs\\$(Python3Lib).lib') and Exists('$(Python3Path)\\Lib\\site-packages\\cffi')">true</Python3Enabled>
 		<Python3Enabled Condition="'$(Python3Enabled)'==''">false</Python3Enabled>
 
+		<Python38Path>$(YourPython38Path)\$(ZoiteChatPlatform)</Python38Path>
+		<Python38Lib>python38</Python38Lib>
+		<Python38Output>hcpython38</Python38Output>
+		<Python38Enabled Condition="Exists('$(Python38Path)\\python.exe') and Exists('$(Python38Path)\\libs\\$(Python38Lib).lib') and Exists('$(Python38Path)\\Lib\\site-packages\\cffi')">true</Python38Enabled>
+		<Python38Enabled Condition="'$(Python38Enabled)'==''">false</Python38Enabled>
+
 		<PerlEnabled Condition="Exists('$(PerlPath)\\bin\\perl.exe') and Exists('$(PerlPath)\\bin\\$(PerlLib).dll') and Exists('$(GendefPath)\\gendef.exe')">true</PerlEnabled>
 		<PerlEnabled Condition="'$(PerlEnabled)'==''">false</PerlEnabled>
 

win32/zoitechat.sln

@@ -60,6 +60,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}
+		{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D58924D2-1492-4AC3-B058-7A214424EEDC}
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}
 		{17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}
 		{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}
@@ -80,6 +81,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl", "..\plugins\perl\per
 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python38", "..\plugins\python\python38.vcxproj", "{D58924D2-1492-4AC3-B058-7A214424EEDC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3", "..\plugins\python\python3.vcxproj", "{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
@@ -127,6 +133,8 @@ Global
 		{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|x64.Build.0 = Release|x64
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.ActiveCfg = Release|x64
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.Build.0 = Release|x64
+		{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.ActiveCfg = Release|x64
+		{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.Build.0 = Release|x64
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.ActiveCfg = Release|x64
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.Build.0 = Release|x64
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.ActiveCfg = Release|x64
@@ -151,6 +159,7 @@ Global
 		{5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13}
 		{D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
+		{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {021EC1D0-FF67-4700-9AB2-EAABF1159C09}
 		{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}