comtypes 1.4.7__zip → 1.4.8__zip

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/client/_generate.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ctypes
 import importlib
 import inspect
@@ -106,7 +105,8 @@ def GetModule(tlib: _UnionT[Any, typeinfo.ITypeLib]) -> types.ModuleType:
         frame = sys._getframe(1)
         _file_: Optional[str] = frame.f_globals.get("__file__", None)
         pathname, is_abs = _resolve_filename(
-            tlib_string, _file_ and os.path.dirname(_file_)  # type: ignore
+            tlib_string,
+            _file_ and os.path.dirname(_file_),  # type: ignore
         )
         logger.debug("GetModule(%s), resolved: %s", pathname, is_abs)
         tlib = _load_tlib(pathname)  # don't register
@@ -251,9 +251,9 @@ _ItfName = str
 _ItfIid = str
 
 
-def _get_known_namespaces() -> Tuple[
-    Mapping[_SymbolName, _ModuleName], Mapping[_ItfName, _ItfIid]
-]:
+def _get_known_namespaces() -> (
+    Tuple[Mapping[_SymbolName, _ModuleName], Mapping[_ItfName, _ItfIid]]
+):
     """Returns symbols and interfaces that are already statically defined in `ctypes`
     and `comtypes`.
     From `ctypes`, all the names are obtained.

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/client/lazybind.py

@@ -126,11 +126,6 @@ class Dispatch(object):
         "QueryInterface is forwarded to the real com object."
         return self._comobj.QueryInterface(*args)
 
-    def __cmp__(self, other):
-        if not isinstance(other, Dispatch):
-            return 1
-        return cmp(self._comobj, other._comobj)
-
     def __eq__(self, other):
         return isinstance(other, Dispatch) and self._comobj == other._comobj
 

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/git.py

@@ -3,6 +3,7 @@
 The global interface table provides a way to marshal interface pointers
 between different threading appartments.
 """
+
 from ctypes import *
 from comtypes import (
     IUnknown,

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/hints.pyi

@@ -253,7 +253,7 @@ _T_E = TypeVar("_T_E")
 def to_dunder_iter(
     newenum: _UnionT[
         _Descriptor[_T_Inst, Iterator[_T_E]], Callable[[_T_Inst], Iterator[_T_E]]
-    ]
+    ],
 ) -> Callable[[_T_Inst], Iterator[_T_E]]: ...
 @overload
 def to_dunder_iter(newenum: Any) -> Callable[..., NoReturn]: ...
@@ -266,7 +266,7 @@ def to_dunder_call(
         _GetSetNamedProperty[_T_Inst, _P_Get, _R_Get, ...],
         _GetOnlyNamedProperty[_T_Inst, _P_Get, _R_Get],
         Callable[Concatenate[_T_Inst, _P_Get], _R_Get],
-    ]
+    ],
 ) -> Callable[Concatenate[_T_Inst, _P_Get], _R_Get]: ...
 @overload
 def to_dunder_call(item: Any) -> Callable[..., NoReturn]: ...
@@ -278,7 +278,7 @@ def to_dunder_getitem(
         _GetSetNamedProperty[_T_Inst, _P_Get, _R_Get, ...],
         _GetOnlyNamedProperty[_T_Inst, _P_Get, _R_Get],
         Callable[Concatenate[_T_Inst, _P_Get], _R_Get],
-    ]
+    ],
 ) -> Callable[Concatenate[_T_Inst, _P_Get], _R_Get]: ...
 @overload
 def to_dunder_getitem(item: Any) -> Callable[..., NoReturn]: ...
@@ -289,7 +289,7 @@ def to_dunder_setitem(
     item: _UnionT[
         _GetSetNamedProperty[_T_Inst, ..., Any, _P_Set],
         _SetOnlyNamedProperty[_T_Inst, _P_Set],
-    ]
+    ],
 ) -> Callable[Concatenate[_T_Inst, _P_Set], Any]: ...
 @overload
 def to_dunder_setitem(item: Any) -> Callable[..., NoReturn]: ...

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/persist.py

