comtypes 1.4.11__zip → 1.4.12__zip

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/test/test_variant.py

@@ -115,33 +115,52 @@ class VariantTestCase(unittest.TestCase):
         self.assertEqual(result, values)
 
     def test_pythonobjects(self):
-        if sys.version_info >= (3, 0):
-            objects = [None, 42, 3.14, True, False, "abc", "abc", 7]
-        else:
-            objects = [None, 42, 3.14, True, False, "abc", "abc", 7]
+        objects = [None, 42, 3.14, True, False, "abc", "abc", 7]
         for x in objects:
-            v = VARIANT(x)
-            self.assertEqual(x, v.value)
+            with self.subTest(x=x):
+                v = VARIANT(x)
+                self.assertEqual(x, v.value)
 
     def test_integers(self):
         v = VARIANT()
 
-        int_type = int if sys.version_info >= (3, 0) else (int, long)
-
-        if hasattr(sys, "maxint"):
-            # this test doesn't work in Python 3000
-            v.value = sys.maxsize
-            self.assertEqual(v.value, sys.maxsize)
-            self.assertIsInstance(v.value, int_type)
-
-            v.value += 1
-            self.assertEqual(v.value, sys.maxsize + 1)
-            self.assertIsInstance(v.value, int_type)
-
         v.value = 1
 
         self.assertEqual(v.value, 1)
-        self.assertIsInstance(v.value, int_type)
+        self.assertIsInstance(v.value, int)
+
+    def test_vt_uix_range_boundaries(self):
+        MIN_VT_I4 = -(2**31)
+        MAX_VT_I4 = 2**31 - 1
+        MAX_VT_UI4 = 2**32 - 1
+        MIN_VT_I8 = -(2**63)
+        MAX_VT_I8 = 2**63 - 1
+        MAX_VT_UI8 = 2**64 - 1
+        for val, vt in [
+            (MIN_VT_I8, VT_I8),
+            (MIN_VT_I4 - 1, VT_I8),
+            (MIN_VT_I4, VT_I4),
+            (0, VT_I4),
+            (MAX_VT_I4, VT_I4),
+            (MAX_VT_I4 + 1, VT_UI4),
+            (MAX_VT_UI4, VT_UI4),
+            (MAX_VT_UI4 + 1, VT_I8),
+            (MAX_VT_I8, VT_I8),
+            (MAX_VT_I8 + 1, VT_UI8),
+            (MAX_VT_UI8, VT_UI8),
+        ]:
+            with self.subTest(val=val, vt=vt):
+                v = VARIANT()
+                v.value = val
+                self.assertEqual(v.value, val)
+                self.assertEqual(v.vt, vt)
+
+    def test_out_of_vt_uix_range(self):
+        MIN_VT_I8 = -(2**63)
+        MAX_VT_UI8 = 2**64 - 1
+        for val in [MIN_VT_I8 - 1, MAX_VT_UI8 + 1]:
+            with self.subTest(val=val), self.assertRaises(TypeError):
+                VARIANT().value = val
 
     def test_datetime(self):
         now = datetime.datetime.now()
@@ -304,13 +323,11 @@ def check_perf(rep=20000):
     by_var = byref(variable)
     ptr_var = pointer(variable)
 
-    if sys.version_info >= (3, 0):
-        import pickle
-    else:
-        import cPickle as pickle
+    import pickle
+
     try:
         previous = pickle.load(open("result.pickle", "rb"))
-    except IOError:
+    except OSError:
         previous = {}
 
     results = {}

comtypes-1.4.12/comtypes/test/test_viewobject.py

