comtypes 1.4.9__zip → 1.4.10__zip

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_storage.py

@@ -1,19 +1,18 @@
-from _ctypes import COMError
-from ctypes import byref, c_ubyte, POINTER
 import contextlib
-from pathlib import Path
 import unittest
+from _ctypes import COMError
+from ctypes import HRESULT, POINTER, OleDLL, byref, c_ubyte
+from ctypes.wintypes import DWORD, PWCHAR
+from pathlib import Path
 
 import comtypes
 import comtypes.client
 
-
 with contextlib.redirect_stdout(None):  # supress warnings
     mod = comtypes.client.GetModule("msvidctl.dll")
 
 from comtypes.gen.MSVidCtlLib import IStorage
 
-
 STATFLAG_DEFAULT = 0
 STGC_DEFAULT = 0
 STGM_CREATE = 0x00001000
@@ -29,6 +28,13 @@ STREAM_SEEK_SET = 0
 STG_E_PATHNOTFOUND = -2147287038
 
 
+_ole32 = OleDLL("ole32")
+
+_StgCreateDocfile = _ole32.StgCreateDocfile
+_StgCreateDocfile.argtypes = [PWCHAR, DWORD, DWORD, POINTER(POINTER(IStorage))]
+_StgCreateDocfile.restype = HRESULT
+
+
 class Test_IStorage(unittest.TestCase):
     CREATE_DOC_FLAG = (
         STGM_DIRECT
@@ -44,7 +50,7 @@ class Test_IStorage(unittest.TestCase):
 
     def _create_docfile(self) -> IStorage:
         stg = POINTER(IStorage)()
-        comtypes._ole32.StgCreateDocfile(None, self.CREATE_DOC_FLAG, 0, byref(stg))
+        _StgCreateDocfile(None, self.CREATE_DOC_FLAG, 0, byref(stg))
         return stg  # type: ignore
 
     def test_CreateStream(self):

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_stream.py

@@ -1,23 +1,34 @@
 import unittest as ut
+from ctypes import HRESULT, POINTER, OleDLL, byref, c_ubyte, c_ulonglong, pointer
+from ctypes.wintypes import BOOL, HGLOBAL, ULARGE_INTEGER
 
-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
 
+_ole32 = OleDLL("ole32")
+
+_CreateStreamOnHGlobal = _ole32.CreateStreamOnHGlobal
+_CreateStreamOnHGlobal.argtypes = [HGLOBAL, BOOL, POINTER(POINTER(IStream))]
+_CreateStreamOnHGlobal.restype = HRESULT
+
+_shlwapi = OleDLL("shlwapi")
+
+_IStream_Size = _shlwapi.IStream_Size
+_IStream_Size.argtypes = [POINTER(IStream), POINTER(ULARGE_INTEGER)]
+_IStream_Size.restype = HRESULT
+
 
 def _create_stream() -> IStream:
     # Create an IStream
     stream = POINTER(IStream)()  # type: ignore
-    comtypes._ole32.CreateStreamOnHGlobal(None, c_bool(True), byref(stream))
+    _CreateStreamOnHGlobal(None, True, byref(stream))
     return stream  # type: ignore
 
 
@@ -92,7 +103,7 @@ class Test_SetSize(ut.TestCase):
         stream = _create_stream()
         stream.SetSize(42)
         pui = pointer(c_ulonglong())
-        oledll.shlwapi.IStream_Size(stream, pui)
+        _IStream_Size(stream, pui)
         self.assertEqual(pui.contents.value, 42)
 
 

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_subinterface.py

@@ -1,7 +1,9 @@
-import unittest, sys
-from comtypes import IUnknown, GUID
+import sys
+import unittest
 from ctypes import *
 
+from comtypes import GUID, IUnknown
+
 
 def test_main():
     from test import test_support

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_typeannotator.py

@@ -5,12 +5,11 @@ from comtypes.tools.codegenerator import typeannotator
 from comtypes.tools.tlbparser import (
     BSTR_type,
     HRESULT_type,
-    VARIANT_type,
     VARIANT_BOOL_type,
+    VARIANT_type,
     void_type,
 )
 
-
 iunknown_type = typedesc.ComInterface(
     "IUnknown", None, "{00000000-0000-0000-C000-000000000046}", ["hidden"], None
 )

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_typeinfo.py

@@ -1,15 +1,15 @@
-import os
+import ctypes
+import sys
 import unittest
-from ctypes import POINTER, byref
+
 from comtypes import GUID, COMError
-from comtypes.automation import DISPATCH_METHOD
 from comtypes.typeinfo import (
-    LoadTypeLibEx,
+    TKIND_DISPATCH,
+    TKIND_INTERFACE,
+    GetModuleFileName,
     LoadRegTypeLib,
+    LoadTypeLibEx,
     QueryPathOfRegTypeLib,
-    TKIND_INTERFACE,
-    TKIND_DISPATCH,
-    TKIND_ENUM,
 )
 
 
@@ -94,5 +94,17 @@ class Test(unittest.TestCase):
         self.assertEqual(guid, ti.GetTypeAttr().guid)
 
 
+class Test_GetModuleFileName(unittest.TestCase):
+    def test_null_handler(self):
+        self.assertEqual(GetModuleFileName(None, 260), sys.executable)
+
+    def test_loaded_module_handle(self):
+        import _ctypes
+
+        dll_path = _ctypes.__file__
+        hmodule = ctypes.WinDLL(dll_path)._handle
+        self.assertEqual(GetModuleFileName(hmodule, 260), dll_path)
+
+
 if __name__ == "__main__":
     unittest.main()

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_urlhistory.py

@@ -1,7 +1,10 @@
-import unittest, os
+import os
+import unittest
 from copy import copy
 from ctypes import *
-from comtypes.client import GetModule, CreateObject
+
+from comtypes.client import CreateObject, GetModule
+from comtypes.GUID import _CoTaskMemFree
 from comtypes.patcher import Patch
 
 # ./urlhist.tlb was downloaded somewhere from the internet (?)
@@ -23,8 +26,8 @@ class _(object):
         for n, _ in self._fields_:
             setattr(result, n, getattr(self, n))
         url, title = self.pwcsUrl, self.pwcsTitle
-        windll.ole32.CoTaskMemFree(cast_field(self, "pwcsUrl", c_void_p))
-        windll.ole32.CoTaskMemFree(cast_field(self, "pwcsTitle", c_void_p))
+        _CoTaskMemFree(cast_field(self, "pwcsUrl", c_void_p))
+        _CoTaskMemFree(cast_field(self, "pwcsTitle", c_void_p))
         return result
 
 

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_variant.py

@@ -293,9 +293,10 @@ def run_test(rep, msg, func=None, previous={}, results={}):
 
 
 def check_perf(rep=20000):
-    from ctypes import c_int, byref
-    from comtypes.automation import VARIANT
+    from ctypes import byref, c_int
+
     import comtypes.automation
+    from comtypes.automation import VARIANT
 
     print(comtypes.automation)
     variable = c_int()

{comtypes-1.4.9 → comtypes-1.4.10}/comtypes/test/test_word.py

@@ -1,8 +1,8 @@
 import time
 import unittest
 
-from comtypes import COMError
 import comtypes.client
+from comtypes import COMError
 
 try:
     comtypes.client.GetModule(