Small fixes for importing ctypes symbols. (#797)

* `TYPE_CHECKING`: `_Pointer`

* Add `_CArrayType` to `stream` as a `TYPE_CHECKING` only symbol.

* Adjust importing `create_unicode_buffer` in `typeinfo.py`.

* Replace `ctypes.create_unicode_buffer` with `create_unicode_buffer` in `typeinfo.py`.

Author: junkmd

comtypes/_post_coinit/misc.py

@@ -3,7 +3,6 @@
     POINTER,
     OleDLL,
     Structure,
-    _Pointer,
     byref,
     c_ulong,
     c_ushort,
@@ -20,6 +19,8 @@
 from comtypes._post_coinit.unknwn import IUnknown
 
 if TYPE_CHECKING:
+    from ctypes import _Pointer
+
     from comtypes import hints as hints  # noqa  # type: ignore
 
 

comtypes/server/inprocserver.py

@@ -2,11 +2,14 @@
 import logging
 import sys
 import winreg
-from typing import Any, Literal, Optional, Type
+from typing import TYPE_CHECKING, Any, Literal, Optional, Type
 
 from comtypes import GUID, COMObject, IUnknown, hresult
 from comtypes.server import IClassFactory
 
+if TYPE_CHECKING:
+    from ctypes import _Pointer
+
 logger = logging.getLogger(__name__)
 _debug = logger.debug
 _critical = logger.critical
@@ -24,8 +27,8 @@ def __init__(self, cls: Type[COMObject]) -> None:
     def IClassFactory_CreateInstance(
         self,
         this: Any,
-        punkOuter: Optional[Type["ctypes._Pointer[IUnknown]"]],
-        riid: "ctypes._Pointer[GUID]",
+        punkOuter: Optional[Type["_Pointer[IUnknown]"]],
+        riid: "_Pointer[GUID]",
         ppv: ctypes.c_void_p,
     ) -> int:
         _debug("ClassFactory.CreateInstance(%s)", riid[0])

comtypes/stream.py

@@ -1,8 +1,11 @@
-from ctypes import HRESULT, POINTER, Array, c_ubyte, c_ulong, pointer
+from ctypes import HRESULT, POINTER, c_ubyte, c_ulong, pointer
 from typing import TYPE_CHECKING, Tuple
 
 from comtypes import COMMETHOD, GUID, IUnknown
 
+if TYPE_CHECKING:
+    from ctypes import Array as _CArrayType
+
 
 class ISequentialStream(IUnknown):
     """Defines methods for the stream objects in sequence."""
@@ -38,7 +41,7 @@ class ISequentialStream(IUnknown):
         ),
     ]
 
-    def RemoteRead(self, cb: int) -> Tuple["Array[c_ubyte]", int]:
+    def RemoteRead(self, cb: int) -> Tuple["_CArrayType[c_ubyte]", int]:
         """Reads a specified number of bytes from the stream object into memory
         starting at the current seek pointer.
         """
@@ -51,7 +54,7 @@ def RemoteRead(self, cb: int) -> Tuple["Array[c_ubyte]", int]:
 
     if TYPE_CHECKING:
 
-        def RemoteWrite(self, pv: "Array[c_ubyte]", cb: int) -> int:
+        def RemoteWrite(self, pv: "_CArrayType[c_ubyte]", cb: int) -> int:
             """Writes a specified number of bytes into the stream object starting at
             the current seek pointer.
             """

comtypes/typeinfo.py

@@ -11,11 +11,11 @@
     POINTER,
     OleDLL,
     WinDLL,
-    _Pointer,
     byref,
     c_int,
     c_void_p,
     c_wchar_p,
+    create_unicode_buffer,
 )
 from ctypes.wintypes import (
     DWORD,
@@ -57,6 +57,8 @@
 )
 
 if TYPE_CHECKING:
+    from ctypes import _Pointer
+
     from comtypes import hints  # type: ignore
 
 
@@ -278,8 +280,6 @@ def IsName(self, name: str, lHashVal: int = 0) -> Optional[str]:
         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
@@ -768,7 +768,7 @@ def GetModuleFileName(handle: Optional[int], maxsize: int) -> str:
 
     https://learn.microsoft.com/ja-jp/windows/win32/api/libloaderapi/nf-libloaderapi-loadlibraryw
     """
-    buf = ctypes.create_unicode_buffer(maxsize)
+    buf = create_unicode_buffer(maxsize)
     length = _GetModuleFileNameW(handle, buf, maxsize)
     return buf.value[:length]