comtypes 1.4.11__zip → 1.4.13__zip

{comtypes-1.4.11 → comtypes-1.4.13}/CHANGES.txt

@@ -1,6 +1,39 @@
 Comtypes CHANGELOG
 ==================
 
+Release 1.4.13
+--------------
+* Remove Python 3.8 and add Python 3.14 to the CI pipelines. By @junkmd.
+* Declare the minimum Python version as 3.9. By @junkmd. By @junkmd.
+* Update ``PyCArgObject.value`` for Python 3.14 compatibility. By @junkmd.
+* Add version bridges for the ``__pointer_type__`` attribute protocol. By @junkmd.
+
+Release 1.4.12
+--------------
+* Add support for coverage. By @moi15moi.
+* CI/CD Improvements for runners and the codecov badge. By @junkmd.
+* Add signed 32-bit hexadecimal converters. By @junkmd.
+* Add ``Test_Stat`` to ``test_stream``. By @junkmd.
+* Add client-side ``RegisterActiveObject``. By @junkmd.
+* Remove useless ``object`` inheritance from every class. By @moi15moi.
+* Modernize ``super()`` calls by removing explicit class and instance arguments. By @moi15moi.
+* Eliminate outdated encoding boilerplates. By @moi15moi.
+* Update byte string creation to use ``b""`` instead of ``str.encode("utf-8")``. By @moi15moi.
+* Introduce ``codecov.yml``. By @moi15moi.
+* Migrate exception catches from older aliases to ``OSError``. By @moi15moi.
+* Remove obsolete Python 2 compatibility code in ``test_variant``. By @junkmd.
+* Skip ``test_eval`` in INPROC server tests due to instability. By @junkmd.
+* Adjust structure sizes and alignments for 64-bit Python in ``viewobject.py``. By @junkmd.
+* Add ``test_viewobject``. By @junkmd.
+* Ensure ``test_npsupport`` passes with ``numpy>=2.0.0`` by explicitly setting ``dtype=numpy.int32``. By @junkmd.
+* Add tests for ``DictPropertyBag`` and type hints for ``IPropertyBag``. By @junkmd.
+* Fix ``numpy`` interoperability and enable ``datetime64`` tests. By @junkmd.
+* Revive and correct integer handling logic for ``VARIANT``s when setting values. By @junkmd.
+* Add tests for ``messageloop``. By @junkmd.
+* Revive ``util`` and add comprehensive tests. By @junkmd.
+* Refactor and enhance ``util`` with explicit imports and typing. By @junkmd.
+* Modernize ``npsupport`` by removing the patch for the ``np._typecodes``. By @junkmd.
+
 Release 1.4.11
 --------------
 * Improve ``PARAMFLAG_...`` and ``DISPATCH_...`` constants definitions and imports. By @junkmd.

