Merge branch 'main' of https://github.com/mhammond/pywin32 into repr-respect-subclass-name

Author: Avasam

.github/workflows/main.yml

@@ -157,8 +157,7 @@ jobs:
         with:
           version: "0.8.4"
       - run: ruff format --check
-      - run:
-          | # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
+      - run: | # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
           clang-format --Werror --dry-run $(git ls-files '*.cpp' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
           if ($LastExitCode -ne 0) { exit $LastExitCode }
           clang-format --Werror --dry-run $(git ls-files '*.h' ':!:Pythonwin/Scintilla/' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')

CHANGES.txt

@@ -14,7 +14,18 @@ https://mhammond.github.io/pywin32_installers.html .
 Coming in build 311, as yet unreleased
 --------------------------------------
 * Fixed a regression that broke special __dunder__ methods with CoClass. (#1870, #2493, @Avasam, @geppi)
+* Fixed a memory leak when SafeArrays are used as out parameters (@the-snork)
 * Fixed dispatch handling for properties (@the-snork)
+* The following classes will now use the correct subclass name in `repr`: (#2570, @Avasam)
+  * `pywin.tools.browser.HLIPythonObject`
+  * `win32com.client.VARIANT`
+  * `win32com.client.build.MapEntry`
+  * `win32com.server.exception.COMException`
+  * `win32comext.axdebug.debugger.ModuleTreeNode`
+  * `win32comext.axscript.client.pyscript.NamedScriptAttribute`
+  * `win32comext.axscript.client.error.AXScriptException`
+  * `win32pdhquery.QueryError`
+  * `win32rcparser.StringDef`
 
 Build 310, released 2025/03/16
 ------------------------------

com/TestSources/PyCOMTest/PyCOMImpl.cpp

@@ -379,6 +379,13 @@ STDMETHODIMP CPyCOMTest::GetSafeArrays(SAFEARRAY **attrs, SAFEARRAY **attrs2, SA
     return S_OK;
 }
 
+STDMETHODIMP CPyCOMTest::GetByteArray(long sizeBytes, SAFEARRAY **array)
+{
+    SAFEARRAYBOUND bound = {static_cast<ULONG>(sizeBytes), 0};
+    *array = SafeArrayCreate(VT_UI1, 1, &bound);
+    return S_OK;
+}
+
 STDMETHODIMP CPyCOMTest::GetSimpleSafeArray(SAFEARRAY **attrs) { return MakeFillIntArray(attrs, 10, VT_I4); }
 
 STDMETHODIMP CPyCOMTest::CheckVariantSafeArray(SAFEARRAY **attrs, int *result)

com/TestSources/PyCOMTest/PyCOMImpl.h

@@ -80,6 +80,7 @@ class CPyCOMTest : public IDispatchImpl<IPyCOMTest, &IID_IPyCOMTest, &LIBID_PyCO
     STDMETHOD(SetDoubleSafeArray)(SAFEARRAY *vars, int *retSize);
     STDMETHOD(SetFloatSafeArray)(SAFEARRAY *vars, int *retSize);
     STDMETHOD(GetSafeArrays)(SAFEARRAY **attrs, SAFEARRAY **attrs2, SAFEARRAY **ints);
+    STDMETHOD(GetByteArray)(long sizeBytes, SAFEARRAY **array);
     STDMETHOD(GetSimpleSafeArray)(SAFEARRAY **ints);
     STDMETHOD(ChangeDoubleSafeArray)(SAFEARRAY **vals);
     STDMETHOD(GetSimpleCounter)(ISimpleCounter **counter);

com/TestSources/PyCOMTest/PyCOMTest.idl

@@ -235,6 +235,7 @@ library PyCOMTestLib
 		HRESULT GetSafeArrays([out] SAFEARRAY(QsAttribute)* attrs,
                                       [out] SAFEARRAY(enum tagQsAttribute)*attrs2,
                                       [out] SAFEARRAY(int)*ints);
+        HRESULT GetByteArray([in] long sizeInBytes, [out] SAFEARRAY(byte) *bytes);
 		HRESULT ChangeDoubleSafeArray([in, out]SAFEARRAY(double)*vals);
 		HRESULT GetSimpleCounter([out, retval] ISimpleCounter** counter);
 		HRESULT CheckVariantSafeArray([in] SAFEARRAY(VARIANT)* data, [out, retval]int *sum);

com/TestSources/PyCOMTest/PyCOMTest.vcxproj

@@ -161,4 +161,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

com/win32com/client/combrowse.py

@@ -26,6 +26,7 @@
 import sys
 
 import pythoncom
+import pywintypes
 import win32api
 import win32con
 import win32ui
@@ -61,7 +62,7 @@ def CalculateIsExpandable(self):
 class HLICLSID(HLICOM):
     def __init__(self, myobject, name=None):
         if isinstance(myobject, str):
-            myobject = pythoncom.MakeIID(myobject)
+            myobject = pywintypes.IID(myobject)
         if name is None:
             try:
                 name = pythoncom.ProgIDFromCLSID(myobject)

com/win32com/demos/connect.py

@@ -6,11 +6,12 @@
 # is cheated on - so this is still working as a fully-fledged server.
 
 import pythoncom
+import pywintypes
 import win32com.server.connect
 import win32com.server.util
 
 # This is the IID of the Events interface both Client and Server support.
-IID_IConnectDemoEvents = pythoncom.MakeIID("{A4988850-49C3-11d0-AE5D-52342E000000}")
+IID_IConnectDemoEvents = pywintypes.IID("{A4988850-49C3-11d0-AE5D-52342E000000}")
 
 # The server which implements
 # Create a connectable class, that has a single public method

com/win32com/server/policy.py

@@ -257,7 +257,7 @@ def _wrap_(self, object):
                     if i[0] != "{":
                         i = pythoncom.InterfaceNames[i]
                     else:
-                        i = pythoncom.MakeIID(i)
+                        i = pywintypes.IID(i)
                 self._com_interfaces_.append(i)
         else:
             self._com_interfaces_ = []

com/win32com/src/PyIDispatch.cpp

@@ -517,7 +517,12 @@ PyObject *PyIDispatch::InvokeTypes(PyObject *self, PyObject *args)
 
 error:
     if (dispparams.rgvarg) {
-        for (i = dispparams.cArgs; i--;) VariantClear(&dispparams.rgvarg[i]);
+        for (i = dispparams.cArgs; i--;) {
+            if ((V_VT(&dispparams.rgvarg[i]) & ~VT_TYPEMASK) == (VT_BYREF | VT_ARRAY)) {
+                SafeArrayDestroy(*V_ARRAYREF(&dispparams.rgvarg[i]));
+            }
+            VariantClear(&dispparams.rgvarg[i]);
+        }
         delete[] dispparams.rgvarg;
     }
     delete[] ArgHelpers;