comtypes 1.4.14__tar.gz → 1.4.16__tar.gz

{comtypes-1.4.14 → comtypes-1.4.16}/CHANGES.txt

@@ -1,6 +1,49 @@
 Comtypes CHANGELOG
 ==================
 
+Release 1.4.16
+--------------
+* Decompose ``IStorage`` tests and enhance coverage. By @junkmd.
+* Enhance tests verifying custom ``COMObject``s raise errors. By @junkmd.
+* Refactor ``shelllink.py`` for ``ITEMIDLIST`` structure. By @junkmd.
+* Fix a code path in ``logutil.NTDebugHandler``. By @junkmd.
+* Add a deprecation decorator to ``logutil.setup_logging``. By @junkmd.
+* Add tests for connection point interfaces. By @junkmd.
+* Add tests for ``IGlobalInterfaceTable`` marshaling. By @junkmd.
+* Remove outdated Python 2.3 compatibility. By @junkmd.
+* Remove unused test utilities. By @junkmd.
+* Extract time utility test helpers. By @junkmd.
+* Add ``CreateTypeLib`` and ``ICreateTypeInfo`` tests. By @junkmd.
+* Add tests for ``VARIANTEnumerator``. By @junkmd.
+* Enhance tests for moniker, bind context and running object table. By @junkmd.
+* Introduce GDI test helper module and tests for ``IViewObject.Draw``. By @junkmd.
+* Unify COM descriptor release logic in ``ITypeComp.Bind``. By @junkmd.
+* Enhance dynamic dispatch and ``client`` testing. By @junkmd.
+
+Release 1.4.15
+--------------
+* Fix ``TYPE_E_ELEMENTNOTFOUND`` HRESULT constant value. By @junkmd.
+* Enhance ``ITypeInfo`` testing in ``test_typeinfo.py``. By @junkmd.
+* Improve type hints for for generated dispmethods and properties. By @junkmd.
+* Enhance tests for generated type hints. By @junkmd.
+* Remove Internet Explorer dependency from ``test_QueryService.py`` and ``test_casesensitivity.py``. By @junkmd.
+* Rename ``test_ie.py`` to ``test_eventinterface.py``. By @junkmd.
+* Fix ``SyntaxError`` in ``DispMethodAnnotator`` signature generation. By @junkmd.
+* Rename ``test_msi.py`` to ``test_puredispatch.py``. By @junkmd.
+* Rename ``test_wmi.py`` to ``test_variant_outparam.py``. By @junkmd.
+* Replace the module-level skip with individual ``@skip`` decorators on the test methods in ``test_eventinterface.py``. By @junkmd.
+* Add tests for ``stdole.IPicture`` creation through ``IStream``. By @junkmd.
+* Improve enum testing in ``test_client.py``. By @junkmd.
+* Revive and enhance ``test_outparam``. By @junkmd.
+* Enhance ``test_stream``. By @junkmd.
+* Enhance ``test_storage``. By @junkmd.
+* Add ``malloc`` module. By @junkmd.
+* Enhance and refactor COM moniker tests. By @junkmd.
+* Refine type hints and enhance tests for ``client.GetClassObject``, ``CoGetClassObject`` and ``IClassFactory``. By @junkmd.
+* Implement ``ITypeInfo.AddressOfMember`` with tests and clarifications. By @junkmd.
+* Enhance ``ITypeComp.Bind`` tests and type hints. By @junkmd.
+* Introduce warnings for Python 3.15 enum compatibility. By @junkmd.
+
 Release 1.4.14
 --------------
 * Replace ``setup.py`` with ``pyproject.toml``. By @moi15moi.