{comtypes-1.4.11/comtypes.egg-info → comtypes-1.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comtypes
-Version: 1.4.11
+Version: 1.4.13
 Summary: Pure Python COM package
 Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
@@ -13,7 +13,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Dynamic: download-url
@@ -25,18 +25,18 @@ Dynamic: license-file
 [![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Python Requires](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Fcomtypes%2Fjson&query=info.requires_python&label=Python Requires)](https://pypi.org/project/comtypes/)  
 [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/comtypes)](https://pypi.org/project/comtypes/)  
 [![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)  
-[![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme)
+[![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme) [![Coverage](https://img.shields.io/codecov/c/github/enthought/comtypes)](https://app.codecov.io/github/enthought/comtypes)  
 
 
 `comtypes` is a lightweight pure Python [COM](https://learn.microsoft.com/en-us/windows/win32/com/component-object-model--com--portal) package based on the [`ctypes`](https://docs.python.org/library/ctypes.html) foreign function interface library.
 
 `comtypes` allows you to define, call, and implement custom and dispatch-based COM interfaces in pure Python.
 
-`comtypes` requires Windows and Python 3.8 or later.
+`comtypes` requires Windows and Python 3.9 or later.
+- Version [1.4.12](https://pypi.org/project/comtypes/1.4.12/) is the last version to support Python 3.8.
 - Version <= [1.4.7](https://pypi.org/project/comtypes/1.4.7/) does not work with Python 3.13 as reported in [GH-618](https://github.com/enthought/comtypes/issues/618). Version [1.4.8](https://pypi.org/project/comtypes/1.4.8/) can work with Python 3.13.
 - Version [1.4.6](https://pypi.org/project/comtypes/1.4.6/) is the last version to support Python 3.7.
 - Version [1.2.1](https://pypi.org/project/comtypes/1.2.1/) is the last version to support Python 2.7 and 3.3–3.6.
-- `comtypes` does not work with Python 3.8.1 as reported in [GH-202](https://github.com/enthought/comtypes/issues/202). This bug has been fixed in Python >= 3.8.2.
 - Certain `comtypes` functions may not work correctly in Python 3.8 and 3.9 as reported in [GH-212](https://github.com/enthought/comtypes/issues/212). This bug has been fixed in Python >= 3.10.10 and >= 3.11.2.
 
 ## Installation

{comtypes-1.4.11 → comtypes-1.4.13}/README.md

@@ -4,18 +4,18 @@
 [![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Python Requires](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Fcomtypes%2Fjson&query=info.requires_python&label=Python Requires)](https://pypi.org/project/comtypes/)  
 [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/comtypes)](https://pypi.org/project/comtypes/)  
 [![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)  
-[![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme)
+[![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme) [![Coverage](https://img.shields.io/codecov/c/github/enthought/comtypes)](https://app.codecov.io/github/enthought/comtypes)  
 
 
 `comtypes` is a lightweight pure Python [COM](https://learn.microsoft.com/en-us/windows/win32/com/component-object-model--com--portal) package based on the [`ctypes`](https://docs.python.org/library/ctypes.html) foreign function interface library.
 
 `comtypes` allows you to define, call, and implement custom and dispatch-based COM interfaces in pure Python.
 
-`comtypes` requires Windows and Python 3.8 or later.
+`comtypes` requires Windows and Python 3.9 or later.
+- Version [1.4.12](https://pypi.org/project/comtypes/1.4.12/) is the last version to support Python 3.8.
 - Version <= [1.4.7](https://pypi.org/project/comtypes/1.4.7/) does not work with Python 3.13 as reported in [GH-618](https://github.com/enthought/comtypes/issues/618). Version [1.4.8](https://pypi.org/project/comtypes/1.4.8/) can work with Python 3.13.
 - Version [1.4.6](https://pypi.org/project/comtypes/1.4.6/) is the last version to support Python 3.7.
 - Version [1.2.1](https://pypi.org/project/comtypes/1.2.1/) is the last version to support Python 2.7 and 3.3–3.6.
-- `comtypes` does not work with Python 3.8.1 as reported in [GH-202](https://github.com/enthought/comtypes/issues/202). This bug has been fixed in Python >= 3.8.2.
 - Certain `comtypes` functions may not work correctly in Python 3.8 and 3.9 as reported in [GH-212](https://github.com/enthought/comtypes/issues/212). This bug has been fixed in Python >= 3.10.10 and >= 3.11.2.
 
 ## Installation

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/__init__.py

@@ -1,5 +1,5 @@
 # comtypes version numbers follow semver (http://semver.org/) and PEP 440
-__version__ = "1.4.11"
+__version__ = "1.4.13"
 
 try:
     from _ctypes import COMError  # noqa
@@ -213,12 +213,18 @@ from comtypes._post_coinit.misc import IPersist, IServiceProvider  # noqa
 
 
 from comtypes._post_coinit.instancemethod import instancemethod  # noqa
+from comtypes._post_coinit.activeobj import (  # noqa
+    ACTIVEOBJECT_STRONG,
+    ACTIVEOBJECT_WEAK,
+    GetActiveObject,
+    RegisterActiveObject,
+    RevokeActiveObject,
+)
 from comtypes._post_coinit.misc import (  # noqa
     _is_object,
     CoGetObject,
     CoCreateInstance,
     CoGetClassObject,
-    GetActiveObject,
     MULTI_QI,
     _COAUTHIDENTITY,
     COAUTHIDENTITY,

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_comobject.py

@@ -144,7 +144,7 @@ _PostQuitMessage.argtypes = [INT]
 _PostQuitMessage.restype = None
 
 
-class LocalServer(object):
+class LocalServer:
     _queue: Optional[queue.Queue] = None
 
     def run(self, classobjects: Sequence["hints.localserver.ClassFactory"]) -> None:
@@ -186,7 +186,7 @@ class LocalServer(object):
                 _PostQuitMessage(0)
 
 
-class InprocServer(object):
+class InprocServer:
     def __init__(self) -> None:
         self.locks = c_long(0)
 
@@ -207,7 +207,7 @@ class InprocServer(object):
 _T_IUnknown = TypeVar("_T_IUnknown", bound=IUnknown)
 
 
-class COMObject(object):
+class COMObject:
     _com_interfaces_: ClassVar[List[Type[IUnknown]]]
     _outgoing_interfaces_: ClassVar[List[Type["hints.IDispatch"]]]
     _instances_: ClassVar[Dict["COMObject", None]] = {}
@@ -218,7 +218,7 @@ class COMObject(object):
     _dispimpl_: Dict[Tuple[comtypes.dispid, int], Callable[..., Any]]
 
     def __new__(cls, *args: Any, **kw: Any) -> "hints.Self":
-        self = super(COMObject, cls).__new__(cls)
+        self = super().__new__(cls)
         if isinstance(self, c_void_p):
             # We build the VTables only for direct instances of
             # CoClass, not for POINTERs to CoClass.
@@ -414,7 +414,7 @@ class COMObject(object):
         try:
             self.__typelib
         except AttributeError:
-            raise WindowsError(hresult.E_NOTIMPL)
+            raise OSError(hresult.E_NOTIMPL)
         return self.__typelib.GetTypeInfoOfGuid(self._reg_clsid_)
 
     ################################################################
@@ -422,7 +422,7 @@ class COMObject(object):
 
     def IProvideClassInfo2_GetGUID(self, dwGuidKind: int) -> GUID:
         if dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID:
-            raise WindowsError(hresult.E_INVALIDARG)
+            raise OSError(hresult.E_INVALIDARG)
         return self._outgoing_interfaces_[0]._iid_
 
     ################################################################

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_memberspec.py

@@ -162,7 +162,7 @@ class helpstring(str):
     "Specifies the helpstring for a COM method or property."
 
 
-class defaultvalue(object):
+class defaultvalue:
     "Specifies the default value for parameters marked optional."
 
     def __init__(self, value):
@@ -353,7 +353,7 @@ _PropFunc = Optional[Callable[..., Any]]
 _DocType = Optional[str]
 
 
-class PropertyMapping(object):
+class PropertyMapping:
     def __init__(self):
         self._data: Dict[Tuple[str, _DocType, int], List[_PropFunc]] = {}
 
@@ -393,7 +393,7 @@ class PropertyMapping(object):
             yield (name, doc, nargs, fget, fset)
 
 
-class PropertyGenerator(object):
+class PropertyGenerator:
     def __init__(self, cls_name: str) -> None:
         self._mapping = PropertyMapping()
         self._cls_name = cls_name
@@ -471,7 +471,7 @@ class DispPropertyGenerator(PropertyGenerator):
         return m.name, None, len(m.argspec) - 1
 
 
-class ComMemberGenerator(object):
+class ComMemberGenerator:
     def __init__(self, cls_name: str, vtbl_offset: int, iid: "comtypes.GUID") -> None:
         self._vtbl_offset = vtbl_offset
         self._iid = iid
@@ -516,7 +516,7 @@ class ComMemberGenerator(object):
         return iter(self._props)
 
 
-class DispMemberGenerator(object):
+class DispMemberGenerator:
     def __init__(self, cls_name: str) -> None:
         self._props = DispPropertyGenerator(cls_name)
         # sequence of (name: str, func_or_prop: Callable | property, is_prop: bool)
@@ -606,7 +606,7 @@ class DispMemberGenerator(object):
 # Should they be implemented in C for speed?
 
 
-class bound_named_property(object):
+class bound_named_property:
     def __init__(self, name, fget, fset, instance):
         self.name = name
         self.instance = instance
@@ -647,7 +647,7 @@ class bound_named_property(object):
         raise TypeError(msg)
 
 
-class named_property(object):
+class named_property:
     def __init__(self, name, fget=None, fset=None, doc=None):
         self.name = name
         self.fget = fget

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_meta.py

@@ -1,4 +1,5 @@
 # comtypes._meta helper module
+import sys
 from ctypes import POINTER, c_void_p, cast
 
 import comtypes
@@ -74,7 +75,7 @@ class _coclass_meta(type):
             # Depending on a version or revision of Python, this may be essential.
             return self
 
-        PTR = _coclass_pointer_meta(
+        p = _coclass_pointer_meta(
             f"POINTER({self.__name__})",
             (self, c_void_p),
             {
@@ -82,9 +83,12 @@ class _coclass_meta(type):
                 "from_param": classmethod(_coclass_from_param),
             },
         )
-        from ctypes import _pointer_type_cache  # type: ignore
+        if sys.version_info >= (3, 14):
+            self.__pointer_type__ = p
+        else:
+            from ctypes import _pointer_type_cache  # type: ignore
 
-        _pointer_type_cache[self] = PTR
+            _pointer_type_cache[self] = p
 
         return self
 

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_npsupport.py

@@ -92,27 +92,21 @@ class Interop:
 
         return self.numpy.dtype(tagVARIANT_format)
 
-    def _check_ctypeslib_typecodes(self):
+    def _build_typecodes(self):
         if not self.enabled:
             return {}
         import numpy as np
-        from numpy import ctypeslib
+        from numpy.ctypeslib import as_ctypes_type
 
-        try:
-            from numpy.ctypeslib import _typecodes
-        except ImportError:
-            from numpy.ctypeslib import as_ctypes_type
+        dtypes_to_ctypes = {}
 
-            dtypes_to_ctypes = {}
-
-            for tp in set(np.sctypeDict.values()):
-                try:
-                    ctype_for = as_ctypes_type(tp)
-                    dtypes_to_ctypes[np.dtype(tp).str] = ctype_for
-                except NotImplementedError:
-                    continue
-            ctypeslib._typecodes = dtypes_to_ctypes
-        return ctypeslib._typecodes
+        for tp in set(np.sctypeDict.values()):
+            try:
+                ctype_for = as_ctypes_type(tp)
+                dtypes_to_ctypes[np.dtype(tp).str] = ctype_for
+            except NotImplementedError:
+                continue
+        return dtypes_to_ctypes
 
     def isndarray(self, value):
         """Check if a value is an ndarray.
@@ -168,7 +162,8 @@ class Interop:
         # if that succeeded we can be enabled
         self.enabled = True
         self.VARIANT_dtype = self._make_variant_dtype()
-        self.typecodes = self._check_ctypeslib_typecodes()
+        self.typecodes = self._build_typecodes()
+        self.datetime64 = self.numpy.datetime64
         self.com_null_date64 = self.numpy.datetime64("1899-12-30T00:00:00", "ns")
 
 

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_post_coinit/_cominterface_meta_patcher.py

@@ -9,7 +9,7 @@ _all_slice = slice(None, None, None)
 
 def case_insensitive(p: Type) -> None:
     @patcher.Patch(p)
-    class CaseInsensitive(object):
+    class CaseInsensitive:
         # case insensitive attributes for COM methods and properties
         def __getattr__(self, name):
             """Implement case insensitive access to methods and properties"""
@@ -34,7 +34,7 @@ def case_insensitive(p: Type) -> None:
 
 def reference_fix(pp: Type) -> None:
     @patcher.Patch(pp)
-    class ReferenceFix(object):
+    class ReferenceFix:
         def __setitem__(self, index, value):
             # We override the __setitem__ method of the
             # POINTER(POINTER(interface)) type, so that the COM
@@ -64,7 +64,7 @@ def reference_fix(pp: Type) -> None:
 
 def sized(itf: Type) -> None:
     @patcher.Patch(itf)
-    class _(object):
+    class _:
         def __len__(self):
             "Return the the 'self.Count' property."
             return self.Count
@@ -72,7 +72,7 @@ def sized(itf: Type) -> None:
 
 def callable_and_subscriptable(itf: Type) -> None:
     @patcher.Patch(itf)
-    class _(object):
+    class _:
         # 'Item' is the 'default' value.  Make it available by
         # calling the instance (Not sure this makes sense, but
         # win32com does this also).
@@ -125,7 +125,7 @@ def callable_and_subscriptable(itf: Type) -> None:
 
 def iterator(itf: Type) -> None:
     @patcher.Patch(itf)
-    class _(object):
+    class _:
         def __iter__(self):
             "Return an iterator over the _NewEnum collection."
             # This method returns a pointer to _some_ _NewEnum interface.

comtypes-1.4.13/comtypes/_post_coinit/activeobj.py

@@ -0,0 +1,61 @@
+from ctypes import HRESULT, POINTER, OleDLL, byref, c_ulong, c_void_p
+from ctypes.wintypes import DWORD, LPVOID
+from typing import TYPE_CHECKING, Optional, Type, TypeVar, overload
+from typing import Union as _UnionT
+
+from comtypes import GUID
+from comtypes._post_coinit.unknwn import IUnknown
+from comtypes.GUID import REFCLSID
+
+if TYPE_CHECKING:
+    from comtypes import hints  # type: ignore
+
+
+_T_IUnknown = TypeVar("_T_IUnknown", bound=IUnknown)
+
+ACTIVEOBJECT_STRONG = 0x0
+ACTIVEOBJECT_WEAK = 0x1
+
+
+def RegisterActiveObject(
+    punk: "_UnionT[IUnknown, hints.LP_LP_Vtbl]", clsid: GUID, flags: int
+) -> int:
+    """Registers a pointer as the active object for its class and returns the handle."""
+    handle = c_ulong()
+    _RegisterActiveObject(punk, byref(clsid), flags, byref(handle))
+    return handle.value
+
+
+def RevokeActiveObject(handle: int) -> None:
+    """Ends a pointer's status as active."""
+    _RevokeActiveObject(handle, None)
+
+
+@overload
+def GetActiveObject(clsid: GUID, interface: None = None) -> IUnknown: ...
+@overload
+def GetActiveObject(clsid: GUID, interface: Type[_T_IUnknown]) -> _T_IUnknown: ...
+def GetActiveObject(
+    clsid: GUID, interface: Optional[Type[IUnknown]] = None
+) -> IUnknown:
+    """Retrieves a pointer to a running object"""
+    p = POINTER(IUnknown)()
+    _GetActiveObject(byref(clsid), None, byref(p))
+    if interface is not None:
+        p = p.QueryInterface(interface)  # type: ignore
+    return p  # type: ignore
+
+
+_oleaut32 = OleDLL("oleaut32")
+
+_RegisterActiveObject = _oleaut32.RegisterActiveObject
+_RegisterActiveObject.argtypes = [c_void_p, REFCLSID, DWORD, POINTER(DWORD)]
+_RegisterActiveObject.restype = HRESULT
+
+_RevokeActiveObject = _oleaut32.RevokeActiveObject
+_RevokeActiveObject.argtypes = [DWORD, LPVOID]
+_RevokeActiveObject.restype = HRESULT
+
+_GetActiveObject = _oleaut32.GetActiveObject
+_GetActiveObject.argtypes = [REFCLSID, LPVOID, POINTER(POINTER(IUnknown))]
+_GetActiveObject.restype = HRESULT

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_post_coinit/misc.py

@@ -17,6 +17,7 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, Type, TypeVar, overlo
 from comtypes import CLSCTX_LOCAL_SERVER, CLSCTX_REMOTE_SERVER, CLSCTX_SERVER, GUID
 from comtypes._memberspec import COMMETHOD
 from comtypes._post_coinit.unknwn import IUnknown
+from comtypes.GUID import REFCLSID
 
 if TYPE_CHECKING:
     from ctypes import _Pointer
@@ -171,21 +172,6 @@ def CoGetClassObject(clsid, clsctx=None, pServerInfo=None, interface=None):
     return p  # type: ignore
 
 
-@overload
-def GetActiveObject(clsid: GUID, interface: None = None) -> IUnknown: ...
-@overload
-def GetActiveObject(clsid: GUID, interface: Type[_T_IUnknown]) -> _T_IUnknown: ...
-def GetActiveObject(
-    clsid: GUID, interface: Optional[Type[IUnknown]] = None
-) -> IUnknown:
-    """Retrieves a pointer to a running object"""
-    p = POINTER(IUnknown)()
-    _GetActiveObject(byref(clsid), None, byref(p))
-    if interface is not None:
-        p = p.QueryInterface(interface)  # type: ignore
-    return p  # type: ignore
-
-
 class MULTI_QI(Structure):
     _fields_ = [("pIID", POINTER(GUID)), ("pItf", POINTER(c_void_p)), ("hr", HRESULT)]
     if TYPE_CHECKING:
@@ -238,14 +224,6 @@ class _COSERVERINFO(Structure):
         dwReserved2: int
 
 
-_oleaut32 = OleDLL("oleaut32")
-
-REFCLSID = POINTER(GUID)
-_GetActiveObject = _oleaut32.GetActiveObject
-_GetActiveObject.argtypes = [REFCLSID, LPVOID, POINTER(POINTER(IUnknown))]
-_GetActiveObject.restype = HRESULT
-
-
 _ole32 = OleDLL("ole32")
 
 COSERVERINFO = _COSERVERINFO

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_post_coinit/unknwn.py

@@ -1,6 +1,7 @@
 # https://learn.microsoft.com/en-us/windows/win32/api/unknwn/
 
 import logging
+import sys
 from ctypes import HRESULT, POINTER, byref, c_ulong, c_void_p
 from typing import TYPE_CHECKING, Any, ClassVar, List, Optional, Type, TypeVar
 
@@ -33,7 +34,7 @@ def _shutdown(
     else:
         try:
             func()
-        except WindowsError:
+        except OSError:
             pass
     # Set the flag which means that calling obj.Release() is no longer
     # needed.
@@ -126,9 +127,12 @@ class _cominterface_meta(type):
             {"__com_interface__": self, "_needs_com_addref_": None},
         )
 
-        from ctypes import _pointer_type_cache  # type: ignore
+        if sys.version_info >= (3, 14):
+            self.__pointer_type__ = p
+        else:
+            from ctypes import _pointer_type_cache  # type: ignore
 
-        _pointer_type_cache[self] = p
+            _pointer_type_cache[self] = p
 
         if self._case_insensitive_:
             _meta_patch.case_insensitive(p)
@@ -287,14 +291,12 @@ class _compointer_base(c_void_p, metaclass=_compointer_meta):
         if not isinstance(other, _compointer_base):
             return False
         # get the value property of the c_void_p baseclass, this is the pointer value
-        return (
-            super(_compointer_base, self).value == super(_compointer_base, other).value
-        )
+        return super().value == super(_compointer_base, other).value
 
     def __hash__(self) -> int:
         """Return the hash value of the pointer."""
         # hash the pointer values
-        return hash(super(_compointer_base, self).value)
+        return hash(super().value)
 
     # redefine the .value property; return the object itself.
     def __get_value(self) -> "hints.Self":
@@ -303,7 +305,7 @@ class _compointer_base(c_void_p, metaclass=_compointer_meta):
     value = property(__get_value, doc="""Return self.""")
 
     def __repr__(self) -> str:
-        ptr = super(_compointer_base, self).value
+        ptr = super().value
         return f"<{self.__class__.__name__} ptr=0x{ptr or 0:x} at {id(self):x}>"
 
     # This fixes the problem when there are multiple python interface types

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/_vtbl.py

@@ -93,7 +93,7 @@ def catch_errors(
         except comtypes.ReturnHRESULT as err:
             (hr, text) = err.args
             return ReportError(text, iid=interface._iid_, clsid=clsid, hresult=hr)
-        except (COMError, WindowsError) as details:
+        except (OSError, COMError) as details:
             _error(
                 "Exception in %s.%s implementation:",
                 interface.__name__,
@@ -201,7 +201,7 @@ def hack(
                 msg = f"{source}: {descr}"
             hr = HRESULT_FROM_WIN32(hr)
             return ReportError(msg, iid=interface._iid_, clsid=clsid, hresult=hr)
-        except WindowsError as details:
+        except OSError as details:
             _error(
                 "Exception in %s.%s implementation:",
                 interface.__name__,
@@ -228,7 +228,7 @@ def hack(
     return call_without_this
 
 
-class _MethodFinder(object):
+class _MethodFinder:
     def __init__(self, inst: "hints.COMObject") -> None:
         self.inst = inst
         # map lower case names to names with correct spelling.

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/automation.py

@@ -245,9 +245,6 @@ class tagVARIANT(Structure):
         elif isinstance(value, bool):
             self.vt = VT_BOOL
             self._.VT_BOOL = value
-        elif isinstance(value, (int, c_int)):
-            self.vt = VT_I4
-            self._.VT_I4 = value
         elif isinstance(value, int):
             u = self._
             # try VT_I4 first.
@@ -264,12 +261,11 @@ class tagVARIANT(Structure):
                     self.vt = VT_UI4
                     return
             # try VT_I8 next.
-            if value >= 0:
-                u.VT_I8 = value
-                if u.VT_I8 == value:
-                    # did work.
-                    self.vt = VT_I8
-                    return
+            u.VT_I8 = value
+            if u.VT_I8 == value:
+                # did work.
+                self.vt = VT_I8
+                return
             # try VT_UI8 next.
             if value >= 0:
                 u.VT_UI8 = value
@@ -277,9 +273,7 @@ class tagVARIANT(Structure):
                     # did work.
                     self.vt = VT_UI8
                     return
-            # VT_R8 is last resort.
-            self.vt = VT_R8
-            u.VT_R8 = float(value)
+            raise TypeError(f"Cannot put {value!r} in VARIANT")
         elif isinstance(value, (float, c_double)):
             self.vt = VT_R8
             self._.VT_R8 = value
@@ -364,6 +358,9 @@ class tagVARIANT(Structure):
         elif isinstance(value, c_uint):
             self.vt = VT_UI4
             self._.VT_UI4 = value
+        elif isinstance(value, c_int):
+            self.vt = VT_I4
+            self._.VT_I4 = value
         elif isinstance(value, c_float):
             self.vt = VT_R4
             self._.VT_R4 = value
@@ -608,7 +605,7 @@ del v
 
 
 @comtypes.patcher.Patch(POINTER(VARIANT))
-class _(object):
+class _:
     # Override the default .from_param classmethod of POINTER(VARIANT).
     # This allows to pass values which can be stored in VARIANTs as
     # function parameters declared as POINTER(VARIANT).  See

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/client/__init__.py

@@ -3,8 +3,9 @@
 import ctypes
 import logging
 
-from comtypes import automation
+from comtypes import RevokeActiveObject, automation  # noqa
 from comtypes.client import dynamic, lazybind  # noqa
+from comtypes.client._activeobj import RegisterActiveObject  # noqa
 from comtypes.client._code_cache import _find_gen_dir
 from comtypes.client._constants import Constants  # noqa
 from comtypes.client._events import GetEvents, PumpEvents, ShowEvents

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/client/_activeobj.py

@@ -44,3 +44,11 @@ def GetActiveObject(
     if dynamic:
         return comtypes.client.dynamic.Dispatch(obj)
     return _manage(obj, clsid, interface=interface)
+
+
+def RegisterActiveObject(
+    punk: IUnknown, progid: _UnionT[str, Type[CoClass], GUID], weak: bool = True
+) -> int:
+    clsid = GUID.from_progid(progid)
+    flags = comtypes.ACTIVEOBJECT_WEAK if weak else comtypes.ACTIVEOBJECT_STRONG
+    return comtypes.RegisterActiveObject(punk, clsid, flags)

{comtypes-1.4.11 → comtypes-1.4.13}/comtypes/client/_code_cache.py

@@ -115,7 +115,7 @@ def _create_comtypes_gen_package():
                 ofi = open(comtypes_init, "w")
                 ofi.write("# comtypes.gen package, directory for generated files.\n")
                 ofi.close()
-        except (OSError, IOError) as details:
+        except OSError as details:
             logger.info("Creating comtypes.gen package failed: %s", details)
             module = sys.modules["comtypes.gen"] = types.ModuleType("comtypes.gen")
             comtypes.gen = module