comtypes 1.4.11__zip → 1.4.12__zip

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/util.py

@@ -2,7 +2,33 @@
 and cast_field(struct, fieldname, fieldtype).
 """
 
-from ctypes import *
+from ctypes import (
+    POINTER,
+    Structure,
+    Union,
+    _SimpleCData,
+    addressof,
+    byref,
+    c_byte,
+    c_char,
+    c_double,
+    c_float,
+    c_int,
+    c_long,
+    c_longlong,
+    c_short,
+    c_void_p,
+    cast,
+    sizeof,
+)
+from ctypes import Array as _CArrayType
+from typing import TYPE_CHECKING, Type, TypeVar, overload
+
+if TYPE_CHECKING:
+    from ctypes import _CArgObject, _CData
+
+_T = TypeVar("_T")
+_CT = TypeVar("_CT", bound="_CData")
 
 
 def _calc_offset():
@@ -49,7 +75,7 @@ def _calc_offset():
 
     argobj = PyCArgObject.from_address(id(ref))
 
-    if argobj.obj != id(obj) or argobj.p != addressof(obj) or argobj.tag != "P":
+    if argobj.obj != id(obj) or argobj.p != addressof(obj) or argobj.tag != b"P":
         raise RuntimeError("PyCArgObject field definitions incorrect")
 
     return PyCArgObject.p.offset  # offset of the pointer field
@@ -59,6 +85,10 @@ def _calc_offset():
 #
 # byref_at
 #
+@overload
+def byref_at(obj: _CArrayType, offset: int) -> "_CArgObject": ...
+@overload
+def byref_at(obj: "_CData", offset: int) -> "_CArgObject": ...
 def byref_at(
     obj,
     offset,
@@ -84,16 +114,18 @@ def byref_at(
 #
 # cast_field
 #
+@overload
+def cast_field(
+    struct: Structure, fieldname: str, fieldtype: Type["_SimpleCData[_T]"]
+) -> _T: ...
+@overload
+def cast_field(struct: Structure, fieldname: str, fieldtype: Type[_CT]) -> _CT: ...
 def cast_field(
     struct,
     fieldname,
     fieldtype,
-    offset=0,
     _POINTER=POINTER,
     _byref_at=byref_at,
-    _byref=byref,
-    _divmod=divmod,
-    _sizeof=sizeof,
 ):
     """cast_field(struct, fieldname, fieldtype)
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/viewobject.py

@@ -1,9 +1,22 @@
 # XXX need to find out what the share from comtypes.dataobject.
-from ctypes import *
+from ctypes import (
+    HRESULT,
+    POINTER,
+    Structure,
+    alignment,
+    c_int,
+    c_ubyte,
+    c_ulong,
+    c_ushort,
+    c_void_p,
+    sizeof,
+)
 from ctypes.wintypes import _RECTL, HDC, SIZEL, tagPOINT, tagRECT
 
 from comtypes import COMMETHOD, GUID, IUnknown
 
+X64_PYTHON = sizeof(POINTER(c_int)) * 8 == 64
+
 
 class tagPALETTEENTRY(Structure):
     _fields_ = [
@@ -27,7 +40,10 @@ class tagLOGPALETTE(Structure):
     ]
 
 
-assert sizeof(tagLOGPALETTE) == 8, sizeof(tagLOGPALETTE)
+if X64_PYTHON:
+    assert sizeof(tagLOGPALETTE) == 12, sizeof(tagLOGPALETTE)
+else:
+    assert sizeof(tagLOGPALETTE) == 8, sizeof(tagLOGPALETTE)
 assert alignment(tagLOGPALETTE) == 2, alignment(tagLOGPALETTE)
 
 
@@ -42,8 +58,12 @@ class tagDVTARGETDEVICE(Structure):
     ]
 
 
-assert sizeof(tagDVTARGETDEVICE) == 16, sizeof(tagDVTARGETDEVICE)
-assert alignment(tagDVTARGETDEVICE) == 4, alignment(tagDVTARGETDEVICE)
+if X64_PYTHON:
+    assert sizeof(tagDVTARGETDEVICE) == 24, sizeof(tagDVTARGETDEVICE)
+    assert alignment(tagDVTARGETDEVICE) == 8, alignment(tagDVTARGETDEVICE)
+else:
+    assert sizeof(tagDVTARGETDEVICE) == 16, sizeof(tagDVTARGETDEVICE)
+    assert alignment(tagDVTARGETDEVICE) == 4, alignment(tagDVTARGETDEVICE)
 
 
 class tagExtentInfo(Structure):
@@ -55,7 +75,7 @@ class tagExtentInfo(Structure):
 
     def __init__(self, *args, **kw):
         self.cb = sizeof(self)
