comtypes 1.4.9__zip → 1.4.11__zip

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_ie.py

@@ -1,5 +1,6 @@
 import unittest as ut
-from ctypes import Structure, c_long, c_uint, c_ulong
+from ctypes import POINTER, Structure, WinDLL, byref, c_long, c_uint, c_ulong
+from ctypes.wintypes import BOOL, HWND, LPLONG, UINT
 
 from comtypes.client import CreateObject, GetEvents
 
@@ -58,14 +59,26 @@ class MSG(Structure):
 
 
 def PumpWaitingMessages():
-    from ctypes import byref, windll
+    _user32 = WinDLL("user32")
+
+    _PeekMessageA = _user32.PeekMessageA
+    _PeekMessageA.argtypes = [POINTER(MSG), HWND, UINT, UINT, UINT]
+    _PeekMessageA.restype = BOOL
+
+    _TranslateMessage = _user32.TranslateMessage
+    _TranslateMessage.argtypes = [POINTER(MSG)]
+    _TranslateMessage.restype = BOOL
+
+    LRESULT = LPLONG
+    _DispatchMessageA = _user32.DispatchMessageA
+    _DispatchMessageA.argtypes = [POINTER(MSG)]
+    _DispatchMessageA.restype = LRESULT
 
-    user32 = windll.user32
     msg = MSG()
     PM_REMOVE = 0x0001
-    while user32.PeekMessageA(byref(msg), 0, 0, 0, PM_REMOVE):
-        user32.TranslateMessage(byref(msg))
-        user32.DispatchMessageA(byref(msg))
+    while _PeekMessageA(byref(msg), 0, 0, 0, PM_REMOVE):
+        _TranslateMessage(byref(msg))
+        _DispatchMessageA(byref(msg))
 
 
 class Test(ut.TestCase):

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_ienum.py

@@ -1,9 +1,9 @@
 import contextlib
 import unittest as ut
-
 from ctypes import POINTER
-from comtypes import GUID
+
 import comtypes.client
+from comtypes import GUID
 
 
 class Test_IEnum(ut.TestCase):

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_imfattributes.py

@@ -1,9 +1,9 @@
 import contextlib
 import unittest as ut
+from ctypes import HRESULT, POINTER, WinDLL, c_uint32, pointer
 
-from ctypes import POINTER, pointer, windll
-from comtypes import GUID
 import comtypes.client
+from comtypes import GUID
 
 
 class Test_IMFAttributes(ut.TestCase):
@@ -12,8 +12,18 @@ class Test_IMFAttributes(ut.TestCase):
             comtypes.client.GetModule("msvidctl.dll")
         from comtypes.gen import MSVidCtlLib
 
+        _mfplat = WinDLL("mfplat")
+
+        UINT32 = c_uint32
+        _MFCreateAttributes = _mfplat.MFCreateAttributes
+        _MFCreateAttributes.argtypes = [
+            POINTER(POINTER(MSVidCtlLib.IMFAttributes)),
+            UINT32,
+        ]
+        _MFCreateAttributes.restype = HRESULT
+
         imf_attrs = POINTER(MSVidCtlLib.IMFAttributes)()
-        hres = windll.mfplat.MFCreateAttributes(pointer(imf_attrs), 2)
+        hres = _MFCreateAttributes(pointer(imf_attrs), 2)
         self.assertEqual(hres, 0)
 
         MF_TRANSCODE_ADJUST_PROFILE = GUID("{9c37c21b-060f-487c-a690-80d7f50d1c72}")

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_inout_args.py

@@ -4,11 +4,18 @@ from typing import TYPE_CHECKING, Any, Callable, List, NamedTuple, Tuple, Type
 from unittest.mock import MagicMock
 
 import comtypes
+from comtypes import IUnknown
 from comtypes._memberspec import _fix_inout_args
-from comtypes.client import IUnknown
 
 if TYPE_CHECKING:
-    from comtypes._memberspec import _ArgSpecElmType
+    from comtypes import hints  # type: ignore
+
+    _ArgSpecType = Tuple[
+        hints.ArgSpecElmType,
+        hints.ArgSpecElmType,
+        hints.ArgSpecElmType,
+        hints.ArgSpecElmType,
+    ]
 
 WSTRING = c_wchar_p
 
@@ -259,7 +266,7 @@ class Test_ArgsKwargsCombinations(ut.TestCase):
 
 
 class PermutedArgspecTestingParams(NamedTuple):
-    argspec: "Tuple[_ArgSpecElmType, _ArgSpecElmType, _ArgSpecElmType, _ArgSpecElmType]"
+    argspec: "_ArgSpecType"
     args: Tuple[Any, Any, Any]
     orig_ret_val: Tuple[Any, Any, Any]
     fixed_ret_val: List[Any]

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_midl_safearray_create.py