@@ -0,0 +1,78 @@
+import contextlib
+import unittest
+from ctypes.wintypes import POINT, RECT, SIZEL
+
+import comtypes.client
+from comtypes import IUnknown
+from comtypes.viewobject import (
+    DVASPECT_CONTENT,
+    IAdviseSink,
+    IViewObject,
+    IViewObject2,
+    IViewObjectEx,
+)
+
+with contextlib.redirect_stdout(None):  # supress warnings
+    comtypes.client.GetModule("mshtml.tlb")
+
+import comtypes.gen.MSHTML as mshtml
+
+
+def create_html_document() -> IUnknown:
+    return comtypes.client.CreateObject(mshtml.HTMLDocument)
+
+
+class Test_IViewObject(unittest.TestCase):
+    def test_Advise_GetAdvise(self):
+        vo = create_html_document().QueryInterface(IViewObject)
+        # Test that we can clear any existing advise connection.
+        vo.SetAdvise(DVASPECT_CONTENT, 0, None)
+        # Verify that no advise connection is present.
+        aspect, advf, sink = vo.GetAdvise()
+        self.assertIsInstance(aspect, int)
+        self.assertIsInstance(advf, int)
+        self.assertIsInstance(sink, IAdviseSink)
+        self.assertFalse(sink)  # A NULL com pointer evaluates to False.
+
+    def test_Freeze_Unfreeze(self):
+        vo = create_html_document().QueryInterface(IViewObject)
+        cookie = vo.Freeze(DVASPECT_CONTENT, -1, None)
+        self.assertIsInstance(cookie, int)
+        vo.Unfreeze(cookie)
+
+
+class Test_IViewObject2(unittest.TestCase):
+    def test_GetExtent(self):
+        vo = create_html_document().QueryInterface(IViewObject2)
+        size = vo.GetExtent(DVASPECT_CONTENT, -1, None)
+        self.assertTrue(size)
+        self.assertIsInstance(size, SIZEL)
+
+
+class Test_IViewObjectEx(unittest.TestCase):
+    def test_GetRect(self):
+        vo = create_html_document().QueryInterface(IViewObjectEx)
+        rect = vo.GetRect(DVASPECT_CONTENT)
+        self.assertTrue(rect)
+        self.assertIsInstance(rect, RECT)
+
+    def test_GetViewStatus(self):
+        vo = create_html_document().QueryInterface(IViewObjectEx)
+        status = vo.GetViewStatus()
+        self.assertIsInstance(status, int)
+
+    def test_QueryHitPoint(self):
+        vo = create_html_document().QueryInterface(IViewObjectEx)
+        # It is assumed that the view is not transparent at the origin.
+        bounds = RECT(left=0, top=0, right=100, bottom=100)
+        loc = POINT(x=0, y=0)
+        hit = vo.QueryHitPoint(DVASPECT_CONTENT, bounds, loc, 0)
+        self.assertIsInstance(hit, int)
+
+    def test_QueryHitRect(self):
+        vo = create_html_document().QueryInterface(IViewObjectEx)
+        # It is assumed that the view is not transparent at the origin.
+        bounds = RECT(left=0, top=0, right=100, bottom=100)
+        loc = RECT(left=0, top=0, right=1, bottom=1)
+        hit = vo.QueryHitRect(DVASPECT_CONTENT, bounds, loc, 0)
+        self.assertIsInstance(hit, int)

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/test/test_word.py

@@ -26,7 +26,7 @@ except (ImportError, OSError):
 ################################################################
 
 
-class _Sink(object):
+class _Sink:
     def __init__(self):
         self.events = []
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/codegenerator.py

@@ -42,7 +42,7 @@ _InterfaceTypeDesc = _UnionT[
 ]
 
 
-class CodeGenerator(object):
+class CodeGenerator:
     def __init__(self, known_symbols=None, known_interfaces=None) -> None:
         self.stream = io.StringIO()
         self.imports = namespaces.ImportedNamespaces()

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/comments.py

@@ -3,7 +3,7 @@ import io
 from comtypes.tools import typedesc
 
 
-class ComInterfaceBodyImplCommentWriter(object):
+class ComInterfaceBodyImplCommentWriter:
     def __init__(self, stream: io.StringIO):
         self.stream = stream
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/heads.py

@@ -13,7 +13,7 @@ def _to_docstring(orig: str, depth: int = 1) -> str:
     return f'{indent}"""{repled}"""'
 
 
-class StructureHeadWriter(object):
+class StructureHeadWriter:
     def __init__(self, stream: io.StringIO) -> None:
         self.stream = stream
 
