comtypes 1.4.8__zip → 1.4.10__zip

{comtypes-1.4.8 → comtypes-1.4.10}/comtypes/typeinfo.py

@@ -3,21 +3,62 @@
 # generated by 'xml2py'
 # flags '..\tools\windows.xml -m comtypes -m comtypes.automation -w -r .*TypeLibEx -r .*TypeLib -o typeinfo.py'
 # then hacked manually
+import ctypes
 import sys
-from typing import Any, overload, TypeVar, TYPE_CHECKING
-from typing import List, Type, Tuple
-from typing import Optional, Union as _UnionT
-from typing import Callable, Sequence
 import weakref
-
-import ctypes
-from ctypes import HRESULT, POINTER, _Pointer, byref, c_int, c_void_p, c_wchar_p
-from ctypes.wintypes import DWORD, LONG, UINT, ULONG, WCHAR, WORD
-from comtypes import BSTR, _CData, COMMETHOD, GUID, IID, IUnknown, STDMETHOD
-from comtypes.automation import DISPID, LCID, SCODE
-from comtypes.automation import DISPPARAMS, EXCEPINFO, VARIANT, VARIANTARG, VARTYPE
+from ctypes import (
+    HRESULT,
+    POINTER,
+    OleDLL,
+    WinDLL,
+    byref,
+    c_int,
+    c_void_p,
+    c_wchar_p,
+    create_unicode_buffer,
+)
+from ctypes.wintypes import (
+    DWORD,
+    HMODULE,
+    INT,
+    LONG,
+    LPWSTR,
+    SHORT,
+    UINT,
+    ULONG,
+    USHORT,
+    WCHAR,
+    WORD,
+)
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    List,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    TypeVar,
+    overload,
+)
+from typing import Union as _UnionT
+
+from comtypes import BSTR, COMMETHOD, GUID, IID, STDMETHOD, IUnknown, _CData
+from comtypes.automation import (
+    DISPID,
+    DISPPARAMS,
+    EXCEPINFO,
+    LCID,
+    SCODE,
+    VARIANT,
+    VARIANTARG,
+    VARTYPE,
+)
 
 if TYPE_CHECKING:
+    from ctypes import _Pointer
+
     from comtypes import hints  # type: ignore
 
 
@@ -28,16 +69,14 @@ is_64_bit = sys.maxsize > 2**32
 
 BOOL = c_int
 HREFTYPE = DWORD
-INT = c_int
 MEMBERID = DISPID
 OLECHAR = WCHAR
 PVOID = c_void_p
-SHORT = ctypes.c_short
 # See https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx#ULONG_PTR  # noqa
 ULONG_PTR = ctypes.c_uint64 if is_64_bit else ctypes.c_ulong
 
-USHORT = ctypes.c_ushort
 LPOLESTR = POINTER(OLECHAR)
+LPCOLESTR = c_wchar_p
 
 ################################################################
 # enums