{comtypes-1.4.14/comtypes.egg-info → comtypes-1.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comtypes
-Version: 1.4.14
+Version: 1.4.16
 Summary: Pure Python COM package
 Author-email: Thomas Heller <theller@python.net>
 License-Expression: MIT
@@ -32,6 +32,12 @@ Dynamic: license-file
 `comtypes` allows you to define, call, and implement custom and dispatch-based COM interfaces in pure Python.
 
 `comtypes` requires Windows and Python 3.9 or later.
+
+- **Note about Python 3.15 and `enum` behavior**  
+  Starting with Python 3.15, the internal handling of `IntFlag`(`Flag`) values is planned to change:  
+  **Negative `IntFlag` members will be reinterpreted by masking them to the defined positive bit domain, instead of keeping their original negative literal values**.  
+  This can affect enumeration types generated by `comtypes` from COM type libraries. Action is needed to maintain literal evaluation.  
+  For details and ongoing discussion, see: [GH-894](https://github.com/enthought/comtypes/issues/894).
 - 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.

{comtypes-1.4.14 → comtypes-1.4.16}/README.md

@@ -12,6 +12,12 @@
 `comtypes` allows you to define, call, and implement custom and dispatch-based COM interfaces in pure Python.
 
 `comtypes` requires Windows and Python 3.9 or later.
+
+- **Note about Python 3.15 and `enum` behavior**  
+  Starting with Python 3.15, the internal handling of `IntFlag`(`Flag`) values is planned to change:  
+  **Negative `IntFlag` members will be reinterpreted by masking them to the defined positive bit domain, instead of keeping their original negative literal values**.  
+  This can affect enumeration types generated by `comtypes` from COM type libraries. Action is needed to maintain literal evaluation.  
+  For details and ongoing discussion, see: [GH-894](https://github.com/enthought/comtypes/issues/894).
 - 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.

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/__init__.py

@@ -1,5 +1,5 @@
 # comtypes version numbers follow semver (http://semver.org/) and PEP 440
-__version__ = "1.4.14"
+__version__ = "1.4.16"
 
 try:
     from _ctypes import COMError  # noqa
@@ -18,6 +18,22 @@ import atexit
 import logging
 import sys
 
+if sys.version_info >= (3, 15):
+    import warnings
+
+    _PYVER = f"{sys.version_info.major}.{sys.version_info.minor}"
+    warnings.warn(
+        (
+            f"You are running 'comtypes' on Python {_PYVER}, where the behavior of "
+            "enum types (such as IntFlag) may differ from Python <= 3.14.\n"
+            f"It is recommended to use a version compatible with Python {_PYVER}.\n"
+            "See: https://github.com/enthought/comtypes/issues/894"
+        ),
+        FutureWarning,
+        stacklevel=2,
+    )
+
+
 # HACK: Workaround for projects that depend on this package
 # There should be several projects around the world that depend on this package
 # and indirectly reference the symbols of `ctypes` from `comtypes`.

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/_post_coinit/misc.py

@@ -142,26 +142,26 @@ def CoCreateInstance(
     return p  # type: ignore
 
 
-if TYPE_CHECKING:
-
-    @overload
-    def CoGetClassObject(
-        clsid: GUID,
-        clsctx: Optional[int] = None,
-        pServerInfo: "Optional[COSERVERINFO]" = None,
-        interface: None = None,
-    ) -> hints.IClassFactory: ...
-    @overload
-    def CoGetClassObject(
-        clsid: GUID,
-        clsctx: Optional[int] = None,
-        pServerInfo: "Optional[COSERVERINFO]" = None,
-        interface: type[_T_IUnknown] = hints.IClassFactory,
-    ) -> _T_IUnknown: ...
-
-
-def CoGetClassObject(clsid, clsctx=None, pServerInfo=None, interface=None):
-    # type: (GUID, Optional[int], Optional[COSERVERINFO], Optional[Type[IUnknown]]) -> IUnknown
+@overload
+def CoGetClassObject(
+    clsid: GUID,
+    clsctx: Optional[int] = None,
+    pServerInfo: "Optional[COSERVERINFO]" = None,
+    interface: None = None,
+) -> "hints.IClassFactory": ...
+@overload
+def CoGetClassObject(
+    clsid: GUID,
+    clsctx: Optional[int] = None,
+    pServerInfo: "Optional[COSERVERINFO]" = None,
+    interface: type[_T_IUnknown] = IUnknown,
+) -> _T_IUnknown: ...
+def CoGetClassObject(
+    clsid: GUID,
+    clsctx: Optional[int] = None,
+    pServerInfo: "Optional[COSERVERINFO]" = None,
+    interface: Optional[type[IUnknown]] = None,
+) -> IUnknown:
     if clsctx is None:
         clsctx = CLSCTX_SERVER
     if interface is None:

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/client/_create.py

@@ -19,26 +19,26 @@ logger = logging.getLogger(__name__)
 #
 # Object creation
 #
-if TYPE_CHECKING:
-
-    @overload
-    def GetClassObject(
-        progid: _UnionT[str, type[CoClass], GUID],
-        clsctx: Optional[int] = None,
-        pServerInfo: Optional[COSERVERINFO] = None,
-        interface: None = None,
-    ) -> hints.IClassFactory: ...
-    @overload
-    def GetClassObject(
-        progid: _UnionT[str, type[CoClass], GUID],
-        clsctx: Optional[int] = None,
-        pServerInfo: Optional[COSERVERINFO] = None,
-        interface: type[_T_IUnknown] = hints.IClassFactory,
-    ) -> _T_IUnknown: ...
-
-
-def GetClassObject(progid, clsctx=None, pServerInfo=None, interface=None):
-    # type: (_UnionT[str, type[CoClass], GUID], Optional[int], Optional[COSERVERINFO], Optional[type[IUnknown]]) -> IUnknown
+@overload
+def GetClassObject(
+    progid: _UnionT[str, type[CoClass], GUID],
+    clsctx: Optional[int] = None,
+    pServerInfo: Optional[COSERVERINFO] = None,
+    interface: None = None,
+) -> "hints.IClassFactory": ...
+@overload
+def GetClassObject(
+    progid: _UnionT[str, type[CoClass], GUID],
+    clsctx: Optional[int] = None,
+    pServerInfo: Optional[COSERVERINFO] = None,
+    interface: type[_T_IUnknown] = IUnknown,
+) -> _T_IUnknown: ...
+def GetClassObject(
+    progid: _UnionT[str, type[CoClass], GUID],
+    clsctx: Optional[int] = None,
+    pServerInfo: Optional[COSERVERINFO] = None,
+    interface: Optional[type[IUnknown]] = None,
+) -> IUnknown:
     """Create and return the class factory for a COM object.
 
     'clsctx' specifies how to create the object, use the CLSCTX_... constants.

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/client/lazybind.py

@@ -159,11 +159,7 @@ class Dispatch:
             def caller(*args):
                 return self._comobj._invoke(descr.memid, descr.invkind, 0, *args)
 
-            try:
-                caller.__name__ = name
-            except TypeError:
-                # In Python 2.3, __name__ is readonly
-                pass
+            caller.__name__ = name
             return caller
 
     def __setattr__(self, name, value):

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/hints.pyi

@@ -105,31 +105,35 @@ class _GetSetNormalProperty(Generic[_T_Inst, _R_Get, _T_SetVal]):
     fset: Callable[[_T_Inst, _T_SetVal], Any]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
-    def __get__(self, instance: _T_Inst, owner: Optional[type[_T_Inst]]) -> _R_Get: ...
-    def __set__(self, instance: _T_Inst, value: _T_SetVal) -> None: ...
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
+    ) -> _R_Get: ...
+    def __set__(self, instance: _T_Inst, value: _T_SetVal, /) -> None: ...
 
 class _GetOnlyNormalProperty(Generic[_T_Inst, _R_Get]):
     fget: Callable[[_T_Inst], Any]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
-    def __get__(self, instance: _T_Inst, owner: Optional[type[_T_Inst]]) -> _R_Get: ...
-    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
+    ) -> _R_Get: ...
+    def __set__(self, instance: _T_Inst, value: Any, /) -> NoReturn: ...
 
 class _SetOnlyNormalProperty(Generic[_T_Inst, _T_SetVal]):
     fget: Callable[[_T_Inst], Any]
     fset: Callable[[_T_Inst, _T_SetVal], Any]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
     def __get__(
-        self, instance: _T_Inst, owner: Optional[type[_T_Inst]]
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
     ) -> NoReturn: ...
-    def __set__(self, instance: _T_Inst, value: _T_SetVal) -> None: ...
+    def __set__(self, instance: _T_Inst, value: _T_SetVal, /) -> None: ...
 
 @overload
 def normal_property(
@@ -149,9 +153,9 @@ class _GetSetBoundNamedProperty(Generic[_T_Inst, _P_Get, _R_Get, _P_Set]):
     fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
     fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
     __doc__: Optional[str]
-    def __getitem__(self, index: Any) -> _R_Get: ...
+    def __getitem__(self, index: Any, /) -> _R_Get: ...
     def __call__(self, *args: _P_Get.args, **kwargs: _P_Get.kwargs) -> _R_Get: ...
-    def __setitem__(self, index: Any, value: Any) -> None: ...
+    def __setitem__(self, index: Any, value: Any, /) -> None: ...
     def __iter__(self) -> NoReturn: ...
 
 class _GetSetNamedProperty(Generic[_T_Inst, _P_Get, _R_Get, _P_Set]):
@@ -161,20 +165,20 @@ class _GetSetNamedProperty(Generic[_T_Inst, _P_Get, _R_Get, _P_Set]):
     __doc__: Optional[str]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
     def __get__(
-        self, instance: _T_Inst, owner: Optional[type[_T_Inst]]
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
     ) -> _GetSetBoundNamedProperty[_T_Inst, _P_Get, _R_Get, _P_Set]: ...
-    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+    def __set__(self, instance: _T_Inst, value: Any, /) -> NoReturn: ...
 
 class _GetOnlyBoundNamedProperty(Generic[_T_Inst, _P_Get, _R_Get]):
     name: str
     fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
     __doc__: Optional[str]
-    def __getitem__(self, index: Any) -> _R_Get: ...
+    def __getitem__(self, index: Any, /) -> _R_Get: ...
     def __call__(self, *args: _P_Get.args, **kwargs: _P_Get.kwargs) -> _R_Get: ...
-    def __setitem__(self, index: Any, value: Any) -> NoReturn: ...
+    def __setitem__(self, index: Any, value: Any, /) -> NoReturn: ...
     def __iter__(self) -> NoReturn: ...
 
 class _GetOnlyNamedProperty(Generic[_T_Inst, _P_Get, _R_Get]):
@@ -183,20 +187,20 @@ class _GetOnlyNamedProperty(Generic[_T_Inst, _P_Get, _R_Get]):
     __doc__: Optional[str]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
     def __get__(
-        self, instance: _T_Inst, owner: Optional[type[_T_Inst]]
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
     ) -> _GetOnlyBoundNamedProperty[_T_Inst, _P_Get, _R_Get]: ...
-    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+    def __set__(self, instance: _T_Inst, value: Any, /) -> NoReturn: ...
 
 class _SetOnlyBoundNamedProperty(Generic[_T_Inst, _P_Set]):
     name: str
     fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
     __doc__: Optional[str]
-    def __getitem__(self, index: Any) -> NoReturn: ...
+    def __getitem__(self, index: Any, /) -> NoReturn: ...
     def __call__(self, *args: Any, **kwargs: Any) -> NoReturn: ...
-    def __setitem__(self, index: Any, value: Any) -> None: ...
+    def __setitem__(self, index: Any, value: Any, /) -> None: ...
     def __iter__(self) -> NoReturn: ...
 
 class _SetOnlyNamedProperty(Generic[_T_Inst, _P_Set]):
@@ -205,12 +209,12 @@ class _SetOnlyNamedProperty(Generic[_T_Inst, _P_Set]):
     __doc__: Optional[str]
 
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
     def __get__(
-        self, instance: _T_Inst, owner: Optional[type[_T_Inst]]
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
     ) -> _SetOnlyBoundNamedProperty[_T_Inst, _P_Set]: ...
-    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+    def __set__(self, instance: _T_Inst, value: Any, /) -> NoReturn: ...
 
 @overload
 def named_property(
@@ -231,9 +235,11 @@ def named_property(
 
 class _Descriptor(Protocol[_T_Inst, _R_Get]):
     @overload
-    def __get__(self, instance: None, owner: type[_T_Inst]) -> Self: ...
+    def __get__(self, instance: None, owner: type[_T_Inst], /) -> Self: ...
     @overload
-    def __get__(self, instance: _T_Inst, owner: Optional[type[_T_Inst]]) -> _R_Get: ...
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[type[_T_Inst]], /
+    ) -> _R_Get: ...
 
 # `__len__` for objects with `Count`
 @overload

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/hresult.py

@@ -27,7 +27,7 @@ CONNECT_E_CANNOTCONNECT = -2147220990
 CONNECT_E_ADVISELIMIT = -2147220991
 CONNECT_E_NOCONNECTION = -2147220992
 
-TYPE_E_ELEMENTNOTFOUND = -2147352077  # 0x8002802BL
+TYPE_E_ELEMENTNOTFOUND = -2147319765  # 0x8002802B
 
 TYPE_E_REGISTRYACCESS = -2147319780  # 0x8002801CL
 TYPE_E_CANTLOADLIBRARY = -2147312566  # 0x80029C4AL

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/logutil.py

@@ -1,5 +1,7 @@
 # logutil.py
+import functools
 import logging
+import warnings
 from ctypes import WinDLL
 from ctypes.wintypes import LPCSTR, LPCWSTR
 
@@ -18,19 +20,28 @@ class NTDebugHandler(logging.Handler):
     def emit(
         self,
         record,
-        writeA=_OutputDebugStringA,
         writeW=_OutputDebugStringW,
     ):
         text = self.format(record)
-        if isinstance(text, str):
-            writeA(text + "\n")
-        else:
-            writeW(text + "\n")
+        writeW(text + "\n")
 
 
 logging.NTDebugHandler = NTDebugHandler
 
 
+def deprecated(reason: str):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            warnings.warn(reason, category=DeprecationWarning, stacklevel=2)
+            return func(*args, **kwargs)
+
+        return wrapper
+
+    return decorator
+
+
+@deprecated("Deprecated. See https://github.com/enthought/comtypes/issues/920.")
 def setup_logging(*pathnames):
     import configparser
 

comtypes-1.4.16/comtypes/malloc.py

@@ -0,0 +1,53 @@
+from ctypes import HRESULT, POINTER, OleDLL, WinDLL, byref, c_int, c_ulong, c_void_p
+from ctypes import c_size_t as SIZE_T
+from ctypes.wintypes import DWORD, LPVOID
+from typing import TYPE_CHECKING, Any, Optional
+
+from comtypes import COMMETHOD, GUID, IUnknown
+from comtypes.GUID import _CoTaskMemFree as _CoTaskMemFree
+
+
+class IMalloc(IUnknown):
+    _iid_ = GUID("{00000002-0000-0000-C000-000000000046}")
+    _methods_ = [
+        COMMETHOD([], c_void_p, "Alloc", ([], c_ulong, "cb")),
+        COMMETHOD([], c_void_p, "Realloc", ([], c_void_p, "pv"), ([], c_ulong, "cb")),
+        COMMETHOD([], None, "Free", ([], c_void_p, "py")),
+        COMMETHOD([], c_ulong, "GetSize", ([], c_void_p, "pv")),
+        COMMETHOD([], c_int, "DidAlloc", ([], c_void_p, "pv")),
+        COMMETHOD([], None, "HeapMinimize"),  # 25
+    ]
+    if TYPE_CHECKING:
+
+        def Alloc(self, cb: int) -> Optional[int]: ...
+        def Realloc(self, pv: Any, cb: int) -> Optional[int]: ...
+        def Free(self, py: Any) -> None: ...
+        def GetSize(self, pv: Any) -> int: ...
+        def DidAlloc(self, pv: Any) -> int: ...
+        def HeapMinimize(self) -> None: ...
+
+
+_ole32 = OleDLL("ole32")
+
+_CoGetMalloc = _ole32.CoGetMalloc
+_CoGetMalloc.argtypes = [DWORD, POINTER(POINTER(IMalloc))]
+_CoGetMalloc.restype = HRESULT
+
+_ole32_nohresult = WinDLL("ole32")
+
+_CoTaskMemAlloc = _ole32_nohresult.CoTaskMemAlloc
+_CoTaskMemAlloc.argtypes = [SIZE_T]
+_CoTaskMemAlloc.restype = LPVOID
+
+
+def CoGetMalloc(dwMemContext: int = 1) -> IMalloc:
+    """Retrieves a pointer to the default OLE task memory allocator.
+
+    https://learn.microsoft.com/en-us/windows/win32/api/combaseapi/nf-combaseapi-cogetmalloc
+    """
+    malloc = POINTER(IMalloc)()
+    _CoGetMalloc(
+        dwMemContext,  # This parameter must be 1.
+        byref(malloc),
+    )
+    return malloc  # type: ignore

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/server/__init__.py

@@ -1,6 +1,6 @@
 import ctypes
 from ctypes import HRESULT, POINTER, byref
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, overload
 
 import comtypes
 import comtypes.client
@@ -15,6 +15,9 @@ if TYPE_CHECKING:
     from comtypes import hints  # type: ignore
 
 
+_T_IUnknown = TypeVar("_T_IUnknown", bound=IUnknown)
+
+
 ################################################################
 # Interfaces
 class IClassFactory(IUnknown):
@@ -28,9 +31,23 @@ class IClassFactory(IUnknown):
         STDMETHOD(HRESULT, "LockServer", [ctypes.c_int]),
     ]
 
+    @overload
+    def CreateInstance(
+        self,
+        punkouter: Optional["_Pointer[IUnknown]"] = None,
+        interface: type[_T_IUnknown] = IUnknown,
+        dynamic: Literal[False] = False,
+    ) -> _T_IUnknown: ...
+    @overload
+    def CreateInstance(
+        self,
+        punkouter: Optional["_Pointer[IUnknown]"] = None,
+        interface: None = None,
+        dynamic: Literal[True] = True,
+    ) -> Any: ...
     def CreateInstance(
         self,
-        punkouter: Optional[type["_Pointer[IUnknown]"]] = None,
+        punkouter: Optional["_Pointer[IUnknown]"] = None,
         interface: Optional[type[IUnknown]] = None,
         dynamic: bool = False,
     ) -> Any:

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/shelllink.py

@@ -1,5 +1,6 @@
 from ctypes import (
     POINTER,
+    Structure,
     byref,
     c_char_p,
     c_int,
@@ -8,12 +9,21 @@ from ctypes import (
     create_string_buffer,
     create_unicode_buffer,
 )
-from ctypes.wintypes import DWORD, MAX_PATH, WIN32_FIND_DATAA, WIN32_FIND_DATAW
+from ctypes.wintypes import (
+    BYTE,
+    DWORD,
+    MAX_PATH,
+    USHORT,
+    WIN32_FIND_DATAA,
+    WIN32_FIND_DATAW,
+)
 from typing import TYPE_CHECKING, Literal
 
 from comtypes import COMMETHOD, GUID, HRESULT, CoClass, IUnknown
 
 if TYPE_CHECKING:
+    from ctypes import _Pointer
+
     from comtypes import hints  # type: ignore
 
 
@@ -42,8 +52,15 @@ HOTKEYF_CONTROL = 0x02
 HOTKEYF_EXT = 0x08
 HOTKEYF_SHIFT = 0x01
 
-# fake these...
-ITEMIDLIST = c_int
+
+class SHITEMID(Structure):
+    _fields_ = [("cb", USHORT), ("abID", BYTE * 1)]
+
+
+class ITEMIDLIST(Structure):
+    _fields_ = [("mkid", SHITEMID)]
+
+
 LPITEMIDLIST = LPCITEMIDLIST = POINTER(ITEMIDLIST)
 
 
@@ -134,8 +151,8 @@ class IShellLinkA(IUnknown):
 
     if TYPE_CHECKING:
 
-        def GetIDList(self) -> hints.Incomplete: ...
-        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...
+        def GetIDList(self) -> _Pointer[ITEMIDLIST]: ...
+        def SetIDList(self, pidl: _Pointer[ITEMIDLIST]) -> hints.Hresult: ...
         def SetDescription(self, pszName: bytes) -> hints.Incomplete: ...
         def SetWorkingDirectory(self, pszDir: bytes) -> hints.Hresult: ...
         def SetArguments(self, pszArgs: bytes) -> hints.Hresult: ...
@@ -269,8 +286,8 @@ class IShellLinkW(IUnknown):
 
     if TYPE_CHECKING:
 
-        def GetIDList(self) -> hints.Incomplete: ...
-        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...
+        def GetIDList(self) -> _Pointer[ITEMIDLIST]: ...
+        def SetIDList(self, pidl: _Pointer[ITEMIDLIST]) -> hints.Hresult: ...
         def SetDescription(self, pszName: str) -> hints.Incomplete: ...
         def SetWorkingDirectory(self, pszDir: str) -> hints.Hresult: ...
         def SetArguments(self, pszArgs: str) -> hints.Hresult: ...

{comtypes-1.4.14 → comtypes-1.4.16}/comtypes/test/__init__.py

@@ -37,37 +37,9 @@ class ResourceDenied(Exception):
     """
 
 
-def is_resource_enabled(resource):
-    """Test whether a resource is enabled.
-
-    If the caller's module is __main__ then automatically return True."""
-    if sys._getframe().f_back.f_globals.get("__name__") == "__main__":
-        return True
-    result = use_resources is not None and (
-        resource in use_resources or "*" in use_resources
-    )
-    if not result:
-        _unavail[resource] = None
-    return result
-
-
 _unavail = {}
 
 
-def requires(resource, msg=None):
-    """Raise ResourceDenied if the specified resource is not available.
-
-    If the caller's module is __main__ then automatically return True."""
-    # see if the caller's module is __main__ - if so, treat as if
-    # the resource was set
-    if sys._getframe().f_back.f_globals.get("__name__") == "__main__":
-        return
-    if not is_resource_enabled(resource):
-        if msg is None:
-            msg = f"Use of the `{resource}` resource not enabled"
-        raise ResourceDenied(msg)
-
-
 def find_package_modules(package, mask):
     import fnmatch