@@ -1,13 +1,13 @@
 # coding: utf-8
 
-from ctypes import c_int, pointer, HRESULT, POINTER
 import unittest
+from ctypes import HRESULT, POINTER, c_int, pointer
 
 import comtypes
 import comtypes.safearray
+import comtypes.typeinfo
 from comtypes import CLSCTX_INPROC_SERVER, CLSCTX_LOCAL_SERVER
 from comtypes.client import CreateObject, GetModule
-import comtypes.typeinfo
 
 GetModule("UIAutomationCore.dll")
 from comtypes.gen.UIAutomationClient import CUIAutomation, IUIAutomation
@@ -16,8 +16,10 @@ ComtypesCppTestSrvLib_GUID = "{07D2AEE5-1DF8-4D2C-953A-554ADFD25F99}"
 
 try:
     GetModule((ComtypesCppTestSrvLib_GUID, 1, 0, 0))
-    from comtypes.gen.ComtypesCppTestSrvLib import StructRecordParamTest
-    from comtypes.gen.ComtypesCppTestSrvLib import IDispSafearrayParamTest
+    from comtypes.gen.ComtypesCppTestSrvLib import (
+        IDispSafearrayParamTest,
+        StructRecordParamTest,
+    )
 
     IMPORT_FAILED = False
 except (ImportError, OSError):

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_monikers.py

@@ -1,39 +1,53 @@
-from _ctypes import COMError
-from ctypes import byref, POINTER
 import contextlib
 import unittest
+from _ctypes import COMError
+from ctypes import HRESULT, POINTER, OleDLL, byref, c_wchar_p
+from ctypes.wintypes import DWORD
 
-import comtypes
-from comtypes.client import GetModule, CreateObject
-from comtypes import hresult, GUID
+from comtypes import GUID, hresult
+from comtypes.client import CreateObject, GetModule
 
 with contextlib.redirect_stdout(None):  # supress warnings
     GetModule("msvidctl.dll")
 from comtypes.gen import MSVidCtlLib as msvidctl
 from comtypes.gen.MSVidCtlLib import IBindCtx, IMoniker, IRunningObjectTable
 
-
 MKSYS_ITEMMONIKER = 4
 ROTFLAGS_ALLOWANYCLIENT = 1
+LPOLESTR = LPCOLESTR = c_wchar_p
+
+_ole32 = OleDLL("ole32")
+
+_CreateItemMoniker = _ole32.CreateItemMoniker
+_CreateItemMoniker.argtypes = [LPCOLESTR, LPCOLESTR, POINTER(POINTER(IMoniker))]
+_CreateItemMoniker.restype = HRESULT
+
+_CreateBindCtx = _ole32.CreateBindCtx
+_CreateBindCtx.argtypes = [DWORD, POINTER(POINTER(IBindCtx))]
+_CreateBindCtx.restype = HRESULT
+
+_GetRunningObjectTable = _ole32.GetRunningObjectTable
+_GetRunningObjectTable.argtypes = [DWORD, POINTER(POINTER(IRunningObjectTable))]
+_GetRunningObjectTable.restype = HRESULT
 
 
 def _create_item_moniker(delim: str, item: str) -> IMoniker:
     mon = POINTER(IMoniker)()
-    comtypes._ole32.CreateItemMoniker(delim, item, byref(mon))
+    _CreateItemMoniker(delim, item, byref(mon))
     return mon  # type: ignore
 
 
 def _create_bctx() -> IBindCtx:
     bctx = POINTER(IBindCtx)()
     # The first parameter is reserved and must be 0.
-    comtypes._ole32.CreateBindCtx(0, byref(bctx))
+    _CreateBindCtx(0, byref(bctx))
     return bctx  # type: ignore
 
 
 def _create_rot() -> IRunningObjectTable:
     rot = POINTER(IRunningObjectTable)()
     # The first parameter is reserved and must be 0.
-    comtypes._ole32.GetRunningObjectTable(0, byref(rot))
+    _GetRunningObjectTable(0, byref(rot))
     return rot  # type: ignore
 
 

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_msscript.py

@@ -1,8 +1,9 @@
 import unittest
 from ctypes import POINTER
+
+from comtypes import GUID
 from comtypes.automation import IDispatch
 from comtypes.client import CreateObject
-from comtypes import GUID
 
 ##from test import test_support
 ##from comtypes.unittests import support

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_npsupport.py

@@ -3,7 +3,7 @@ import functools
 import importlib
 import inspect
 import unittest