@@ -241,8 +280,6 @@ class ITypeLib(IUnknown):
         Returns the name with capitalization found in the type
         library, or None.
         """
-        from ctypes import create_unicode_buffer
-
         namebuf = create_unicode_buffer(name)
         found = BOOL()
         self.__com_IsName(namebuf, lHashVal, byref(found))  # type: ignore
@@ -571,13 +608,65 @@ IRecordInfo._methods_ = [
 
 ################################################################
 # functions
-_oleaut32 = ctypes.oledll.oleaut32
+_oleaut32 = OleDLL("oleaut32")
+
+_GetRecordInfoFromTypeInfo = _oleaut32.GetRecordInfoFromTypeInfo
+_GetRecordInfoFromTypeInfo.argtypes = [
+    POINTER(ITypeInfo),
+    POINTER(POINTER(IRecordInfo)),
+]
+_GetRecordInfoFromTypeInfo.restype = HRESULT
+
+_GetRecordInfoFromGuids = _oleaut32.GetRecordInfoFromGuids
+_GetRecordInfoFromGuids.argtypes = [
+    POINTER(GUID),
+    ULONG,
+    ULONG,
+    LCID,
+    POINTER(GUID),
+    POINTER(POINTER(IRecordInfo)),
+]
+_GetRecordInfoFromGuids.restype = HRESULT
+
+_LoadRegTypeLib = _oleaut32.LoadRegTypeLib
+_LoadRegTypeLib.argtypes = [POINTER(GUID), WORD, WORD, LCID, POINTER(POINTER(ITypeLib))]
+_LoadRegTypeLib.restype = HRESULT
+
+_LoadTypeLibEx = _oleaut32.LoadTypeLibEx
+_LoadTypeLibEx.argtypes = [LPCOLESTR, REGKIND, POINTER(POINTER(ITypeLib))]
+_LoadTypeLibEx.restype = HRESULT
+
+_LoadTypeLib = _oleaut32.LoadTypeLib
+_LoadTypeLib.argtypes = [LPCOLESTR, POINTER(POINTER(ITypeLib))]
+_LoadTypeLib.restype = HRESULT
+
+_UnRegisterTypeLib = _oleaut32.UnRegisterTypeLib
+_UnRegisterTypeLib.argtypes = [POINTER(GUID), WORD, WORD, LCID, SYSKIND]
+_UnRegisterTypeLib.restype = HRESULT
+
+_RegisterTypeLib = _oleaut32.RegisterTypeLib
+_RegisterTypeLib.argtypes = [POINTER(ITypeLib), LPCOLESTR, LPCOLESTR]
+_RegisterTypeLib.restype = HRESULT
+
+_CreateTypeLib2 = _oleaut32.CreateTypeLib2
+_CreateTypeLib2.argtypes = [SYSKIND, LPCOLESTR, POINTER(POINTER(ICreateTypeLib2))]
+_CreateTypeLib2.restype = HRESULT
+
+_QueryPathOfRegTypeLib = _oleaut32.QueryPathOfRegTypeLib
+_QueryPathOfRegTypeLib.argtypes = [POINTER(GUID), USHORT, USHORT, LCID, POINTER(BSTR)]
+_QueryPathOfRegTypeLib.restype = HRESULT
+
+_kernel32 = WinDLL("kernel32")
+
+_GetModuleFileNameW = _kernel32.GetModuleFileNameW
+_GetModuleFileNameW.argtypes = [HMODULE, LPWSTR, DWORD]
+_GetModuleFileNameW.restype = DWORD
 
 
 def GetRecordInfoFromTypeInfo(tinfo: ITypeInfo) -> IRecordInfo:
     """Return an IRecordInfo pointer to the UDT described in tinfo"""
     ri = POINTER(IRecordInfo)()
-    _oleaut32.GetRecordInfoFromTypeInfo(tinfo, byref(ri))
+    _GetRecordInfoFromTypeInfo(tinfo, byref(ri))
     return ri  # type: ignore
 
 
@@ -585,7 +674,7 @@ def GetRecordInfoFromGuids(
     rGuidTypeLib: str, verMajor: int, verMinor: int, lcid: int, rGuidTypeInfo: str
 ) -> IRecordInfo:
     ri = POINTER(IRecordInfo)()
-    _oleaut32.GetRecordInfoFromGuids(
+    _GetRecordInfoFromGuids(
         byref(GUID(rGuidTypeLib)),
         verMajor,
         verMinor,
@@ -601,70 +690,89 @@ def LoadRegTypeLib(
 ) -> ITypeLib:
     """Load a registered type library"""
     tlib = POINTER(ITypeLib)()
-    _oleaut32.LoadRegTypeLib(
-        byref(GUID(guid)), wMajorVerNum, wMinorVerNum, lcid, byref(tlib)
-    )
+    _LoadRegTypeLib(byref(GUID(guid)), wMajorVerNum, wMinorVerNum, lcid, byref(tlib))
     return tlib  # type: ignore
 
 
-if hasattr(_oleaut32, "LoadTypeLibEx"):
-
-    def LoadTypeLibEx(szFile: str, regkind: int = REGKIND_NONE) -> ITypeLib:
-        """Load, and optionally register a type library file"""
-        ptl = POINTER(ITypeLib)()
-        _oleaut32.LoadTypeLibEx(c_wchar_p(szFile), regkind, byref(ptl))
-        return ptl  # type: ignore
-
-else:
-
-    def LoadTypeLibEx(szFile: str, regkind: int = REGKIND_NONE) -> ITypeLib:
-        """Load, and optionally register a type library file"""
-        ptl = POINTER(ITypeLib)()
-        _oleaut32.LoadTypeLib(c_wchar_p(szFile), byref(ptl))
-        return ptl  # type: ignore
+def LoadTypeLibEx(szFile: str, regkind: int = REGKIND_NONE) -> ITypeLib:
+    """Load, and optionally register a type library file"""
+    ptl = POINTER(ITypeLib)()
+    _LoadTypeLibEx(c_wchar_p(szFile), regkind, byref(ptl))
+    return ptl  # type: ignore
 
 
 def LoadTypeLib(szFile: str) -> ITypeLib:
     """Load and register a type library file"""
     tlib = POINTER(ITypeLib)()
-    _oleaut32.LoadTypeLib(c_wchar_p(szFile), byref(tlib))
+    _LoadTypeLib(c_wchar_p(szFile), byref(tlib))
     return tlib  # type: ignore
 
 
 def UnRegisterTypeLib(
-    libID: str, wVerMajor: int, wVerMinor: int, lcid: int = 0, syskind: int = SYS_WIN32
+    libID: str,
+    wVerMajor: int,
+    wVerMinor: int,
+    lcid: int = 0,
+    syskind: int = (SYS_WIN64 if is_64_bit else SYS_WIN32),
 ) -> int:
     """Unregister a registered type library"""
-    return _oleaut32.UnRegisterTypeLib(
-        byref(GUID(libID)), wVerMajor, wVerMinor, lcid, syskind
-    )
+    return _UnRegisterTypeLib(byref(GUID(libID)), wVerMajor, wVerMinor, lcid, syskind)
 
 
 def RegisterTypeLib(
     tlib: ITypeLib, fullpath: str, helpdir: Optional[str] = None
 ) -> int:
     """Register a type library in the registry"""
-    return _oleaut32.RegisterTypeLib(tlib, c_wchar_p(fullpath), c_wchar_p(helpdir))
+    return _RegisterTypeLib(tlib, c_wchar_p(fullpath), c_wchar_p(helpdir))
 
 
 def CreateTypeLib(filename: str, syskind: int = SYS_WIN32) -> ICreateTypeLib2:
     """Return a ICreateTypeLib2 pointer"""
     ctlib = POINTER(ICreateTypeLib2)()
-    _oleaut32.CreateTypeLib2(syskind, c_wchar_p(filename), byref(ctlib))
+    _CreateTypeLib2(syskind, c_wchar_p(filename), byref(ctlib))
     return ctlib  # type: ignore
 
 
 def QueryPathOfRegTypeLib(
     libid: str, wVerMajor: int, wVerMinor: int, lcid: int = 0
 ) -> str:
-    """Return the path of a registered type library"""
+    """
+    Retrieve the path of a registered type library.
+
+    This function interacts with the Windows registry to locate the path of a
+    registered type library given its GUID, version, and locale.
+
+    Args:
+        libid (str): The GUID of the type library as a string.
+        wVerMajor (int): The major version of the type library.
+        wVerMinor (int): The minor version of the type library.
+        lcid (int, optional): The locale ID of the type library.
+
+    Returns:
+        str: The path of the registered type library.
+
+    Raises:
+        OSError: If QueryPathOfRegTypeLib fails.
+    """
+
     pathname = BSTR()
-    _oleaut32.QueryPathOfRegTypeLib(
+    _QueryPathOfRegTypeLib(
         byref(GUID(libid)), wVerMajor, wVerMinor, lcid, byref(pathname)
     )
     return pathname.value.split("\0")[0]
 
 
+def GetModuleFileName(handle: Optional[int], maxsize: int) -> str:
+    """Returns the fullpath of the loaded module specified by the handle.
+    If the handle is NULL, returns the executable file path of the current process.
+
+    https://learn.microsoft.com/ja-jp/windows/win32/api/libloaderapi/nf-libloaderapi-loadlibraryw
+    """
+    buf = create_unicode_buffer(maxsize)
+    length = _GetModuleFileNameW(handle, buf, maxsize)
+    return buf.value[:length]
+
+
 ################################################################
 # Structures
 
@@ -680,13 +788,7 @@ class tagTLIBATTR(ctypes.Structure):
         wLibFlags: int
 
     def __repr__(self):
-        return "TLIBATTR(GUID=%s, Version=%s.%s, LCID=%s, FLags=0x%x)" % (
-            self.guid,
-            self.wMajorVerNum,
-            self.wMinorVerNum,
-            self.lcid,
-            self.wLibFlags,
-        )
+        return f"TLIBATTR(GUID={self.guid}, Version={self.wMajorVerNum}.{self.wMinorVerNum}, LCID={self.lcid}, FLags=0x{self.wLibFlags:x})"
 
 
 TLIBATTR = tagTLIBATTR
@@ -715,13 +817,7 @@ class tagTYPEATTR(ctypes.Structure):
         idldescType: "IDLDESC"
 
     def __repr__(self):
-        return "TYPEATTR(GUID=%s, typekind=%s, funcs=%s, vars=%s, impltypes=%s)" % (
-            self.guid,
-            self.typekind,
-            self.cFuncs,
-            self.cVars,
-            self.cImplTypes,
-        )
+        return f"TYPEATTR(GUID={self.guid}, typekind={self.typekind}, funcs={self.cFuncs}, vars={self.cVars}, impltypes={self.cImplTypes})"
 
 
 TYPEATTR = tagTYPEATTR
@@ -745,14 +841,14 @@ class tagFUNCDESC(ctypes.Structure):
 
     def __repr__(self):
         return (
-            "FUNCDESC("
+            f"FUNCDESC("
             f"memid={self.memid}, "
             f"cParams={self.cParams}, "
             f"cParamsOpt={self.cParamsOpt}, "
             f"callconv={self.callconv}, "
-            f"invkind={self.invkind,}, "
+            f"invkind={self.invkind}, "
             f"funckind={self.funckind}"
-            ")"
+            f")"
         )
 
 

{comtypes-1.4.8 → comtypes-1.4.10}/comtypes/viewobject.py

@@ -1,10 +1,8 @@
 # XXX need to find out what the share from comtypes.dataobject.
 from ctypes import *
-from ctypes.wintypes import _RECTL, SIZEL, HDC, tagRECT, tagPOINT
+from ctypes.wintypes import _RECTL, HDC, SIZEL, tagPOINT, tagRECT
 
-from comtypes import COMMETHOD
-from comtypes import GUID
-from comtypes import IUnknown
+from comtypes import COMMETHOD, GUID, IUnknown
 
 
 class tagPALETTEENTRY(Structure):
@@ -61,11 +59,7 @@ class tagExtentInfo(Structure):
 
     def __repr__(self):
         size = (self.sizelProposed.cx, self.sizelProposed.cy)
-        return "<ExtentInfo(mode=%s, size=%s) at %x>" % (
-            self.dwExtentMode,
-            size,
-            id(self),
-        )
+        return f"<ExtentInfo(mode={self.dwExtentMode}, size={size}) at {id(self):x}>"
 
 
 assert sizeof(tagExtentInfo) == 16, sizeof(tagExtentInfo)

{comtypes-1.4.8 → comtypes-1.4.10/comtypes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: comtypes
-Version: 1.4.8
+Version: 1.4.10
 Summary: Pure Python COM package
 Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
@@ -16,6 +16,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Dynamic: download-url
 
 # comtypes
 
@@ -99,4 +100,4 @@ However, if the script implementation does not use `comtypes.client.GetModule` o
 
 ## Documentation
 
-The documentation is currently hosted [here](https://pythonhosted.org/comtypes) on PythonHosted.
+The documentation is currently hosted [here](https://comtypes.readthedocs.io/) on ReadTheDocs.

{comtypes-1.4.8 → comtypes-1.4.10}/comtypes.egg-info/SOURCES.txt

@@ -8,13 +8,12 @@ setup.py
 comtypes/GUID.py
 comtypes/__init__.py
 comtypes/_comobject.py
-comtypes/_idl_stuff.py
 comtypes/_memberspec.py
 comtypes/_meta.py
 comtypes/_npsupport.py
-comtypes/_py_instance_method.py
 comtypes/_safearray.py
 comtypes/_tlib_version_checker.py
+comtypes/_vtbl.py
 comtypes/automation.py
 comtypes/clear_cache.py
 comtypes/connectionpoints.py
@@ -38,14 +37,19 @@ comtypes.egg-info/dependency_links.txt
 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/bstr.py
+comtypes/_post_coinit/instancemethod.py
 comtypes/_post_coinit/misc.py
 comtypes/_post_coinit/unknwn.py
 comtypes/client/__init__.py
+comtypes/client/_activeobj.py
 comtypes/client/_code_cache.py
 comtypes/client/_constants.py
+comtypes/client/_create.py
 comtypes/client/_events.py
 comtypes/client/_generate.py
+comtypes/client/_managing.py
 comtypes/client/dynamic.py
 comtypes/client/lazybind.py
 comtypes/server/__init__.py
@@ -81,6 +85,7 @@ comtypes/test/test_client.py
 comtypes/test/test_client_dynamic.py
 comtypes/test/test_client_regenerate_modules.py
 comtypes/test/test_collections.py
+comtypes/test/test_comobject.py
 comtypes/test/test_comserver.py
 comtypes/test/test_createwrappers.py
 comtypes/test/test_dict.py
@@ -102,12 +107,12 @@ comtypes/test/test_msscript.py
 comtypes/test/test_npsupport.py
 comtypes/test/test_outparam.py
 comtypes/test/test_persist.py
-comtypes/test/test_propputref.py
 comtypes/test/test_pump_events.py
 comtypes/test/test_recordinfo.py
 comtypes/test/test_safearray.py
 comtypes/test/test_sapi.py
 comtypes/test/test_server.py
+comtypes/test/test_server_register.py
 comtypes/test/test_shelllink.py
 comtypes/test/test_showevents.py
 comtypes/test/test_storage.py
@@ -117,6 +122,7 @@ comtypes/test/test_typeannotator.py
 comtypes/test/test_typeinfo.py
 comtypes/test/test_urlhistory.py
 comtypes/test/test_variant.py
+comtypes/test/test_w_getopt.py
 comtypes/test/test_win32com_interop.py
 comtypes/test/test_wmi.py
 comtypes/test/test_word.py
@@ -127,6 +133,8 @@ comtypes/tools/typedesc.py
 comtypes/tools/typedesc_base.py
 comtypes/tools/codegenerator/__init__.py
 comtypes/tools/codegenerator/codegenerator.py
+comtypes/tools/codegenerator/comments.py
+comtypes/tools/codegenerator/heads.py
 comtypes/tools/codegenerator/helpers.py
 comtypes/tools/codegenerator/modulenamer.py
 comtypes/tools/codegenerator/namespaces.py

{comtypes-1.4.8 → comtypes-1.4.10}/pyproject.toml

@@ -3,52 +3,45 @@ requires = ["setuptools>=61.2"]
 build-backend = "setuptools.build_meta"
 
 [tool.ruff.lint]
+extend-select = ["I"]
 ignore = ["E402"]
 
 [tool.ruff.lint.per-file-ignores]
 # production
-"comtypes/_comobject.py" = ["E713", "E722", "F401"]
 "comtypes/_npsupport.py" = ["F401"]
-"comtypes/connectionpoints.py" = ["F401", "F403", "F405"]
+"comtypes/_vtbl.py" = ["E722"]
 "comtypes/automation.py" = ["F401", "F403", "F405"]
+"comtypes/connectionpoints.py" = ["F401", "F403", "F405"]
 "comtypes/errorinfo.py" = ["F403", "F405"]
 "comtypes/git.py" = ["F401", "F403", "F405"]
-"comtypes/logutil.py" = ["E401"]
-"comtypes/shelllink.py" = ["F401"]
 "comtypes/util.py" = ["F403", "F405"]
 "comtypes/viewobject.py" = ["F403", "F405"]
-"comtypes/_post_coinit/unknwn.py" = ["F821"]
-"comtypes/client/__init__.py" = ["F401", "F403"]
 "comtypes/client/_code_cache.py" = ["E401", "E711"]
 "comtypes/client/_constants.py" = ["F401"]
 "comtypes/client/_events.py" = ["F841"]
-"comtypes/client/lazybind.py" = ["F821"]
-"comtypes/server/__init__.py" = ["E401"]
 "comtypes/server/automation.py" = ["F403", "F405"]
 "comtypes/server/connectionpoints.py" = ["F401", "F403", "F405"]
-"comtypes/server/inprocserver.py" = ["E713", "E722", "F403", "F405", "F841"]
-"comtypes/server/localserver.py" = ["F401", "F403", "F405"]
-"comtypes/server/register.py" = ["F403", "F405", "E713", "E731"]
-"comtypes/tools/codegenerator/codegenerator.py" = ["E713", "E721"]
-"comtypes/tools/codegenerator/helpers.py" = ["F401"]
+"comtypes/server/inprocserver.py" = ["E713", "E722", "F841"]
+"comtypes/server/register.py" = ["E713"]
 "comtypes/tools/codegenerator/packing.py" = ["F821", "F841"]
 "comtypes/tools/tlbparser.py" = ["F401"]
 "comtypes/tools/typedesc.py" = ["F403", "F405"]
 "comtypes/tools/typedesc_base.py" = ["F401"]
+# gen directory
+"comtypes/gen/*" = ["E", "F", "I"]
+# stub
+"comtypes/hints.pyi" = ["I"]
 # tests
-"comtypes/test/TestComServer.py" = ["E401", "F401", "F403", "F405"]
 "comtypes/test/TestDispServer.py" = ["E401"]
 "comtypes/test/find_memleak.py" = ["E401", "F401", "F403", "F405"]
 "comtypes/test/setup.py" = ["F401"]
-"comtypes/test/test_BSTR.py" = ["E401", "F401", "F403", "F405"]
 "comtypes/test/test_agilent.py" = ["F401", "F841"]
 "comtypes/test/test_client.py" = ["F401"]
 "comtypes/test/test_dict.py" = ["F841"]
-"comtypes/test/test_ie.py" = ["F403", "F405", "F841"]
-"comtypes/test/test_outparam.py" = ["F403", "F405", "F841"]
+"comtypes/test/test_ie.py" = ["F841"]
+"comtypes/test/test_outparam.py" = ["F841"]
 "comtypes/test/test_sapi.py" = ["E401"]
-"comtypes/test/test_server.py" = ["E401", "E722", "F401", "F841"]
+"comtypes/test/test_server.py" = ["F401", "F841"]
 "comtypes/test/test_subinterface.py" = ["E401", "F401", "F403", "F405"]
-"comtypes/test/test_typeinfo.py" = ["F401"]
 "comtypes/test/test_urlhistory.py" = ["E401", "F401", "F403", "F405", "F841"]
 "comtypes/test/test_variant.py" = ["F401", "F821", "F841"]