@@ -67,7 +67,7 @@ class StructureHeadWriter(object):
                 print("    pass", file=self.stream)
 
 
-class LibraryHeadWriter(object):
+class LibraryHeadWriter:
     def __init__(self, stream: io.StringIO) -> None:
         self.stream = stream
 
@@ -93,7 +93,7 @@ class LibraryHeadWriter(object):
         )
 
 
-class CoClassHeadWriter(object):
+class CoClassHeadWriter:
     def __init__(self, stream: io.StringIO, filename: Optional[str]) -> None:
         self.stream = stream
         self.filename = filename
@@ -117,7 +117,7 @@ class CoClassHeadWriter(object):
         )
 
 
-class ComInterfaceHeadWriter(object):
+class ComInterfaceHeadWriter:
     def __init__(self, stream: io.StringIO) -> None:
         self.stream = stream
 
@@ -172,7 +172,7 @@ class ComInterfaceHeadWriter(object):
             print(annotations, file=self.stream)
 
 
-class DispInterfaceHeadWriter(object):
+class DispInterfaceHeadWriter:
     def __init__(self, stream: io.StringIO) -> None:
         self.stream = stream
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/helpers.py

@@ -6,7 +6,7 @@ from comtypes.tools import typedesc
 from comtypes.tools.codegenerator.modulenamer import name_wrapper_module
 
 
-class lcid(object):
+class lcid:
     def __repr__(self):
         return "_lcid"
 
@@ -14,7 +14,7 @@ class lcid(object):
 lcid = lcid()
 
 
-class dispid(object):
+class dispid:
     def __init__(self, memid):
         self.memid = memid
 
@@ -22,7 +22,7 @@ class dispid(object):
         return f"dispid({self.memid})"
 
 
-class helpstring(object):
+class helpstring:
     def __init__(self, text):
         self.text = text
 