-        super(tagExtentInfo, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
 
     def __repr__(self):
         size = (self.sizelProposed.cx, self.sizelProposed.cy)
@@ -64,6 +84,10 @@ class tagExtentInfo(Structure):
 
 assert sizeof(tagExtentInfo) == 16, sizeof(tagExtentInfo)
 assert alignment(tagExtentInfo) == 4, alignment(tagExtentInfo)
+
+PALETTEENTRY = tagPALETTEENTRY
+LOGPALETTE = tagLOGPALETTE
+DVTARGETDEVICE = tagDVTARGETDEVICE
 DVEXTENTINFO = tagExtentInfo
 
 IAdviseSink = IUnknown  # fake the interface

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comtypes
-Version: 1.4.11
+Version: 1.4.12
 Summary: Pure Python COM package
 Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
@@ -25,7 +25,7 @@ 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-1.4.11 → comtypes-1.4.12}/comtypes.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ comtypes.egg-info/entry_points.txt
 comtypes.egg-info/top_level.txt
 comtypes/_post_coinit/__init__.py
 comtypes/_post_coinit/_cominterface_meta_patcher.py
+comtypes/_post_coinit/activeobj.py
 comtypes/_post_coinit/bstr.py
 comtypes/_post_coinit/instancemethod.py
 comtypes/_post_coinit/misc.py
@@ -103,6 +104,7 @@ comtypes/test/test_ienum.py
 comtypes/test/test_imfattributes.py
 comtypes/test/test_inout_args.py
 comtypes/test/test_jscript.js
+comtypes/test/test_messageloop.py
 comtypes/test/test_midl_safearray_create.py
 comtypes/test/test_monikers.py
 comtypes/test/test_msscript.py
@@ -123,7 +125,9 @@ comtypes/test/test_subinterface.py
 comtypes/test/test_typeannotator.py
 comtypes/test/test_typeinfo.py
 comtypes/test/test_urlhistory.py
+comtypes/test/test_util.py
 comtypes/test/test_variant.py
+comtypes/test/test_viewobject.py
 comtypes/test/test_w_getopt.py
 comtypes/test/test_win32com_interop.py
 comtypes/test/test_wmi.py

{comtypes-1.4.11 → comtypes-1.4.12}/pyproject.toml

@@ -12,7 +12,6 @@ ignore = ["E402"]
 "comtypes/_vtbl.py" = ["E722"]
 "comtypes/automation.py" = ["F401", "F403", "F405"]
 "comtypes/git.py" = ["F401", "F403", "F405"]
-"comtypes/util.py" = ["F403", "F405"]
 "comtypes/viewobject.py" = ["F403", "F405"]
 "comtypes/client/_constants.py" = ["F401"]
 "comtypes/server/automation.py" = ["F403", "F405"]
@@ -40,3 +39,15 @@ ignore = ["E402"]
 "comtypes/test/test_subinterface.py" = ["E401", "F401", "F403", "F405"]
 "comtypes/test/test_urlhistory.py" = ["E401", "F401", "F403", "F405", "F841"]
 "comtypes/test/test_variant.py" = ["F401", "F821", "F841"]
+
+[tool.coverage.run]
+# Specify the source directory to avoid tracking temporary files created by "test_client_regenerate_modules.py".
+# Without this, coverage track these temporary files, leading to error when trying to generate a report.
+source = ["comtypes"]
+omit = ["comtypes/gen/*"]
+
+[tool.coverage.report]
+exclude_also = [
+    "if __name__ == .__main__.:",
+    "if TYPE_CHECKING:",
+]

comtypes-1.4.11/comtypes/test/test_persist.py

@@ -1,38 +0,0 @@
-import tempfile
-import unittest as ut
-from pathlib import Path
-
-from comtypes import GUID, CoCreateInstance, IPersist, persist
-
-CLSID_ShellLink = GUID("{00021401-0000-0000-C000-000000000046}")
-
-
-class Test_IPersist(ut.TestCase):
-    def test_GetClassID(self):
-        p = CoCreateInstance(CLSID_ShellLink).QueryInterface(IPersist)
-        self.assertEqual(p.GetClassID(), CLSID_ShellLink)
-
-
-class Test_IPersistFile(ut.TestCase):
-    def setUp(self):
-        td = tempfile.TemporaryDirectory()
-        self.addCleanup(td.cleanup)
-        self.tmp_dir = Path(td.name)
-
-    def _create_pf(self) -> persist.IPersistFile:
-        return CoCreateInstance(CLSID_ShellLink).QueryInterface(persist.IPersistFile)
-
-    def test_load(self):
-        pf = self._create_pf()
-        tgt_file = (self.tmp_dir / "tgt.txt").resolve()
-        tgt_file.touch()
-        pf.Load(str(tgt_file), persist.STGM_DIRECT)
-        self.assertEqual(pf.GetCurFile(), str(tgt_file))
-
-    def test_save(self):
-        pf = self._create_pf()
-        tgt_file = self.tmp_dir / "tgt.txt"
-        self.assertFalse(tgt_file.exists())
-        pf.Save(str(tgt_file), True)
-        self.assertEqual(pf.GetCurFile(), str(tgt_file))
-        self.assertTrue(tgt_file.exists())