@@ -9,6 +9,7 @@
 The 'DictPropertyBag' class is a class implementing the IPropertyBag
 interface, useful in client code.
 """
+
 from ctypes import c_int, c_ulong, c_ushort, c_wchar_p
 from ctypes import POINTER, Structure
 from ctypes.wintypes import WORD, DWORD, BOOL
@@ -244,13 +245,12 @@ class IPersistFile(IPersist):
     ]
 
     if TYPE_CHECKING:
-        # fmt: off
-        def IsDirty(self) -> hints.Hresult: ...  # noqa
-        def Load(self, pszFileName: str, dwMode: int) -> hints.Hresult: ...  # noqa
-        def Save(self, pszFileName: str, fRemember: bool) -> hints.Hresult: ...  # noqa
-        def SaveCompleted(self, pszFileName: str) -> hints.Hresult: ...  # noqa
-        def GetCurFile(self) -> str: ...  # noqa
-        # fmt: on
+
+        def IsDirty(self) -> hints.Hresult: ...
+        def Load(self, pszFileName: str, dwMode: int) -> hints.Hresult: ...
+        def Save(self, pszFileName: str, fRemember: bool) -> hints.Hresult: ...
+        def SaveCompleted(self, pszFileName: str) -> hints.Hresult: ...
+        def GetCurFile(self) -> str: ...
 
 
 from comtypes import COMObject

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/safearray.py

@@ -81,9 +81,7 @@ def _make_safearray_type(itemtype):
     )
 
     meta = type(_safearray.tagSAFEARRAY)
-    sa_type = meta.__new__(
-        meta, "SAFEARRAY_%s" % itemtype.__name__, (_safearray.tagSAFEARRAY,), {}
-    )
+    sa_type = meta(f"SAFEARRAY_{itemtype.__name__}", (_safearray.tagSAFEARRAY,), {})
 
     try:
         vartype = _ctype_to_vartype[itemtype]
@@ -192,9 +190,7 @@ def _make_safearray_type(itemtype):
                 nitems *= d
                 rgsa[i].cElements = d
                 rgsa[i].lBound = lBound
-            pa = _safearray.SafeArrayCreateEx(
-                cls._vartype_, value.ndim, rgsa, extra  # cDims  # rgsaBound
-            )  # pvExtra
+            pa = _safearray.SafeArrayCreateEx(cls._vartype_, value.ndim, rgsa, extra)
             if not pa:
                 if cls._vartype_ == VT_RECORD and extra is None:
                     raise TypeError(

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/server/__init__.py

@@ -1,5 +1,6 @@
 import comtypes.client, ctypes
 
+
 ################################################################
 # Interfaces
 class IClassFactory(comtypes.IUnknown):

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/server/register.py

@@ -35,6 +35,7 @@ Now, debug the object, and when done delete logging info:
 
   python mycomobj.py /nodebug
 """
+
 import sys
 import os
 import winreg

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/shelllink.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from ctypes import c_char_p, c_int, c_short, c_wchar_p
 from ctypes import POINTER
 from ctypes import byref, create_string_buffer, create_unicode_buffer
@@ -18,19 +17,24 @@ SLGP_UNCPRIORITY = 0x2
 SLGP_RAWPATH = 0x4
 
 # for SetShowCmd, GetShowCmd
-##SW_SHOWNORMAL
-##SW_SHOWMAXIMIZED
-##SW_SHOWMINNOACTIVE
-
+SW_SHOWNORMAL = 0x01
+SW_SHOWMAXIMIZED = 0x03
+SW_SHOWMINNOACTIVE = 0x07
 
 # for Resolve