@@ -100,7 +100,7 @@ def _to_arg_definition(
     return code
 
 
-class ComMethodGenerator(object):
+class ComMethodGenerator:
     def __init__(self, m: typedesc.ComMethod, isdual: bool) -> None:
         self._m = m
         self._isdual = isdual
@@ -208,7 +208,7 @@ class ComMethodGenerator(object):
             yield (type_name, arg_name, idlflags, default)
 
 
-class DispMethodGenerator(object):
+class DispMethodGenerator:
     def __init__(self, m: typedesc.DispMethod) -> None:
         self._m = m
         self.data: List[str] = []
@@ -262,7 +262,7 @@ class DispMethodGenerator(object):
             yield (type_name, arg_name, idlflags, default)
 
 
-class DispPropertyGenerator(object):
+class DispPropertyGenerator:
     def __init__(self, m: typedesc.DispProperty) -> None:
         self._m = m
         self._to_type_name = TypeNamer()
@@ -290,7 +290,7 @@ class DispPropertyGenerator(object):
         return (idlflags, type_name, self._m.name)
 
 
-class TypeNamer(object):
+class TypeNamer:
     def __call__(self, t: Any) -> str:
         # Return a string, containing an expression which can be used
         # to refer to the type. Assumes the 'from ctypes import *'

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/namespaces.py

@@ -15,7 +15,7 @@ from typing import (
 from typing import Union as _UnionT
 
 
-class ImportedNamespaces(object):
+class ImportedNamespaces:
     def __init__(self) -> None:
         self.data: Dict[str, Optional[str]] = {}
 
@@ -132,7 +132,7 @@ class ImportedNamespaces(object):
         return "\n".join(lines)
 
 
-class DeclaredNamespaces(object):
+class DeclaredNamespaces:
     def __init__(self) -> None:
         self.data: Dict[Tuple[str, str], Optional[str]] = {}
 
@@ -168,7 +168,7 @@ class DeclaredNamespaces(object):
         return "\n".join(lines)
 
 
-class EnumerationNamespaces(object):
+class EnumerationNamespaces:
     def __init__(self) -> None:
         self.data: Dict[str, List[Tuple[str, int]]] = {}
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/codegenerator/typeannotator.py

@@ -276,7 +276,7 @@ class ComMethodsAnnotator(_MethodsAnnotator[typedesc.ComMethod]):
         return ComMethodAnnotator(m)
 
 
-class ComInterfaceMembersAnnotator(object):
+class ComInterfaceMembersAnnotator:
     def __init__(self, itf: typedesc.ComInterface):
         self.itf = itf
 
@@ -316,7 +316,7 @@ class DispMethodsAnnotator(_MethodsAnnotator[typedesc.DispMethod]):
         return DispMethodAnnotator(m)
 
 
-class DispInterfaceMembersAnnotator(object):
+class DispInterfaceMembersAnnotator:
     def __init__(self, itf: typedesc.DispInterface):
         self.itf = itf
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/tlbparser.py

@@ -108,7 +108,7 @@ COMTYPES = {
 ################################################################
 
 
-class Parser(object):
+class Parser:
     tlib: typeinfo.ITypeLib
     items: Dict[str, Any]
 

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/typedesc.py

@@ -10,7 +10,7 @@ from comtypes.tools.typedesc_base import *
 from comtypes.typeinfo import TLIBATTR, ITypeLib
 
 
-class TypeLib(object):
+class TypeLib:
     def __init__(
         self, name: str, guid: str, major: int, minor: int, doc: Optional[str] = None
     ) -> None:
@@ -24,7 +24,7 @@ class TypeLib(object):
         return f"<TypeLib({self.name}: {self.guid}, {self.major}, {self.minor})>"
 
 
-class Constant(object):
+class Constant:
     def __init__(
         self,
         name: str,
@@ -38,7 +38,7 @@ class Constant(object):
         self.doc = doc
 
 
-class External(object):
+class External:
     def __init__(
         self,
         tlib: ITypeLib,
@@ -61,13 +61,13 @@ class External(object):
         return self
 
 
-class SAFEARRAYType(object):
+class SAFEARRAYType:
     def __init__(self, typ: Any) -> None:
         self.typ = typ
         self.align = self.size = ctypes.sizeof(ctypes.c_void_p) * 8
 
 
-class ComMethod(object):
+class ComMethod:
     # custom COM method, parsed from typelib
     def __init__(
         self,
@@ -92,7 +92,7 @@ class ComMethod(object):
         self.arguments.append((typ, name, idlflags, default))
 
 
-class DispMethod(object):
+class DispMethod:
     # dispatchable COM method, parsed from typelib
     def __init__(
         self,
@@ -117,7 +117,7 @@ class DispMethod(object):
         self.arguments.append((typ, name, idlflags, default))
 
 
-class DispProperty(object):
+class DispProperty:
     # dispatchable COM property, parsed from typelib
     def __init__(
         self, dispid: int, name: str, typ: Any, idlflags: List[str], doc: Optional[Any]
@@ -129,17 +129,17 @@ class DispProperty(object):
         self.doc = doc
 
 
-class DispInterfaceHead(object):
+class DispInterfaceHead:
     def __init__(self, itf: "DispInterface") -> None:
         self.itf = itf
 
 
-class DispInterfaceBody(object):
+class DispInterfaceBody:
     def __init__(self, itf: "DispInterface") -> None:
         self.itf = itf
 
 
-class DispInterface(object):
+class DispInterface:
     def __init__(
         self,
         name: str,
@@ -167,17 +167,17 @@ class DispInterface(object):
         return self.itf_head
 
 
-class ComInterfaceHead(object):
+class ComInterfaceHead:
     def __init__(self, itf: "ComInterface") -> None:
         self.itf = itf
 
 
-class ComInterfaceBody(object):
+class ComInterfaceBody:
     def __init__(self, itf: "ComInterface") -> None:
         self.itf = itf
 
 
-class ComInterface(object):
+class ComInterface:
     def __init__(
         self,
         name: str,
@@ -209,7 +209,7 @@ _ImplTypeFlags = int
 _Interface = _UnionT[ComInterface, DispInterface]
 
 
-class CoClass(object):
+class CoClass:
     def __init__(
         self,
         name: str,

{comtypes-1.4.11 → comtypes-1.4.12}/comtypes/tools/typedesc_base.py

@@ -5,7 +5,7 @@ from typing import Union as _UnionT
 import comtypes
 
 
-class Argument(object):
+class Argument:
     "a Parameter in the argument list of a callable (Function, Method, ...)"
 
     def __init__(self, atype, name):
@@ -13,7 +13,7 @@ class Argument(object):
         self.name = name
 
 
-class _HasArgs(object):
+class _HasArgs:
     def __init__(self):
         self.arguments = []
 
@@ -37,7 +37,7 @@ class _HasArgs(object):
 ################
 
 
-class Alias(object):
+class Alias:
     # a C preprocessor alias, like #define A B
     def __init__(self, name, alias, typ=None):
         self.name = name
@@ -45,7 +45,7 @@ class Alias(object):
         self.typ = typ
 
 
-class Macro(object):
+class Macro:
     # a C preprocessor definition with arguments
     def __init__(self, name, args, body):
         # all arguments are strings, args is the literal argument list
@@ -56,7 +56,7 @@ class Macro(object):
         self.body = body
 
 
-class File(object):
+class File:
     def __init__(self, name):
         self.name = name
 
@@ -107,7 +107,7 @@ class Method(_HasArgs):
         self.returns = returns
 
 
-class FundamentalType(object):
+class FundamentalType:
     location = None
 
     def __init__(self, name, size, align):
@@ -117,7 +117,7 @@ class FundamentalType(object):
             self.align = int(align)
 
 
-class PointerType(object):
+class PointerType:
     location = None
 
     def __init__(self, typ, size, align):
@@ -126,7 +126,7 @@ class PointerType(object):
         self.align = int(align)
 
 
-class Typedef(object):
+class Typedef:
     location = None
 
     def __init__(self, name, typ):
@@ -134,7 +134,7 @@ class Typedef(object):
         self.typ = typ
 
 
-class ArrayType(object):
+class ArrayType:
     location = None
 
     def __init__(self, typ: Any, min: int, max: int) -> None:
@@ -143,21 +143,21 @@ class ArrayType(object):
         self.max = max
 
 
-class StructureHead(object):
+class StructureHead:
     location = None
 
     def __init__(self, struct: "_Struct_Union_Base") -> None:
         self.struct = struct
 
 
-class StructureBody(object):
+class StructureBody:
     location = None
 
     def __init__(self, struct: "_Struct_Union_Base") -> None:
         self.struct = struct
 
 
-class _Struct_Union_Base(object):
+class _Struct_Union_Base:
     name: str
     align: int
     members: List[_UnionT["Field", Method, Constructor]]
@@ -198,7 +198,7 @@ class Structure(_Struct_Union_Base):
             self.size = int(size)
         else:
             self.size = None
-        super(Structure, self).__init__()
+        super().__init__()
 
 
 class Union(_Struct_Union_Base):
@@ -220,10 +220,10 @@ class Union(_Struct_Union_Base):
             self.size = int(size)
         else:
             self.size = None
-        super(Union, self).__init__()
+        super().__init__()
 
 
-class Field(object):
+class Field:
     def __init__(
         self, name: str, typ: Any, bits: Optional[Any], offset: SupportsInt
     ) -> None:
@@ -233,14 +233,14 @@ class Field(object):
         self.offset = int(offset)
 
 
-class CvQualifiedType(object):
+class CvQualifiedType:
     def __init__(self, typ, const, volatile):
         self.typ = typ
         self.const = const
         self.volatile = volatile
 
 
-class Enumeration(object):
+class Enumeration:
     location = None
 
     def __init__(self, name: str, size: SupportsInt, align: SupportsInt) -> None:
@@ -253,14 +253,14 @@ class Enumeration(object):
         self.values.append(v)
 
 
-class EnumValue(object):
+class EnumValue:
     def __init__(self, name: str, value: int, enumeration: Enumeration) -> None:
         self.name = name
         self.value = value
         self.enumeration = enumeration
 
 
-class Variable(object):
+class Variable:
     location = None
 
     def __init__(self, name, typ, init=None):