Merge branch 'main' into Native-ARM64-CI-wheels

Avasam · web-flow · commit 000a1379b65a · 2025-09-27T15:10:10.000-04:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.python-architecture }}
@@ -52,14 +52,6 @@ jobs:
           check-latest: true
           allow-prereleases: true
 
-      - name: Fix user Scripts missing from PATH
-        if: matrix.python-architecture == 'x86' || matrix.python-architecture == 'arm64'
-        run: |
-          # Work around https://github.com/actions/setup-python/issues/1005
-          $ScriptsPath = python -c "import sysconfig,os; print(sysconfig.get_path('scripts', f'{os.name}_user'))"
-          echo $ScriptsPath
-          Add-Content $env:GITHUB_PATH $ScriptsPath
-
       - name: Build and install
         run: pip install . -v --user
 
@@ -117,8 +109,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up latest stable Python
-        uses: actions/setup-python@v5
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -162,7 +154,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           # This job only needs to target the oldest supported version
           python-version: "3.8"
@@ -198,7 +190,7 @@ jobs:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
diff --git a/CHANGES.md b/CHANGES.md
@@ -18,6 +18,11 @@ As of build 305, installation .exe files have been deprecated; see
 Coming in build 312, as yet unreleased
 --------------------------------------
 
+* Removed considerations for Windows 95/98/ME (mhammond#2400, [@Avasam][Avasam])
+  This removes the following constants:
+  * `win32con.FILE_ATTRIBUTE_ATOMIC_WRITE`
+  * `win32con.FILE_ATTRIBUTE_XACTION_WRITE`
+
 Build 311, released 2025/07/14
 ------------------------------
 
diff --git a/Pythonwin/doc/debugger/probs.html b/Pythonwin/doc/debugger/probs.html
@@ -10,8 +10,6 @@
 <H1><IMG SRC="pythonwin.gif" WIDTH=64 HEIGHT=64>Pythonwin Debugger Known Problems </H1>
 <P>This document lists the currently known problems with the pywin.debugger package. </P>
 <P>You may also wish to view the <A HREF="index.html">debugger overview</A>, the <A HREF="tutorial.html">debugger tutorial</A>, or the <A HREF="general.html">general debugger documentation</A>. </P>
-<H3>Exiting the debugger on Windows 95 sometimes causes a crash.</H3>
-<P>There is a problem with the "hierlist" control on Windows 95. I don't know what it is. </P>
 <H3>Closing the main debugger application while debugging may cause strange results. </H3>
 <P>This is particularly true when debugging non-Pythonwin applications. I have made some efforts in this area, but it is pretty hard and complex. </P>
 <P>Closing the debugger dialog, selecting "End/Close" from one of the property pages, or "Close" from the debugging toolbar should always work as expected. </P>
diff --git a/Pythonwin/doc/debugger/tutorial.html b/Pythonwin/doc/debugger/tutorial.html
@@ -33,9 +33,7 @@ <H3>From the MS-DOS Prompt</H3>
 <P>Change to the Pythonwin\pywin\debugger directory.</P>
 <P>For Windows NT users, type:</P>
 <CODE><P>fail.py&lt;enter&gt;</CODE> </P>
-<P>Or Windows 95/98 (sob - you would hope that 98 would have fixed some of 95s dumbness!)</P>
-<CODE><P>&lt;path to python.exe&gt;\python.exe fail.py</P>
-</CODE><P>or</P>
+<P>or</P>
 <CODE><P>start fail.py</CODE> </P>
 <H2>Using the Debugger</H2>
 <P>If all goes well, you should see the debugger appear in a full GUI frame, with a particular line in fail.py highlighted. Part of the screen should look something like: </P>
diff --git a/Pythonwin/pywin/Demos/splittst.py b/Pythonwin/pywin/Demos/splittst.py
@@ -39,7 +39,6 @@ def OnCreateClient(self, cp, context):
         self.v3.InsertItem(0, "Icon 1", 0)
         self.v3.InsertItem(0, "Icon 2", 1)
         self.v3.InsertItem(0, "Icon 3", 2)
-        # 		self.v3.Arrange(commctrl.LVA_DEFAULT) Hmmm - win95 aligns left always???
         return 1
 
     def OnDestroy(self, msg):
diff --git a/Pythonwin/pywin/framework/dlgappcore.py b/Pythonwin/pywin/framework/dlgappcore.py
@@ -34,8 +34,7 @@ def OnPaint(self):
         dc.DrawIcon((left, top), hIcon)
         self.EndPaint(paintStruct)
 
-    # Only needed to provide a minimized icon (and this seems
-    # less important under win95/NT4
+    # Only needed to provide a minimized icon
     def OnEraseBkgnd(self, dc):
         if self.IsIconic():
             return 1
diff --git a/Pythonwin/readme.html b/Pythonwin/readme.html
@@ -37,13 +37,6 @@ <H2><a name="KnownProblems">Known Problems</a></H2>
 <UL>
 <LI>Some of the configuration options (eg, &quot;Docking Windows&quot;) do not
   take affect until you restart Pythonwin. </LI>
-<LI>Under Windows 9x, any attempt to use Pythonwin features from an MS-DOS
-  prompt seems to cause immediate death.&nbsp; This means that you can not use
-  the Pythonwin debugger for programs running under Python.exe on Windows
-  9x.&nbsp; You should still be able to use the debugger normally from inside
-  Pythonwin itself. </LI>
-<LI>Pythonwin will occasionally crash upon exiting under Windows 9x. The crash is in
-  &quot;user.exe&quot; (old 16 bit code) which makes debugging difficult. It does not happen on Windows NT, so I'm stumped on this one. If someone could even just narrow it down to exactly what code will cause the crash at exit I would really appreciate it. </LI>
 <LI>Some of the menu items are always grey.&nbsp; This functionality is simply not yet implemented in
   Pythonwin. </LI>
 </UL>
diff --git a/com/win32com/src/PythonCOM.cpp b/com/win32com/src/PythonCOM.cpp
@@ -107,7 +107,6 @@ static CoSetCancelObjectfunc pfnCoSetCancelObject = NULL;
 // WinXP or later
 LPFNOBJECTFROMLRESULT pfnObjectFromLresult = NULL;
 
-// May not be available on Windows 95, although I'm not sure that's even a concern anymore
 typedef HRESULT(STDAPICALLTYPE *CoCreateInstanceExfunc)(REFCLSID, IUnknown *, DWORD, COSERVERINFO *, ULONG, MULTI_QI *);
 static CoCreateInstanceExfunc pfnCoCreateInstanceEx = NULL;
 typedef HRESULT(STDAPICALLTYPE *CoInitializeSecurityfunc)(PSECURITY_DESCRIPTOR, LONG, SOLE_AUTHENTICATION_SERVICE *,
diff --git a/com/win32com/src/dllmain.cpp b/com/win32com/src/dllmain.cpp
@@ -165,8 +165,6 @@ HRESULT PyCom_CoInitializeEx(LPVOID reserved, DWORD dwInit)
     CEnterLeaveFramework _celf;
     if (g_bCoInitThreadHasInit && g_dwCoInitThread == GetCurrentThreadId())
         return S_OK;
-    // Do a LoadLibrary, as the Ex version may not always exist
-    // on Win95.
     HMODULE hMod = GetModuleHandle(_T("ole32.dll"));
     if (hMod == 0)
         return E_HANDLE;
diff --git a/com/win32com/src/extensions/PyIType.cpp b/com/win32com/src/extensions/PyIType.cpp
@@ -803,7 +803,6 @@ PyObject *pythoncom_unregistertypelib(PyObject *self, PyObject *args)
         return NULL;
 
     PY_INTERFACE_PRECALL;
-    // WARNING: Requires Win95 OSR2 or later!!!
     HRESULT hr = UnRegisterTypeLib(clsid, major, minor, lcid, syskind);
     PY_INTERFACE_POSTCALL;
     if (FAILED(hr))
diff --git a/com/win32com/src/include/stdafx.h b/com/win32com/src/include/stdafx.h
@@ -3,7 +3,7 @@
 //      are changed infrequently
 //
 
-// _WIN32_DCOM screws win95 and NT :-(  However, we need to define this
+// _WIN32_DCOM screws Windows NT :-(  However, we need to define this
 // so we don't lose all the constants etc that come with DCOM
 //
 #define _WIN32_DCOM
diff --git a/com/win32comext/ifilter/src/stdafx.h b/com/win32comext/ifilter/src/stdafx.h
@@ -3,7 +3,7 @@
 //      are changed infrequently
 //
 
-// _WIN32_DCOM screws win95 and NT :-(  However, we need to define this
+// _WIN32_DCOM screws Windows NT :-(  However, we need to define this
 // so we don't lose all the constants etc that come with DCOM
 //
 #define _WIN32_DCOM
diff --git a/com/win32comext/shell/demos/IShellLinkDataList.py b/com/win32comext/shell/demos/IShellLinkDataList.py
@@ -20,26 +20,26 @@
 console_props = {
     "Signature": shellcon.NT_CONSOLE_PROPS_SIG,
     "InsertMode": True,
-    "FullScreen": False,  ## True looks like "DOS Mode" from win98!
+    "FullScreen": False,  # True looks like "DOS Mode" from win98!
     "FontFamily": 54,
-    "CursorSize": 75,  ## pct of character size
+    "CursorSize": 75,  # pct of character size
     "ScreenBufferSize": (152, 256),
     "AutoPosition": False,
     "FontSize": (4, 5),
     "FaceName": "",
     "HistoryBufferSize": 32,
     "InputBufferSize": 0,
     "QuickEdit": True,
-    "Font": 0,  ## 0 should always be present, use win32console.GetNumberOfConsoleFonts() to find how many available
+    "Font": 0,  # 0 should always be present, use win32console.GetNumberOfConsoleFonts() to find how many available
     "FillAttribute": 7,
     "PopupFillAttribute": 245,
     "WindowSize": (128, 32),
     "WindowOrigin": (0, 0),
     "FontWeight": 400,
     "HistoryNoDup": False,
     "NumberOfHistoryBuffers": 32,
-    ## ColorTable copied from a 'normal' console shortcut, with some obvious changes
-    ## These do not appear to be documented.  From experimentation, [0] is background, [7] is foreground text
+    # ColorTable copied from a 'normal' console shortcut, with some obvious changes
+    # These do not appear to be documented.  From experimentation, [0] is background, [7] is foreground text
     "ColorTable": (
         255,
         8388608,
diff --git a/com/win32comext/shell/demos/servers/empty_volume_cache.py b/com/win32comext/shell/demos/servers/empty_volume_cache.py
@@ -36,8 +36,6 @@ class EmptyVolumeCache:
     _public_methods_ = IEmptyVolumeCache_Methods + IEmptyVolumeCache2_Methods
 
     def Initialize(self, hkey, volume, flags):
-        # This should never be called, except on win98.
-        print("Unless we are on 98, Initialize call is unexpected!")
         raise COMException(hresult=winerror.E_NOTIMPL)
 
     def InitializeEx(self, hkey, volume, key_name, flags):
diff --git a/com/win32comext/shell/shellcon.py b/com/win32comext/shell/shellcon.py
@@ -507,7 +507,7 @@
 SSF_DOUBLECLICKINWEBVIEW = 128
 SSF_SHOWATTRIBCOL = 256
 SSF_DESKTOPHTML = 512
-SSF_WIN95CLASSIC = 1024
+SSF_WIN95CLASSIC = 1024  # Still exists
 SSF_DONTPRETTYPATH = 2048
 SSF_SHOWINFOTIP = 8192
 SSF_MAPNETDRVBUTTON = 4096
diff --git a/win32/Demos/rastest.py b/win32/Demos/rastest.py
@@ -63,8 +63,9 @@ def Connect(entryName, bUseCallback):
         win32event.ResetEvent(callbackEvent)
     else:
         theCallback = None
-    #       in order to *use* the username/password of a particular dun entry, one must
-    #       explicitly get those params under win95....
+    # In order to *use* the username/password of a particular dun entry,
+    # one must explicitly get those params under Win95 ...
+    # It's unclear whether that's even still necessary.
     try:
         dp, b = win32ras.GetEntryDialParams(None, entryName)
     except:
@@ -78,18 +79,19 @@ def Connect(entryName, bUseCallback):
         if not bUseCallback and rc != 0:
             print("Could not dial the RAS connection:", win32ras.GetErrorString(rc))
             hras = HangUp(hras)
-        #       don't wait here if there's no need to....
+        # don't wait here if there's no need to....
         elif (
             bUseCallback
             and win32event.WaitForSingleObject(callbackEvent, 60000)
             != win32event.WAIT_OBJECT_0
         ):
             print("Gave up waiting for the process to complete!")
-            #       sdk docs state one must explcitly hangup, even if there's an error....
+            # sdk docs state one must explicitly hangup, even if there's an error....
+            # https://learn.microsoft.com/en-us/windows/win32/api/ras/nf-ras-rasdialw#remarks
             try:
                 cs = win32ras.GetConnectStatus(hras)
             except:
-                #       on error, attempt a hang up anyway....
+                # on error, attempt a hang up anyway....
                 hras = HangUp(hras)
             else:
                 if int(cs[0]) == win32ras.RASCS_Disconnected:
diff --git a/win32/Lib/commctrl.py b/win32/Lib/commctrl.py
@@ -8,7 +8,7 @@
 ICC_PROGRESS_CLASS = 32  # progress
 ICC_HOTKEY_CLASS = 64  # hotkey
 ICC_ANIMATE_CLASS = 128  # animate
-ICC_WIN95_CLASSES = 255
+ICC_WIN95_CLASSES = 255  # Load animate control, header, hot key, list-view, progress bar, status bar, tab, tooltip, toolbar, trackbar, tree-view, and up-down control classes.
 ICC_DATE_CLASSES = 256  # month picker, date picker, time picker, updown
 ICC_USEREX_CLASSES = 512  # comboex
 ICC_COOL_CLASSES = 1024  # rebar (coolbar) control
diff --git a/win32/Lib/win32con.py b/win32/Lib/win32con.py
@@ -2142,10 +2142,6 @@ def SUBLANGID(lgid):
 FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = 8192
 FILE_ATTRIBUTE_ENCRYPTED = 16384
 FILE_ATTRIBUTE_VIRTUAL = 65536
-# These FILE_ATTRIBUTE_* flags  are apparently old definitions from Windows 95
-# and conflict with current values above - but they live on for b/w compat...
-FILE_ATTRIBUTE_ATOMIC_WRITE = 512
-FILE_ATTRIBUTE_XACTION_WRITE = 1024
 
 FILE_NOTIFY_CHANGE_FILE_NAME = 1
 FILE_NOTIFY_CHANGE_DIR_NAME = 2
diff --git a/win32/Lib/win32gui_struct.py b/win32/Lib/win32gui_struct.py
@@ -258,8 +258,9 @@ def EmptyMENUITEMINFO(mask=None, text_buf_size=512):
             | win32con.MIIM_STATE
             | win32con.MIIM_STRING
             | win32con.MIIM_SUBMENU
+            # Note: No MIIM_TYPE - this used to screw win2k/98.
+            # We don't know the impact now and whether it could/should be added to the mask.
         )
-        # Note: No MIIM_TYPE - this screws win2k/98.
 
     if mask & win32con.MIIM_STRING:
         text_buffer = _make_empty_text_buffer(text_buf_size)
diff --git a/win32/Lib/win32timezone.py b/win32/Lib/win32timezone.py
@@ -557,7 +557,6 @@ class TimeZoneInfo(datetime.tzinfo):
     ValueError: subkey name cannot be empty
     """
 
-    # this key works for WinNT+, but not for the Win95 line.
     tzRegKey = r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"
 
     def __init__(
@@ -578,7 +577,7 @@ def __getinitargs__(self) -> tuple[TimeZoneDefinition, bool]:
 
     def _FindTimeZoneKey(self) -> _RegKeyDict:
         """Find the registry key for the time zone name (self.timeZoneName)."""
-        # for multi-language compatability, match the time zone name in the
+        # for multi-language compatibility, match the time zone name in the
         # "Std" key of the time zone key.
         zoneNames = dict(self._get_indexed_time_zone_keys("Std"))
         # Also match the time zone key name itself, to be compatible with
diff --git a/win32/help/process_info.html b/win32/help/process_info.html
@@ -61,7 +61,7 @@ <h1><a name="SUMMARY">SUMMARY</a></h1>
 <h2><A NAME="Introduction">Introduction</A></h2>
 <p>
 
-To get process information for both NT and W2K (but not the 9x family)
+To get process information,
 you can use the Performance Data Helper library(PDH) available in the
 SDK at microsoft's ftp site. It provides a convenient interface to
 performance information stored fundamentally in the registry. The
diff --git a/win32/scripts/regsetup.py b/win32/scripts/regsetup.py
@@ -467,7 +467,7 @@ def RegisterShellInfo(searchPaths):
                    core path, you can avoid packages re-registering the same path.
 -m filename     -- Find and register the specific file name as a module.
                    Do not include a path on the filename!
---shell         -- Register everything with the Win95/NT shell.
+--shell         -- Register everything with the Windows shell.
 --upackage name -- Unregister the package
 --uapp name     -- Unregister the app (identical to --upackage)
 --umodule name  -- Unregister the module
diff --git a/win32/src/PySECURITY_ATTRIBUTES.cpp b/win32/src/PySECURITY_ATTRIBUTES.cpp
@@ -94,8 +94,6 @@ PYWINTYPES_EXPORT PyTypeObject PySECURITY_ATTRIBUTESType = {
 // @comm On platforms that support security descriptor operations, SECURITY_DESCRIPTOR
 //   defaults to a blank security descriptor with no owner, group, dacl, or sacl.
 // Set to None to use a NULL security descriptor instead.
-// When PySECURITY_ATTRIBUTES is created on Windows 95/98/Me, SECURITY_DESCRIPTOR defaults
-//   to None and should not be changed.
 // When SECURITY_DESCRIPTOR is not None, any of its methods can be invoked directly
 //   on the PySECURITY_ATTRIBUTES object
 
@@ -106,9 +104,9 @@ PySECURITY_ATTRIBUTES::PySECURITY_ATTRIBUTES(void)
     m_sa.nLength = sizeof(SECURITY_ATTRIBUTES);
     m_obSD = new PySECURITY_DESCRIPTOR(SECURITY_DESCRIPTOR_MIN_LENGTH);
     m_sa.lpSecurityDescriptor = ((PySECURITY_DESCRIPTOR *)m_obSD)->GetSD();
-    // On win95/98/me (or any platform that doesn't have NT security) the
-    // initialization of the SECURITY_DESCRIPTOR should fail, leaving the
-    // sd NULL.
+    // On platforms that don't have NT security,
+    // the initialization of the SECURITY_DESCRIPTOR should fail,
+    // leaving the sd NULL.
     if (m_sa.lpSecurityDescriptor == NULL) {
         Py_DECREF(m_obSD);
         Py_INCREF(Py_None);
diff --git a/win32/src/PySECURITY_DESCRIPTOR.cpp b/win32/src/PySECURITY_DESCRIPTOR.cpp
@@ -283,14 +283,8 @@ BOOL PySECURITY_DESCRIPTOR::SetSD(PSECURITY_DESCRIPTOR psd)
     // replace security descriptor in object, always in relative format
     if (this->m_psd)
         free(this->m_psd);
-    DWORD sdsize = GetSecurityDescriptorLength(psd);
-    if (sdsize == 0) {
-        // GetSecurityDescriptorLength returns 0 on Win9x where the
-        // SECURITY_DESCRIPTOR stuff is not supported.
-        this->m_psd = NULL;
-        return TRUE;
-    }
-    else if (_IsSelfRelative(psd)) {
+    if (_IsSelfRelative(psd)) {
+        DWORD sdsize = GetSecurityDescriptorLength(psd);
         this->m_psd = malloc(sdsize);
         memcpy(this->m_psd, psd, sdsize);
         return TRUE;
diff --git a/win32/src/win32apimodule.cpp b/win32/src/win32apimodule.cpp
@@ -226,7 +226,6 @@ static PyObject *PyDuplicateHandle(PyObject *self, PyObject *args)
 }
 
 // @pymethod int|win32api|GetHandleInformation|Retrieves a handle's flags.
-// @comm Not available on Win98/Me
 // @rdesc Returns a combination of HANDLE_FLAG_INHERIT, HANDLE_FLAG_PROTECT_FROM_CLOSE
 static PyObject *PyGetHandleInformation(PyObject *self, PyObject *args)
 {
@@ -245,7 +244,6 @@ static PyObject *PyGetHandleInformation(PyObject *self, PyObject *args)
 }
 
 // @pymethod |win32api|SetHandleInformation|Sets a handles's flags
-// @comm Not available on Win98/Me
 static PyObject *PySetHandleInformation(PyObject *self, PyObject *args)
 {
     CHECK_PFN(SetHandleInformation);
@@ -4140,7 +4138,7 @@ static PyObject *PyRegSetValueEx(PyObject *self, PyObject *args)
     // @flag REG_QWORD_LITTLE_ENDIAN|A 64-bit number in little-endian format. This is equivalent to REG_QWORD.<nl>In
     // little-endian format, a multi-byte value is stored in memory from the lowest byte (the little end) to the highest
     // byte. For example, the value 0x12345678 is stored as (0x78 0x56 0x34 0x12) in little-endian format. Windows NT
-    // and Windows 95 are designed to run on little-endian computer architectures. A user may connect to computers that
+    // is designed to run on little-endian computer architectures. A user may connect to computers that
     // have big-endian architectures, such as some UNIX systems.
     // @flag REG_DWORD_BIG_ENDIAN|A 32-bit number in big-endian format.
     // In big-endian format, a multi-byte value is stored in memory from the highest byte (the big end) to the lowest
diff --git a/win32/src/win32clipboardmodule.cpp b/win32/src/win32clipboardmodule.cpp
diff --git a/win32/src/win32file.i b/win32/src/win32file.i
diff --git a/win32/src/win32gui.i b/win32/src/win32gui.i
diff --git a/win32/src/win32print/win32print.cpp b/win32/src/win32print/win32print.cpp
diff --git a/win32/src/win32process.i b/win32/src/win32process.i
diff --git a/win32/src/win32rasmodule.cpp b/win32/src/win32rasmodule.cpp
diff --git a/win32/src/win32trace.cpp b/win32/src/win32trace.cpp
