From 150e34625f4331f4b39bf79107655c25657645d7 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 6 Aug 2025 22:57:57 +0100
Subject: [PATCH] Check executable for *w.exe names. Fixes #152

---
 src/pymanager/main.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pymanager/main.cpp b/src/pymanager/main.cpp
index daa388d..8df8ce6 100644
--- a/src/pymanager/main.cpp
+++ b/src/pymanager/main.cpp
@@ -129,7 +129,8 @@ per_exe_settings(
     }
     const wchar_t *name = &argv0[n];
 #endif
-    if (CompareStringOrdinal(name, cch, L"python", -1, TRUE) == CSTR_EQUAL) {
+    if (CompareStringOrdinal(name, cch, L"python", -1, TRUE) == CSTR_EQUAL
+        || CompareStringOrdinal(name, cch, L"pythonw", -1, TRUE) == CSTR_EQUAL) {
         *default_command = NULL;
         *commands = false;
         *cli_tag = false;
@@ -137,7 +138,8 @@ per_exe_settings(
         *autoinstall = false;
         return;
     }
-    if (CompareStringOrdinal(name, cch, L"python3", -1, TRUE) == CSTR_EQUAL) {
+    if (CompareStringOrdinal(name, cch, L"python3", -1, TRUE) == CSTR_EQUAL
+        || CompareStringOrdinal(name, cch, L"pythonw3", -1, TRUE) == CSTR_EQUAL) {
         *default_command = NULL;
         *commands = false;
         *cli_tag = false;
@@ -145,7 +147,8 @@ per_exe_settings(
         *autoinstall = false;
         return;
     }
-    if (CompareStringOrdinal(name, cch, L"py", -1, TRUE) == CSTR_EQUAL) {
+    if (CompareStringOrdinal(name, cch, L"py", -1, TRUE) == CSTR_EQUAL
+        || CompareStringOrdinal(name, cch, L"pyw", -1, TRUE) == CSTR_EQUAL) {
         *default_command = NULL;
         *commands = argc >= 2;
         *cli_tag = argc >= 2;
@@ -153,7 +156,8 @@ per_exe_settings(
         *autoinstall = argc >= 2 && !wcscmp(argv[1], L"exec");
         return;
     }
-    if (CompareStringOrdinal(name, cch, L"pymanager", -1, TRUE) == CSTR_EQUAL) {
+    if (CompareStringOrdinal(name, cch, L"pymanager", -1, TRUE) == CSTR_EQUAL
+        || CompareStringOrdinal(name, cch, L"pywmanager", -1, TRUE) == CSTR_EQUAL) {
         *default_command = argc >= 2 ? L"**help_with_error" : L"help";
         *commands = argc >= 2;
         *cli_tag = false;