-##SLR_INVOKE_MSI
-##SLR_NOLINKINFO
-##SLR_NO_UI
-##SLR_NOUPDATE
-##SLR_NOSEARCH
-##SLR_NOTRACK
-##SLR_UPDATE
+SLR_INVOKE_MSI = 0x0080
+SLR_NOLINKINFO = 0x0040
+SLR_NO_UI = 0x0001
+SLR_NOUPDATE = 0x0008
+SLR_NOSEARCH = 0x0010
+SLR_NOTRACK = 0x0020
+SLR_UPDATE = 0x0004
+
+# for Hotkey
+HOTKEYF_ALT = 0x04
+HOTKEYF_CONTROL = 0x02
+HOTKEYF_EXT = 0x08
+HOTKEYF_SHIFT = 0x01
 
 # fake these...
 ITEMIDLIST = c_int
@@ -123,25 +127,26 @@ class IShellLinkA(IUnknown):
     ]
 
     if TYPE_CHECKING:
-        # fmt: off
-        def GetIDList(self) -> hints.Incomplete: ...  # noqa
-        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...  # noqa
-        def SetDescription(self, pszName: bytes) -> hints.Incomplete: ...  # noqa
-        def SetWorkingDirectory(self, pszDir: bytes) -> hints.Hresult: ...   # noqa
-        def SetArguments(self, pszArgs: bytes) -> hints.Hresult: ...   # noqa
+
+        def GetIDList(self) -> hints.Incomplete: ...
+        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...
+        def SetDescription(self, pszName: bytes) -> hints.Incomplete: ...
+        def SetWorkingDirectory(self, pszDir: bytes) -> hints.Hresult: ...
+        def SetArguments(self, pszArgs: bytes) -> hints.Hresult: ...
         @property
-        def Hotkey(self) -> int: ...   # noqa
+        def Hotkey(self) -> int: ...
         @Hotkey.setter
-        def Hotkey(self, pwHotkey: int) -> None: ...   # noqa
+        def Hotkey(self, pwHotkey: int) -> None: ...
         @property
-        def ShowCmd(self) -> int: ...   # noqa
+        def ShowCmd(self) -> int: ...
         @ShowCmd.setter
-        def ShowCmd(self, piShowCmd: int) -> None: ...   # noqa
-        def SetIconLocation(self, pszIconPath: bytes, iIcon: int) -> hints.Hresult: ...   # noqa
-        def SetRelativePath(self, pszPathRel: bytes, dwReserved: hints.Literal[0]) -> hints.Hresult: ...   # noqa
-        def Resolve(self, hwnd: int, fFlags: int) -> hints.Hresult: ...   # noqa
-        def SetPath(self, pszFile: bytes) -> hints.Hresult: ...   # noqa
-        # fmt: on
+        def ShowCmd(self, piShowCmd: int) -> None: ...
+        def SetIconLocation(self, pszIconPath: bytes, iIcon: int) -> hints.Hresult: ...
+        def SetRelativePath(
+            self, pszPathRel: bytes, dwReserved: hints.Literal[0]
+        ) -> hints.Hresult: ...
+        def Resolve(self, hwnd: int, fFlags: int) -> hints.Hresult: ...
+        def SetPath(self, pszFile: bytes) -> hints.Hresult: ...
 
     def GetPath(self, flags: int = SLGP_SHORTPATH) -> bytes:
         buf = create_string_buffer(MAX_PATH)
@@ -257,25 +262,26 @@ class IShellLinkW(IUnknown):
     ]
 
     if TYPE_CHECKING:
-        # fmt: off
-        def GetIDList(self) -> hints.Incomplete: ...  # noqa
-        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...  # noqa
-        def SetDescription(self, pszName: str) -> hints.Incomplete: ...  # noqa
-        def SetWorkingDirectory(self, pszDir: str) -> hints.Hresult: ...   # noqa
-        def SetArguments(self, pszArgs: str) -> hints.Hresult: ...   # noqa
+
+        def GetIDList(self) -> hints.Incomplete: ...
+        def SetIDList(self, pidl: hints.Incomplete) -> hints.Incomplete: ...
+        def SetDescription(self, pszName: str) -> hints.Incomplete: ...
+        def SetWorkingDirectory(self, pszDir: str) -> hints.Hresult: ...
+        def SetArguments(self, pszArgs: str) -> hints.Hresult: ...
         @property