-from ctypes import c_long, c_double, pointer, POINTER
+from ctypes import POINTER, c_double, c_long, pointer
 from decimal import Decimal
 
 import comtypes._npsupport
@@ -11,13 +11,13 @@ from comtypes import IUnknown
 from comtypes._safearray import SafeArrayGetVartype
 from comtypes.automation import (
     BSTR,
+    VARIANT,
+    VARIANT_BOOL,
     VT_BSTR,
     VT_DATE,
     VT_I4,
-    _midlSAFEARRAY,
-    VARIANT,
     VT_VARIANT,
-    VARIANT_BOOL,
+    _midlSAFEARRAY,
 )
 from comtypes.safearray import safearray_as_ndarray
 

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_outparam.py

@@ -1,23 +1,26 @@
 import unittest
 from ctypes import (
+    HRESULT,
     POINTER,
+    OleDLL,
+    WinDLL,
     byref,
     c_int,
+    c_size_t,
     c_ulong,
     c_void_p,
     c_wchar,
     c_wchar_p,
     cast,
     memmove,
-    oledll,
     sizeof,
-    windll,
     wstring_at,
 )
+from ctypes.wintypes import DWORD, LPVOID
 from unittest.mock import patch
 
 from comtypes import COMMETHOD, GUID, IUnknown
-
+from comtypes.GUID import _CoTaskMemFree
 
 text_type = str
 
@@ -34,8 +37,21 @@ class IMalloc(IUnknown):
     ]
 
 
+_ole32 = OleDLL("ole32")
+
+_CoGetMalloc = _ole32.CoGetMalloc
+_CoGetMalloc.argtypes = [DWORD, POINTER(POINTER(IMalloc))]
+_CoGetMalloc.restype = HRESULT
+
+_ole32_nohresult = WinDLL("ole32")
+
+SIZE_T = c_size_t
+_CoTaskMemAlloc = _ole32_nohresult.CoTaskMemAlloc
+_CoTaskMemAlloc.argtypes = [SIZE_T]
+_CoTaskMemAlloc.restype = LPVOID
+
 malloc = POINTER(IMalloc)()
-oledll.ole32.CoGetMalloc(1, byref(malloc))
+_CoGetMalloc(1, byref(malloc))
 assert bool(malloc)
 
 
@@ -45,14 +61,14 @@ def from_outparm(self):
     result = wstring_at(self)
     if not malloc.DidAlloc(self):
         raise ValueError("memory was NOT allocated by CoTaskMemAlloc")
-    windll.ole32.CoTaskMemFree(self)
+    _CoTaskMemFree(self)
     return result
 
 
 def comstring(text, typ=c_wchar_p):
     text = text_type(text)
     size = (len(text) + 1) * sizeof(c_wchar)
-    mem = windll.ole32.CoTaskMemAlloc(size)
+    mem = _CoTaskMemAlloc(size)
     print("malloc'd 0x%x, %d bytes" % (mem, size))
     ptr = cast(mem, typ)
     memmove(mem, text, size)

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_persist.py

@@ -1,10 +1,8 @@
-from pathlib import Path
 import tempfile
 import unittest as ut
+from pathlib import Path
 
-from comtypes import CoCreateInstance, GUID, IPersist
-from comtypes import persist
-
+from comtypes import GUID, CoCreateInstance, IPersist, persist
 
 CLSID_ShellLink = GUID("{00021401-0000-0000-C000-000000000046}")
 

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_recordinfo.py

@@ -1,10 +1,10 @@
 # coding: utf-8
 
 import unittest
+from ctypes import byref, pointer, sizeof
 
 from comtypes import typeinfo
 from comtypes.client import GetModule
-from ctypes import byref, pointer, sizeof
 
 ComtypesCppTestSrvLib_GUID = "{07D2AEE5-1DF8-4D2C-953A-554ADFD25F99}"
 

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_safearray.py

@@ -129,7 +129,8 @@ class SafeArrayTestCase(unittest.TestCase):
         self.assertEqual(SafeArrayGetVartype(sa), VT_I4)
 
         # TypeError: len() of unsized object
-        self.assertRaises(TypeError, lambda: t.from_param(object()))
+        with self.assertRaises(TypeError):
+            t.from_param(object())
 
     def test_VT_VARIANT(self):
         t = _midlSAFEARRAY(VARIANT)

{comtypes-1.4.9 → comtypes-1.4.11}/comtypes/test/test_sapi.py

@@ -2,7 +2,10 @@
 # ../gen/_C866CA3A_32F7_11D2_9602_00C04F8EE628_0_5_0
 # http://thread.gmane.org/gmane.comp.python.ctypes.user/1485
 
-import os, unittest, tempfile
+import os
+import tempfile
+import unittest
+
 from comtypes.client import CreateObject