Merge branch 'main' of https://github.com/mhammond/pywin32 into Native-ARM64-CI-wheels

Author: Avasam

Pythonwin/win32cmdui.cpp

@@ -27,19 +27,6 @@ inline void *GetPythonOleProcAddress(const char *procName)
 #endif
     hMod = GetModuleHandle(buf);
 
-    // XXX It is unclear why the code previously tried to identify a loaded PythonCOM DLL of
-    // any Python version 1.5 .. 3.9. If some InprocServer would load the DLL of a different
-    // Python version that would likely cause a crash. Thus deactivated.
-    //
-    //     for (int i = 0; hMod == NULL && i < 40; i++) {
-    // #ifdef _DEBUG
-    //         wsprintf(buf, _T("PythonCOM3%d_d.dll"), i);
-    // #else
-    //         wsprintf(buf, _T("PythonCOM3%d.dll"), i);
-    // #endif
-    //         hMod = GetModuleHandle(buf);
-    //     }
-
     if (hMod) {
         void *rc = GetProcAddress(hMod, procName);
         if (rc == NULL)

Pythonwin/win32uimodule.cpp

@@ -2559,9 +2559,9 @@ extern "C" PYW_EXPORT BOOL Win32uiApplicationInit(Win32uiHostGlue *pGlue, const
     PyObject *argv = PySys_GetObject("argv");
     PyInit_win32ui();
     // Decide if we render sys.argv from command line.
-    // PY3.6- Py_Initialize sets sys.argv=NULL .
-    // PY3.7 Py_Initialize or intentional script triggers set sys.argv=[] .
-    // PY3.8+ Py_Initialize sets sys.argv=[''] - cannot be distinguished
+    // Python 3.6- Py_Initialize sets sys.argv=NULL .
+    // Python 3.7 Py_Initialize or intentional script triggers set sys.argv=[] .
+    // Python 3.8+ Py_Initialize sets sys.argv=[''] - cannot be distinguished
     //   from a pre-existing command line setup anymore. So we need to check
     //   another flag regarding the intended type of invokation, e.g. `cmd`
     //   (or untangle all that crossover startup + module + app init here)

build_env.md

@@ -5,7 +5,7 @@ This describes how to setup the build environment for pywin32.
 Double check the compiler version you need in the [Python wiki](https://wiki.python.org/moin/WindowsCompilers)
 but note that Python 3.5+ all use version 14.X of the compiler, which,
 confusingly, report themselves as V.19XX (eg, note in Python's banner,
-3.5's "MSC v.1900", even 3.9b4's "MSC v.1924")
+3.5's "MSC v.1900", even 3.13's "MSC v.1941")
 
 This compiler first shipped with Visual Studio 2015, although Visual Studio
 2017, 2019 and 2022 all have this compiler available, just not installed

com/win32com/client/__init__.py

@@ -529,13 +529,14 @@ def __init__(self, oobj=None):
                 oobj = oobj._oleobj_ if isinstance(oobj, DispatchBaseClass) else oobj
                 oobj = oobj.QueryInterface(self.CLSID, pythoncom.IID_IDispatch)
             except pythoncom.com_error as details:
-                import winerror
-
-                # Some stupid objects fail here, even tho it is _already_ IDispatch!!??
-                # Eg, Lotus notes.
-                # So just let it use the existing object if E_NOINTERFACE
-                if details.hresult != winerror.E_NOINTERFACE:
-                    raise
+                if not isinstance(oobj, _PyIDispatchType):
+                    import winerror
+
+                    # Some stupid objects fail here, even tho it is _already_ IDispatch!!??
+                    # Eg, Lotus notes.
+                    # So just let it use the existing object if E_NOINTERFACE
+                    if details.hresult != winerror.E_NOINTERFACE:
+                        raise
 
         self.__dict__["_oleobj_"] = oobj  # so we don't call __setattr__
 

com/win32com/client/gencache.py

@@ -99,6 +99,7 @@ def _LoadDicts():
         arc_path = loader.archive
         dicts_path = os.path.join(win32com.__gen_path__, "dicts.dat")
         if dicts_path.startswith(arc_path):
+            # Remove the leading slash as well
             dicts_path = dicts_path[len(arc_path) + 1 :]
         else:
             # Hm. See below.

com/win32com/src/PyRecord.cpp

@@ -257,7 +257,7 @@ PyRecord *PyRecord::new_record(IRecordInfo *ri, PVOID data, PyRecordBuffer *owne
         PyErr_NoMemory();
         return NULL;
     }
-    return new (buf) PyRecord(ri, owner->data, owner);
+    return new (buf) PyRecord(ri, data, owner);
 }
 
 PyRecord::PyRecord(IRecordInfo *ri, PVOID data, PyRecordBuffer *buf_owner)

pyrightconfig.json

@@ -6,7 +6,7 @@
   "enableTypeIgnoreComments": true,
   // Exclude from scanning when running pyright
   "exclude": [
-    ".git/",
+    ".git/", // Avoids scanning git branch names ending in ".py"
     "build/",
     // Vendored
     "Pythonwin/Scintilla/",

setup.py

@@ -2023,7 +2023,7 @@ def convert_optional_data_files(files):
     project_urls={
         # https://docs.pypi.org/project_metadata/#general-url
         "Homepage": "https://github.com/mhammond/pywin32",
-        "Changes": "https://github.com/mhammond/pywin32/blob/main/CHANGES.txt",
+        "Changes": "https://github.com/mhammond/pywin32/blob/main/CHANGES.md",
         "Docs": "https://mhammond.github.io/pywin32/",
         "Bugs": "https://github.com/mhammond/pywin32/issues",
         # Arbitrary URLs (icons still recognized)