-        def Hotkey(self) -> int: ...   # noqa
+        def Hotkey(self) -> int: ...
         @Hotkey.setter
-        def Hotkey(self, pwHotkey: int) -> None: ...   # noqa
+        def Hotkey(self, pwHotkey: int) -> None: ...
         @property
-        def ShowCmd(self) -> int: ...   # noqa
+        def ShowCmd(self) -> int: ...
         @ShowCmd.setter
-        def ShowCmd(self, piShowCmd: int) -> None: ...   # noqa
-        def SetIconLocation(self, pszIconPath: str, iIcon: int) -> hints.Hresult: ...   # noqa
-        def SetRelativePath(self, pszPathRel: str, dwReserved: hints.Literal[0]) -> hints.Hresult: ...   # noqa
-        def Resolve(self, hwnd: int, fFlags: int) -> hints.Hresult: ...   # noqa
-        def SetPath(self, pszFile: str) -> hints.Hresult: ...   # noqa
-        # fmt: on
+        def ShowCmd(self, piShowCmd: int) -> None: ...
+        def SetIconLocation(self, pszIconPath: str, iIcon: int) -> hints.Hresult: ...
+        def SetRelativePath(
+            self, pszPathRel: str, dwReserved: hints.Literal[0]
+        ) -> hints.Hresult: ...
+        def Resolve(self, hwnd: int, fFlags: int) -> hints.Hresult: ...
+        def SetPath(self, pszFile: str) -> hints.Hresult: ...
 
     def GetPath(self, flags: int = SLGP_SHORTPATH) -> str:
         buf = create_unicode_buffer(MAX_PATH)
@@ -314,7 +320,6 @@ class ShellLink(CoClass):
 
 
 if __name__ == "__main__":
-
     import sys
     import comtypes
     from comtypes.client import CreateObject

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/TestComServer.py

@@ -33,6 +33,7 @@ from comtypes.gen import TestComServerLib
 
 ################################################################
 
+
 # Implement the CoClass.  Use the coclass from the wrapper as base
 # class, and use DualDispMixin as base class which provides default
 # implementations of IDispatch, IProvideClassInfo, IProvideClassInfo2
@@ -42,7 +43,6 @@ class TestComServer(
     TestComServerLib.TestComServer,  # the coclass from the typelib wrapper
     comtypes.server.connectionpoints.ConnectableObjectMixin,
 ):
-
     # The default interface from the typelib MUST be the first
     # interface, other interfaces can follow
 

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/TestDispServer.py

@@ -31,6 +31,7 @@ from comtypes.gen import TestDispServerLib
 
 ################################################################
 
+
 # Implement the CoClass by defining a subclass of the
 # TestDispServerLib.TestDispServer class in the wrapper file.  The
 # COMObject base class provides default implementations of the
@@ -42,7 +43,6 @@ class TestDispServer(
     TestDispServerLib.TestDispServer,  # the coclass from the typelib wrapper
     comtypes.server.connectionpoints.ConnectableObjectMixin,
 ):
-
     # The default interface from the typelib MUST be the first
     # interface, other interfaces can follow
 

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/__init__.py

@@ -1,6 +1,5 @@
 # comtypes.test package.
 
-from __future__ import print_function
 import ctypes
 import getopt
 import os

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/find_memleak.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import unittest, gc
 from ctypes import *
 from ctypes.wintypes import *

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_agilent.py

@@ -2,7 +2,6 @@
 # is installed.  It is not requires to have a physical instrument
 # connected, the driver is used in simulation mode.
 
-from __future__ import print_function
 import unittest
 from comtypes.test import ResourceDenied
 from comtypes.client import CreateObject

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_clear_cache.py

@@ -1,6 +1,7 @@
 """
 Test for the ``comtypes.clear_cache`` module.
 """
+
 import contextlib
 import runpy
 from unittest.mock import patch, call

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_createwrappers.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import glob
 import os
 import unittest

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_dispinterface.py

@@ -16,7 +16,6 @@ def setUpModule():
 
 
 class Test(unittest.TestCase):
