mhammond · Avasam · May 5, 2026
diff --git a/CHANGES.md b/CHANGES.md
@@ -27,7 +27,7 @@ Coming in build 312, as yet unreleased
 * Bugfix for COM Record instance creation (mhammond#2641, [@geppi][geppi])
 * Fix regression introduced by mhammond#2506 (mhammond#2640, [@geppi][geppi])
 * Fixed `LoadPerfCounterTextStrings` and `UnloadPerfCounterTextStrings`'s `bQuiet` param being unused and hardcoded to `True` (mhammond#2711, [@Avasam][Avasam])
-* Removed considerations for unsupported Windows Versions (95/98/ME/2000/2k/Vista, most of XP) (mhammond#2711, mhammond#2667, mhammond#2400, [@Avasam][Avasam])
+* Removed considerations for unsupported Windows Versions (95/98/ME/2000/2k/Vista, most of XP) (mhammond#2711, mhammond#2667, mhammond#2400, mhammond#2747, mhammond#2752 [@Avasam][Avasam])
   * Updated a lot of dynamic function loading at runtime to instead use static build linking
   * Updated a lot of documentation
   * This removes the following constants:

diff --git a/com/win32comext/ifilter/src/stdafx.h b/com/win32comext/ifilter/src/stdafx.h
@@ -12,21 +12,6 @@
 #include <PythonCOM.h>
 #include <filter.h>
 #include <filterr.h>
-
-#define MISSING_PROPSTG
-#ifdef MISSING_PROPSTG
-// Ack - NTQuery.h is failing with the Vista SDK - pull in what we need
-// Problem is missing propstg.h, and all the work-arounds are uglier than
-// just these 3 prototypes. See
-// https://web.archive.org/web/20071215081009/http://forums.microsoft.com:80/MSDN/ShowPost.aspx?PostID=508254&SiteID=1
-
-STDAPI LoadIFilter(PCWSTR pwcsPath, __in IUnknown *pUnkOuter, __deref_out void **ppIUnk);
-STDAPI BindIFilterFromStorage(__in IStorage *pStg, __in IUnknown *pUnkOuter, __deref_out void **ppIUnk);
-
-STDAPI BindIFilterFromStream(__in IStream *pStm, __in IUnknown *pUnkOuter, __deref_out void **ppIUnk);
-#else
 #include <ntquery.h>
-#endif
-
 #include <oleauto.h>
 #include <ocidl.h>  // Used to be <multinfo.h>
diff --git a/com/win32comext/mapi/src/IExchangeManageStoreEx.h b/com/win32comext/mapi/src/IExchangeManageStoreEx.h
@@ -24,5 +24,3 @@ DECLARE_MAPI_INTERFACE_(IExchangeManageStoreEx, IUnknown){MAPI_IUNKNOWN_METHODS(
 #define IMPL
 
 DECLARE_MAPI_INTERFACE_PTR(IExchangeManageStoreEx, LPEXCHANGEMANAGESTOREEX);
-
-DEFINE_GUID(IID_IExchangeManageStoreEx, 0x7fe3c629, 0x4d9a, 0x4510, 0xa4, 0x79, 0x56, 0x96, 0x2b, 0x24, 0x6d, 0xc6);
diff --git a/com/win32comext/mapi/src/mapi.i b/com/win32comext/mapi/src/mapi.i
@@ -25,6 +25,7 @@
 %include "mapilib.i"
 
 %{
+#define USES_IID_IMsgServiceAdmin2
 #include "MAPIAux.h"
 
 #include "PythonCOMServer.h"

diff --git a/pythonwin/Scintilla/README_pythonwin.md b/pythonwin/Scintilla/README_pythonwin.md
@@ -1,4 +1,4 @@
-This is a copy of Scintilla 4.4.6 used for Pythonwin.
+This is a copy of [Scintilla 4.4.6](https://www.scintilla.org/ScintillaHistory.html#:~:text=Release%204.4.6) used for Pythonwin.
 
 Scintilla's home is <https://www.scintilla.org/>
 

diff --git a/pythonwin/Win32uiHostGlue.h b/pythonwin/Win32uiHostGlue.h
@@ -22,7 +22,7 @@ class Win32uiHostGlue : public CObject {
     virtual void SetStatusText(const TCHAR * /*cmd*/, int /*bForce*/) { return; }
     // Helper class, to register _any_ HMODULE as a module name.
     // This allows modules built into .EXE's, or in differently
-    // named DLL's etc.  This requires admin priveliges on some machines, so
+    // named DLL's etc.  This requires admin privileges on some machines, so
     // a program should not refuse to start if this fails, but calling it
     // each time means the app is guaranteed to work when moved.
     // REMOVED - See below!!!

diff --git a/win32/src/PyWinTypes.h b/win32/src/PyWinTypes.h
@@ -702,17 +702,27 @@ class CEnterLeavePython {
     BOOL released;
 };
 
-// A helper for simple exception handling.
 #if defined(__MINGW32__)
+// MSVC's min/max macros don't need matching parameter types.
+// Replicate them here instead of using algorithm.h's std::min/std::max.
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 #define __try try
 #define __except(filter) catch (...)
+
+// Helpers for simple exception handling.
 #define PYWINTYPES_TRY try
 #define PYWINTYPES_EXCEPT catch (...)
 #else
 #define PYWINTYPES_TRY __try
 #define PYWINTYPES_EXCEPT __except (EXCEPTION_EXECUTE_HANDLER)
-#endif
 // End of exception helper macros.
+#endif
 
 // Class to hold a temporary reference that decrements itself
 class TmpPyObject {

diff --git a/win32/src/odbc.cpp b/win32/src/odbc.cpp
@@ -93,8 +93,8 @@ typedef struct {
 static cursorObject *cursor(PyObject *o) { return (cursorObject *)o; }
 
 static void cursorDealloc(PyObject *self);
-PyMethodDef cursorMethods[];
-PyMemberDef cursorMembers[];
+extern PyMethodDef cursorMethods[];
+extern PyMemberDef cursorMembers[];
 
 static PyTypeObject Cursor_Type = {
     PYWIN_OBJECT_HEAD "odbccur", /*tp_name */
@@ -137,8 +137,8 @@ static PyTypeObject Cursor_Type = {
 };
 
 static void connectionDealloc(PyObject *self);
-PyMethodDef connectionMethods[];
-PyMemberDef connectionMembers[];
+extern PyMethodDef connectionMethods[];
+extern PyMemberDef connectionMembers[];
 static PyTypeObject Connection_Type = {
     PYWIN_OBJECT_HEAD "odbcconn", /*tp_name */
     sizeof(connectionObject),     /*tp_basicsize */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,5 +24,3 @@ DECLARE_MAPI_INTERFACE_(IExchangeManageStoreEx, IUnknown){MAPI_IUNKNOWN_METHODS(
		#define IMPL

		DECLARE_MAPI_INTERFACE_PTR(IExchangeManageStoreEx, LPEXCHANGEMANAGESTOREEX);

		DEFINE_GUID(IID_IExchangeManageStoreEx, 0x7fe3c629, 0x4d9a, 0x4510, 0xa4, 0x79, 0x56, 0x96, 0x2b, 0x24, 0x6d, 0xc6);