-
     if is_resource_enabled("pythoncom"):
 
         def test_win32com(self):

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_excel.py

@@ -1,5 +1,4 @@
 # -*- coding: latin-1 -*-
-from __future__ import print_function
 
 import datetime
 import sys

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_inout_args.py

@@ -278,7 +278,7 @@ class Test_ArgspecPermutations(ut.TestCase):
                 (orig_0th, *orig_call_args), orig_kw = orig.call_args
                 self.assertEqual(orig_kw, {})
                 self.assertIs(orig_0th, self_)
-                for ((typ, f, val), orig) in zip(
+                for (typ, f, val), orig in zip(
                     testing_params.call_args_validators, orig_call_args
                 ):
                     self.assertIsInstance(orig, typ)

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_server.py

@@ -125,6 +125,7 @@ try:
         )
         # implementation
         Name = "foo"
+
         # test
         def test_Name(self):
             p = wrap(self.create())
@@ -137,6 +138,7 @@ try:
         itf.add(
             "[id(101)] HRESULT MixedInOut([in] int a, [out] int *b, [in] int c, [out] int *d);"
         )
+
         # implementation
         def MixedInOut(self, a, c):
             return a + 1, c + 1
@@ -151,6 +153,7 @@ try:
         itf.add(
             "[id(102)] HRESULT MultiInOutArgs([in, out] int *pa, [in, out] int *pb);"
         )
+
         # implementation
         def MultiInOutArgs(self, pa, pb):
             return pa[0] * 3, pb[0] * 4
@@ -174,6 +177,7 @@ try:
         ################
         # definition
         itf.add("HRESULT MultiInOutArgs3([out] int *pa, [out] int *pb);")
+
         # implementation
         def MultiInOutArgs3(self):
             return 42, 43
@@ -186,6 +190,7 @@ try:
         ################
         # definition
         itf.add("HRESULT MultiInOutArgs4([out] int *pa, [in, out] int *pb);")
+
         # implementation
         def MultiInOutArgs4(self, pb):
             return pb[0] + 3, pb[0] + 4
@@ -238,6 +243,7 @@ try:
         # Test events.
         itf.add("""HRESULT DoSomething();""")
         outgoing.add("""[id(103)] HRESULT OnSomething();""")
+
         # implementation
         def DoSomething(self):
             "Implement the DoSomething method"

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_shelllink.py

@@ -50,17 +50,15 @@ class Test_IShellLinkA(ut.TestCase):
         self.assertEqual(shortcut.GetArguments(), b"-f")
 
     def test_set_and_get_hotkey(self):
-        HOTKEYF_ALT = 0x04
-        HOTKEYF_CONTROL = 0x02
+        hotkey = shelllink.HOTKEYF_ALT | shelllink.HOTKEYF_CONTROL
         shortcut = self._create_shortcut()
-        shortcut.Hotkey = HOTKEYF_ALT | HOTKEYF_CONTROL
-        self.assertEqual(shortcut.Hotkey, HOTKEYF_ALT | HOTKEYF_CONTROL)
+        shortcut.Hotkey = hotkey
+        self.assertEqual(shortcut.Hotkey, hotkey)
 
     def test_set_and_get_showcmd(self):
-        SW_SHOWMAXIMIZED = 0x03
         shortcut = self._create_shortcut()
-        shortcut.ShowCmd = SW_SHOWMAXIMIZED
-        self.assertEqual(shortcut.ShowCmd, SW_SHOWMAXIMIZED)
+        shortcut.ShowCmd = shelllink.SW_SHOWMAXIMIZED
+        self.assertEqual(shortcut.ShowCmd, shelllink.SW_SHOWMAXIMIZED)
 
     def test_set_and_get_icon_location(self):
         shortcut = self._create_shortcut()
@@ -113,17 +111,15 @@ class Test_IShellLinkW(ut.TestCase):
         self.assertEqual(shortcut.GetArguments(), "-f")
 
     def test_set_and_get_hotkey(self):
-        HOTKEYF_ALT = 0x04
-        HOTKEYF_CONTROL = 0x02
+        hotkey = shelllink.HOTKEYF_ALT | shelllink.HOTKEYF_CONTROL
         shortcut = self._create_shortcut()
-        shortcut.Hotkey = HOTKEYF_ALT | HOTKEYF_CONTROL
-        self.assertEqual(shortcut.Hotkey, HOTKEYF_ALT | HOTKEYF_CONTROL)
+        shortcut.Hotkey = hotkey
+        self.assertEqual(shortcut.Hotkey, hotkey)
 
     def test_set_and_get_showcmd(self):
-        SW_SHOWMAXIMIZED = 0x03
         shortcut = self._create_shortcut()
-        shortcut.ShowCmd = SW_SHOWMAXIMIZED
-        self.assertEqual(shortcut.ShowCmd, SW_SHOWMAXIMIZED)
+        shortcut.ShowCmd = shelllink.SW_SHOWMAXIMIZED
+        self.assertEqual(shortcut.ShowCmd, shelllink.SW_SHOWMAXIMIZED)
 
     def test_set_and_get_icon_location(self):
         shortcut = self._create_shortcut()

comtypes-1.4.8/comtypes/test/test_stream.py

@@ -0,0 +1,131 @@
+import unittest as ut
+
+from ctypes import POINTER, byref, c_bool, c_ubyte, c_ulonglong, oledll, pointer
+import comtypes
+import comtypes.client
+
+comtypes.client.GetModule("portabledeviceapi.dll")
+from comtypes.gen.PortableDeviceApiLib import IStream
+
+
+STGC_DEFAULT = 0
+STREAM_SEEK_SET = 0
+STREAM_SEEK_CUR = 1
+STREAM_SEEK_END = 2
+
+
+def _create_stream() -> IStream:
+    # Create an IStream
+    stream = POINTER(IStream)()  # type: ignore
+    comtypes._ole32.CreateStreamOnHGlobal(None, c_bool(True), byref(stream))
+    return stream  # type: ignore
+
+
+class Test_RemoteWrite(ut.TestCase):
+    def test_RemoteWrite(self):
+        stream = _create_stream()
+        test_data = "Some data".encode("utf-8")
+        pv = (c_ubyte * len(test_data)).from_buffer(bytearray(test_data))
+
+        written = stream.RemoteWrite(pv, len(test_data))
+
+        # Verification
+        self.assertEqual(written, len(test_data))
+
+
+class Test_RemoteRead(ut.TestCase):
+    def test_RemoteRead(self):
+        stream = _create_stream()
+        test_data = "Some data".encode("utf-8")
+        pv = (c_ubyte * len(test_data)).from_buffer(bytearray(test_data))
+        stream.RemoteWrite(pv, len(test_data))
+
+        # Make sure the data actually gets written before trying to read back
+        stream.Commit(STGC_DEFAULT)
+        # Move the stream back to the beginning
+        stream.RemoteSeek(0, STREAM_SEEK_SET)
+
+        buffer_size = 1024
+
+        read_buffer, data_read = stream.RemoteRead(buffer_size)
+
+        # Verification
+        self.assertEqual(data_read, len(test_data))
+        self.assertEqual(bytearray(read_buffer)[0:data_read], test_data)
+
+
+class Test_RemoteSeek(ut.TestCase):
+    def _create_sample_stream(self) -> IStream:
+        stream = _create_stream()
+        test_data = b"spam egg bacon ham"
+        pv = (c_ubyte * len(test_data)).from_buffer(bytearray(test_data))
+        stream.RemoteWrite(pv, len(test_data))
+        stream.Commit(STGC_DEFAULT)
+        return stream
+
+    def test_takes_STREAM_SEEK_SET_as_origin(self):
+        stream = self._create_sample_stream()
+        newpos = stream.RemoteSeek(9, STREAM_SEEK_SET)
+        self.assertEqual(newpos, 9)
+        buf, read = stream.RemoteRead(1024)
+        self.assertEqual(bytearray(buf)[0:read], b"bacon ham")
+
+    def test_takes_STREAM_SEEK_CUR_as_origin(self):
+        stream = self._create_sample_stream()
+        stream.RemoteSeek(8, STREAM_SEEK_SET)
+        newpos = stream.RemoteSeek(7, STREAM_SEEK_CUR)
+        self.assertEqual(newpos, 15)
+        buf, read = stream.RemoteRead(1024)
+        self.assertEqual(bytearray(buf)[0:read], b"ham")
+
+    def test_takes_STREAM_SEEK_END_as_origin(self):
+        stream = self._create_sample_stream()
+        stream.RemoteSeek(8, STREAM_SEEK_SET)
+        newpos = stream.RemoteSeek(-13, STREAM_SEEK_END)
+        self.assertEqual(newpos, 5)
+        buf, read = stream.RemoteRead(1024)
+        self.assertEqual(bytearray(buf)[0:read], b"egg bacon ham")
+
+
+class Test_SetSize(ut.TestCase):
+    def test_SetSize(self):
+        stream = _create_stream()
+        stream.SetSize(42)
+        pui = pointer(c_ulonglong())
+        oledll.shlwapi.IStream_Size(stream, pui)
+        self.assertEqual(pui.contents.value, 42)
+
+
+class Test_RemoteCopyTo(ut.TestCase):
+    def test_RemoteCopyTo(self):
+        src = _create_stream()
+        dst = _create_stream()
+        test_data = b"parrot"
+        pv = (c_ubyte * len(test_data)).from_buffer(bytearray(test_data))
+        src_written = src.RemoteWrite(pv, len(test_data))
+        src.Commit(STGC_DEFAULT)
+        src.RemoteSeek(0, STREAM_SEEK_SET)
+        cpy_read, cpy_written = src.RemoteCopyTo(dst, src_written)
+        self.assertEqual(cpy_read, len(test_data))
+        self.assertEqual(cpy_written, len(test_data))
+        dst.Commit(STGC_DEFAULT)
+        dst.RemoteSeek(0, STREAM_SEEK_SET)
+        dst_buf, dst_read = dst.RemoteRead(1024)
+        self.assertEqual(bytearray(dst_buf)[0:dst_read], test_data)
+
+
+class Test_Clone(ut.TestCase):
+    def test_Clone(self):
+        orig = _create_stream()
+        test_data = b"spam egg bacon ham"
+        pv = (c_ubyte * len(test_data)).from_buffer(bytearray(test_data))
+        orig.RemoteWrite(pv, len(test_data))
+        orig.Commit(STGC_DEFAULT)
+        orig.RemoteSeek(0, STREAM_SEEK_SET)
+        new_stm = orig.Clone()
+        buf, read = new_stm.RemoteRead(1024)
+        self.assertEqual(bytearray(buf)[0:read], test_data)
+
+
+if __name__ == "__main__":
+    ut.main()

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_typeannotator.py

@@ -7,6 +7,7 @@ from comtypes.tools.tlbparser import (
     HRESULT_type,
     VARIANT_type,
     VARIANT_BOOL_type,
+    void_type,
 )
 
 
@@ -20,7 +21,6 @@ idispatch_type = typedesc.ComInterface(
     ["restricted"],
     None,
 )
-void_type = typedesc.FundamentalType("void", 0, 0)
 
 
 class Test_AvoidUsingKeywords(unittest.TestCase):

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_urlhistory.py

@@ -9,6 +9,7 @@ from comtypes.patcher import Patch
 GetModule(os.path.join(os.path.dirname(__file__), "urlhist.tlb"))
 from comtypes.gen import urlhistLib
 
+
 # The pwcsTitle and pwcsUrl fields of the _STATURL structure must be
 # freed by the caller.  The only way to do this without patching the
 # generated code directly is to monkey-patch the

{comtypes-1.4.7 → comtypes-1.4.8}/comtypes/test/test_variant.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import datetime
 import decimal
 import sys