comtypes 1.3.0__zip → 1.4.0__zip

{comtypes-1.3.0 → comtypes-1.4.0}/CHANGES.txt

@@ -1,6 +1,18 @@
 Comtypes CHANGELOG
 ==================
 
+Release 1.4.0
+--------------
+* Add enumeration definitions in generated friendly modules. By @junkmd.
+* Add descriptions to ``index.rst`` about the enumeration types. By @junkmd.
+* Add GitHub Actions auto-test workflow. By @junkmd.
+
+Release 1.3.1
+--------------
+* Add type annotations to dynamically generated modules. By @junkmd.
+* Bring back Excel early-bind test. By @junkmd.
+* update ``README.md``. By @junkmd.
+
 Release 1.3.0
 --------------
  * Improve error message on non Windows environments. By @CristiFati.

{comtypes-1.3.0/comtypes.egg-info → comtypes-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comtypes
-Version: 1.3.0
+Version: 1.4.0
 Summary: Pure Python COM package
 Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
@@ -19,13 +19,14 @@ License-File: LICENSE.txt
 
 # comtypes
 
-[![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/comtypes)](https://pypi.org/project/comtypes/)
-[![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members)
+![Works on Windows only](https://img.shields.io/badge/-Windows-0078D6.svg?logo=windows&style=flat)  
+[![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/comtypes)](https://pypi.org/project/comtypes/)  
+[![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members)  
 [![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme)
 
 ## About
 
-`comtypes` is a lightweight `Python` COM package, based on the [`ctypes`](https://docs.python.org/library/ctypes.html) FFI library.
+`comtypes` is a lightweight `Python` [COM](https://learn.microsoft.com/en-us/windows/win32/com/component-object-model--com--portal) package, based on the [`ctypes`](https://docs.python.org/library/ctypes.html) FFI library.
 
 `comtypes` allows to define, call, and implement custom and dispatch-based COM interfaces in pure `Python`.
 
@@ -66,31 +67,6 @@ But these third-parties are not required as a prerequisite for runtime.
 Tracking issues, reporting bugs and contributing to the codebase and documentation are on GitHub at:
 https://github.com/enthought/comtypes
 
-<a id="ongoing-plans"></a>
-### Ongoing plans
-#### `GetModule` will also generate static typing for methods and properties
-`comtypes.client.GetModule` generates `Python` wrapper modules from a COM type library, containing interface classes, coclasses, constants, and structures. The `.py` files are generated in the `comtypes.gen` package.
-
-In the current `comtypes` specification, type checkers could not infer static type information from generated modules codebase, since methods and properties were mostly defined and implemented by metaclasses.  
-In future release, in generated modules, static typing will be added to part of methods and properties.
-
-Static type information is added only under [`if TYPE_CHECKING:`](https://docs.python.org/3/library/typing.html#typing.TYPE_CHECKING) blocks. Consequently, it will **not** override any methods defined with metaclasses at runtime, ensuring that the runtime behavior remains unchanged.
-
-Please refer to [the GitHub issue](https://github.com/enthought/comtypes/issues/400) for details.
-
-#### In friendly modules, the names that were used as aliases for `ctypes.c_int` will be used for enumeration types implemented with `enum`
-`comtypes.client.GetModule` generates two `Python` modules in the `comtypes.gen` package with a single call.
-
-A first wrapper module is created with a long name that is derived from the type library guid, version number and lcid. It contains interface classes, coclasses, constants, and structures.  
-A second friendly module is created with a shorter name derived from the type library name itself. It imports items from the wrapper module, and will be the module returned from `GetModule`.
-
-In the current `comtypes` specification, if a COM type kind is defined as an enumeration type, that type name is used as an alias for [`ctypes.c_int`](https://docs.python.org/3/library/ctypes.html#ctypes.c_int) in the wrapper module, and that symbol is imported into the friendly module.  
-In future release, in friendly modules, their names will no longer be aliases for `c_int`. Instead, they will be defined as enumerations implemented with [`enum`](https://docs.python.org/3/library/enum.html).
-
-When imported into the friendly module, the wrapper module will be aliased with an abstracted name (`__wrapper_module__`). This allows users to continue using the old definitions by modifying the import sections of their codebase.
-
-Please refer to [the GitHub issue](https://github.com/enthought/comtypes/issues/345) for details.
-
 ## For Enterprise
 
 Available as part of the Tidelift Subscription.

{comtypes-1.3.0 → comtypes-1.4.0}/README.md

@@ -1,12 +1,13 @@
 # comtypes
 
-[![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/comtypes)](https://pypi.org/project/comtypes/)
-[![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members)
+![Works on Windows only](https://img.shields.io/badge/-Windows-0078D6.svg?logo=windows&style=flat)  
+[![PyPI version](https://badge.fury.io/py/comtypes.svg)](https://pypi.org/project/comtypes/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - License](https://img.shields.io/pypi/l/comtypes)](https://pypi.org/project/comtypes/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/comtypes)](https://pypi.org/project/comtypes/)  
+[![GitHub Repo stars](https://img.shields.io/github/stars/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/stargazers) [![GitHub forks](https://img.shields.io/github/forks/enthought/comtypes?style=social)](https://github.com/enthought/comtypes/network/members)  
 [![Tidelift Subscription](https://tidelift.com/badges/package/pypi/comtypes)](https://tidelift.com/subscription/pkg/pypi-comtypes?utm_source=pypi-comtypes&utm_medium=readme)
 
 ## About
 
-`comtypes` is a lightweight `Python` COM package, based on the [`ctypes`](https://docs.python.org/library/ctypes.html) FFI library.
+`comtypes` is a lightweight `Python` [COM](https://learn.microsoft.com/en-us/windows/win32/com/component-object-model--com--portal) package, based on the [`ctypes`](https://docs.python.org/library/ctypes.html) FFI library.
 
 `comtypes` allows to define, call, and implement custom and dispatch-based COM interfaces in pure `Python`.
 
@@ -47,31 +48,6 @@ But these third-parties are not required as a prerequisite for runtime.
 Tracking issues, reporting bugs and contributing to the codebase and documentation are on GitHub at:
 https://github.com/enthought/comtypes
 
-<a id="ongoing-plans"></a>
-### Ongoing plans
-#### `GetModule` will also generate static typing for methods and properties
-`comtypes.client.GetModule` generates `Python` wrapper modules from a COM type library, containing interface classes, coclasses, constants, and structures. The `.py` files are generated in the `comtypes.gen` package.
-
-In the current `comtypes` specification, type checkers could not infer static type information from generated modules codebase, since methods and properties were mostly defined and implemented by metaclasses.  
-In future release, in generated modules, static typing will be added to part of methods and properties.
-
-Static type information is added only under [`if TYPE_CHECKING:`](https://docs.python.org/3/library/typing.html#typing.TYPE_CHECKING) blocks. Consequently, it will **not** override any methods defined with metaclasses at runtime, ensuring that the runtime behavior remains unchanged.
-
-Please refer to [the GitHub issue](https://github.com/enthought/comtypes/issues/400) for details.
-
-#### In friendly modules, the names that were used as aliases for `ctypes.c_int` will be used for enumeration types implemented with `enum`
-`comtypes.client.GetModule` generates two `Python` modules in the `comtypes.gen` package with a single call.
-
-A first wrapper module is created with a long name that is derived from the type library guid, version number and lcid. It contains interface classes, coclasses, constants, and structures.  
-A second friendly module is created with a shorter name derived from the type library name itself. It imports items from the wrapper module, and will be the module returned from `GetModule`.
-
-In the current `comtypes` specification, if a COM type kind is defined as an enumeration type, that type name is used as an alias for [`ctypes.c_int`](https://docs.python.org/3/library/ctypes.html#ctypes.c_int) in the wrapper module, and that symbol is imported into the friendly module.  
-In future release, in friendly modules, their names will no longer be aliases for `c_int`. Instead, they will be defined as enumerations implemented with [`enum`](https://docs.python.org/3/library/enum.html).
-
-When imported into the friendly module, the wrapper module will be aliased with an abstracted name (`__wrapper_module__`). This allows users to continue using the old definitions by modifying the import sections of their codebase.
-
-Please refer to [the GitHub issue](https://github.com/enthought/comtypes/issues/345) for details.
-
 ## For Enterprise
 
 Available as part of the Tidelift Subscription.

{comtypes-1.3.0 → comtypes-1.4.0}/comtypes/__init__.py

@@ -1,5 +1,5 @@
 # comtypes version numbers follow semver (http://semver.org/) and PEP 440
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 
 import atexit
 from ctypes import *

comtypes-1.4.0/comtypes/hints.pyi

@@ -0,0 +1,244 @@
+# This stub contains...
+# - symbols those what might occur recursive imports in runtime.
+# - utilities for type hints.
+import sys
+from typing import (
+    Any,
+    Callable,
+    Generic,
+    Iterator,
+    List,
+    NoReturn,
+    Tuple,
+    Type,
+    TypeVar,
+    Optional,
+    overload,
+    Union as _UnionT,
+)
+
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+else:
+    from typing_extensions import Protocol
+if sys.version_info >= (3, 10):
+    from typing import Concatenate, ParamSpec
+else:
+    from typing_extensions import Concatenate, ParamSpec
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
+from comtypes.automation import IDispatch as IDispatch, VARIANT as VARIANT
+from comtypes.server import IClassFactory as IClassFactory
+from comtypes.typeinfo import ITypeInfo as ITypeInfo
+
+class _MethodTypeDesc(Protocol):
+    arguments: List[Tuple[Any, str, List[str], Optional[Any]]]
+    idlflags: List[str]
+    name: str
+
+_P_Put = ParamSpec("_P_Put")
+_R_Put = TypeVar("_R_Put")
+_P_PutRef = ParamSpec("_P_PutRef")
+_R_PutRef = TypeVar("_R_PutRef")
+
+def put_or_putref(
+    put: Callable[_P_Put, _R_Put], putref: Callable[_P_PutRef, _R_PutRef]
+) -> _UnionT[Callable[_P_Put, _R_Put], Callable[_P_PutRef, _R_PutRef]]: ...
+
+_T_Inst = TypeVar("_T_Inst")
+_T_SetVal = TypeVar("_T_SetVal")
+_P_Get = ParamSpec("_P_Get")
+_R_Get = TypeVar("_R_Get")
+_P_Set = ParamSpec("_P_Set")
+
+class _GetSetNormalProperty(Generic[_T_Inst, _R_Get, _T_SetVal]):
+    fget: Callable[[_T_Inst], Any]
+    fset: Callable[[_T_Inst, _T_SetVal], Any]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]) -> _R_Get: ...
+    def __set__(self, instance: _T_Inst, value: _T_SetVal) -> None: ...
+
+class _GetOnlyNormalProperty(Generic[_T_Inst, _R_Get]):
+    fget: Callable[[_T_Inst], Any]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]) -> _R_Get: ...
+    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+
+class _SetOnlyNormalProperty(Generic[_T_Inst, _T_SetVal]):
+    fget: Callable[[_T_Inst], Any]
+    fset: Callable[[_T_Inst, _T_SetVal], Any]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]
+    ) -> NoReturn: ...
+    def __set__(self, instance: _T_Inst, value: _T_SetVal) -> None: ...
+
+@overload
+def normal_property(
+    fget: Callable[[_T_Inst], _R_Get],
+) -> _GetOnlyNormalProperty[_T_Inst, _R_Get]: ...
+@overload
+def normal_property(
+    *, fset: Callable[[_T_Inst, _T_SetVal], Any]
+) -> _SetOnlyNormalProperty[_T_Inst, _T_SetVal]: ...
+@overload
+def normal_property(
+    fget: Callable[[_T_Inst], _R_Get], fset: Callable[[_T_Inst, _T_SetVal], Any]
+) -> _GetSetNormalProperty[_T_Inst, _R_Get, _T_SetVal]: ...
+
+class _GetSetBoundNamedProperty(Generic[_T_Inst, _P_Get, _R_Get, _P_Set]):
+    name: str
+    fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
+    fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
+    __doc__: Optional[str]
+    def __getitem__(self, index: Any) -> _R_Get: ...
+    def __call__(self, *args: _P_Get.args, **kwargs: _P_Get.kwargs) -> _R_Get: ...
+    def __setitem__(self, index: Any, value: Any) -> None: ...
+    def __iter__(self) -> NoReturn: ...
+
+class _GetSetNamedProperty(Generic[_T_Inst, _P_Get, _R_Get, _P_Set]):
+    name: str
+    fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
+    fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
+    __doc__: Optional[str]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]
+    ) -> _GetSetBoundNamedProperty[_T_Inst, _P_Get, _R_Get, _P_Set]: ...
+    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+
+class _GetOnlyBoundNamedProperty(Generic[_T_Inst, _P_Get, _R_Get]):
+    name: str
+    fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
+    __doc__: Optional[str]
+    def __getitem__(self, index: Any) -> _R_Get: ...
+    def __call__(self, *args: _P_Get.args, **kwargs: _P_Get.kwargs) -> _R_Get: ...
+    def __setitem__(self, index: Any, value: Any) -> NoReturn: ...
+    def __iter__(self) -> NoReturn: ...
+
+class _GetOnlyNamedProperty(Generic[_T_Inst, _P_Get, _R_Get]):
+    name: str
+    fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
+    __doc__: Optional[str]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]
+    ) -> _GetOnlyBoundNamedProperty[_T_Inst, _P_Get, _R_Get]: ...
+    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+
+class _SetOnlyBoundNamedProperty(Generic[_T_Inst, _P_Set]):
+    name: str
+    fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
+    __doc__: Optional[str]
+    def __getitem__(self, index: Any) -> NoReturn: ...
+    def __call__(self, *args: Any, **kwargs: Any) -> NoReturn: ...
+    def __setitem__(self, index: Any, value: Any) -> None: ...
+    def __iter__(self) -> NoReturn: ...
+
+class _SetOnlyNamedProperty(Generic[_T_Inst, _P_Set]):
+    name: str
+    fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
+    __doc__: Optional[str]
+
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(
+        self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]
+    ) -> _SetOnlyBoundNamedProperty[_T_Inst, _P_Set]: ...
+    def __set__(self, instance: _T_Inst, value: Any) -> NoReturn: ...
+
+@overload
+def named_property(
+    name: str, fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get]
+) -> _GetOnlyNamedProperty[_T_Inst, _P_Get, _R_Get]: ...
+@overload
+def named_property(
+    name: str, *, fset: Callable[Concatenate[_T_Inst, _P_Set], Any]
+) -> _SetOnlyNamedProperty[_T_Inst, _P_Set]: ...
+@overload
+def named_property(
+    name: str,
+    fget: Callable[Concatenate[_T_Inst, _P_Get], _R_Get],
+    fset: Callable[Concatenate[_T_Inst, _P_Set], Any],
+) -> _GetSetNamedProperty[_T_Inst, _P_Get, _R_Get, _P_Set]: ...
+
+# for dunder methods those what be patched to ComInterface by metaclasses.
+
+class _Descriptor(Protocol[_T_Inst, _R_Get]):
+    @overload
+    def __get__(self, instance: None, owner: Type[_T_Inst]) -> Self: ...
+    @overload
+    def __get__(self, instance: _T_Inst, owner: Optional[Type[_T_Inst]]) -> _R_Get: ...
+
+# `__len__` for objects with `Count`
+@overload
+def to_dunder_len(count: _Descriptor[_T_Inst, int]) -> Callable[[_T_Inst], int]: ...
+@overload
+def to_dunder_len(count: Any) -> Callable[..., NoReturn]: ...
+
+# `__iter__` for objects with `_NewEnum`
+_T_E = TypeVar("_T_E")
+
+@overload
+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]: ...
+
+# ... for objects with `Item`
+# `__call__`
+@overload
+def to_dunder_call(
+    item: _UnionT[
+        _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]: ...
+
+# `__getitem__`
+@overload
+def to_dunder_getitem(
+    item: _UnionT[
+        _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]: ...
+
+# `__setitem__`
+@overload
+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.3.0 → comtypes-1.4.0}/comtypes/test/test_client.py

@@ -229,6 +229,15 @@ class Test_Constants(ut.TestCase):
         self.assertEqual(consts.TextCompare, Scripting.TextCompare)
         self.assertEqual(consts.DatabaseCompare, Scripting.DatabaseCompare)
 
+    def test_enums_in_friendly_mod(self):
+        consts = comtypes.client.Constants("scrrun.dll")
+        comtypes.client.GetModule("scrrun.dll")
+        from comtypes.gen import Scripting
+
+        for e in Scripting.StandardStreamTypes:
+            self.assertIn(e.name, consts.StandardStreamTypes)
+            self.assertEqual(consts.StandardStreamTypes[e.name], e.value)
+
     def test_returns_other_than_enum_members(self):
         obj = comtypes.client.CreateObject("SAPI.SpVoice")
         from comtypes.gen import SpeechLib as sapi

{comtypes-1.3.0 → comtypes-1.4.0}/comtypes/test/test_excel.py

@@ -2,6 +2,7 @@
 from __future__ import print_function
 
 import datetime
+import sys
 import unittest
 
 from comtypes.client import CreateObject, GetModule
@@ -112,10 +113,16 @@ class BaseBindTest(object):
         sh.Range[sh.Cells.Item[4, 1], sh.Cells.Item[6, 3]].Select()
 
 
+PY_VER = "Python {0}.{1}.{2}".format(*sys.version_info[:3])
+
+
 @unittest.skipIf(IMPORT_FAILED, "This depends on Excel.")
-@unittest.skip(
-    "There is difference of `Range.Value` behavior "
-    "between Python >= 3.8.x and Python <= 3.7.x."
+@unittest.skipIf(
+    sys.version_info[:2] == (3, 8)
+    or sys.version_info[:2] == (3, 9)
+    or (sys.version_info[:2] == (3, 10) and sys.version_info < (3, 10, 10))
+    or (sys.version_info[:2] == (3, 11) and sys.version_info < (3, 11, 2)),
+    f"This fails in {PY_VER}. See https://github.com/enthought/comtypes/issues/212",
 )
 class Test_EarlyBind(BaseBindTest, unittest.TestCase):
     dynamic = False

{comtypes-1.3.0 → comtypes-1.4.0}/comtypes/tools/codegenerator.py

@@ -22,7 +22,7 @@ import io
 
 import comtypes
 from comtypes import typeinfo
-from comtypes.tools import tlbparser, typedesc
+from comtypes.tools import tlbparser, typedesc, typeannotator
 
 
 version = comtypes.__version__
@@ -423,12 +423,14 @@ class CodeGenerator(object):
         self.stream = io.StringIO()
         self.imports = ImportedNamespaces()
         self.declarations = DeclaredNamespaces()
+        self.enums = EnumerationNamespaces()
         self._to_type_name = TypeNamer()
         self.known_symbols = known_symbols or {}
 
         self.done = set()  # type descriptions that have been generated
         self.names = set()  # names that have been generated
         self.externals = []  # typelibs imported to generated module
+        self.aliases: Dict[str, str] = {}
         self.last_item_class = False
 
     def generate(self, item):
@@ -561,18 +563,17 @@ class CodeGenerator(object):
             print("# -*- coding: mbcs -*-", file=output)
             print(file=output)
         print(self.imports.getvalue(), file=output)
+        print("from typing import TYPE_CHECKING", file=output)
+        print(file=output)
+        print("if TYPE_CHECKING:", file=output)
+        print("    from typing import Any, Tuple", file=output)
+        print("    from comtypes import hints", file=output)
+        print(file=output)
         print(file=output)
         print(self.declarations.getvalue(), file=output)
         print(file=output)
         print(self.stream.getvalue(), file=output)
-        names = ", ".join(repr(str(n)) for n in self.names)
-        dunder_all = "__all__ = [%s]" % names
-        if len(dunder_all) > 80:
-            wrapper = textwrap.TextWrapper(
-                subsequent_indent="    ", initial_indent="    ", break_long_words=False
-            )
-            dunder_all = "__all__ = [\n%s\n]" % "\n".join(wrapper.wrap(names))
-        print(dunder_all, file=output)
+        print(self._make_dunder_all_part(), file=output)
         print(file=output)
         if tlib_mtime is not None:
             print("_check_version(%r, %f)" % (version, tlib_mtime), file=output)
@@ -589,29 +590,59 @@ class CodeGenerator(object):
         Such as "comtypes.gen.stdole" and "comtypes.gen.Excel".
         """
         output = io.StringIO()
+        print("from enum import IntFlag", file=output)
+        print(file=output)
         print(f"import {modname} as __wrapper_module__", file=output)
-        txtwrapper = textwrap.TextWrapper(
-            subsequent_indent="    ", initial_indent="    ", break_long_words=False
-        )
-        importing_symbols = set(self.names)
-        importing_symbols.update(self.imports.get_symbols())
-        importing_symbols.update(self.declarations.get_symbols())
-        joined_names = ", ".join(str(n) for n in importing_symbols)
-        symbols = f"from {modname} import {joined_names}"
-        if len(symbols) > 80:
-            wrapped_names = "\n".join(txtwrapper.wrap(joined_names))
-            symbols = f"from {modname} import (\n{wrapped_names}\n)"
-        print(symbols, file=output)
+        print(self._make_friendly_module_import_part(modname), file=output)
         print(file=output)
         print(file=output)
-        quoted_names = ", ".join(repr(str(n)) for n in self.names)
-        dunder_all = f"__all__ = [{quoted_names}]"
-        if len(dunder_all) > 80:
-            wrapped_quoted_names = "\n".join(txtwrapper.wrap(quoted_names))
-            dunder_all = f"__all__ = [\n{wrapped_quoted_names}\n]"
-        print(dunder_all, file=output)
+        print(self.enums.getvalue(), file=output)
+        print(file=output)
+        print(file=output)
+        enum_aliases = self.enum_aliases
+        if enum_aliases:
+            for k, v in enum_aliases.items():
+                print(f"{k} = {v}", file=output)
+            print(file=output)
+            print(file=output)
+        print(self._make_dunder_all_part(), file=output)
         return output.getvalue()
 
+    def _make_dunder_all_part(self) -> str:
+        joined_names = ", ".join(repr(str(n)) for n in self.names)
+        dunder_all = f"__all__ = [{joined_names}]"
+        if len(dunder_all) > 80:
+            txtwrapper = textwrap.TextWrapper(
+                subsequent_indent="    ", initial_indent="    ", break_long_words=False
+            )
+            joined_names = "\n".join(txtwrapper.wrap(joined_names))
+            dunder_all = f"__all__ = [\n{joined_names}\n]"
+        return dunder_all
+
+    def _make_friendly_module_import_part(self, modname: str) -> str:
+        # The `modname` is the wrapper module name like `comtypes.gen._xxxx..._x_x_x`
+        txtwrapper = textwrap.TextWrapper(
+            subsequent_indent="    ", initial_indent="    ", break_long_words=False
+        )
+        symbols = set(self.names)
+        symbols.update(self.imports.get_symbols())
+        symbols.update(self.declarations.get_symbols())
+        symbols -= set(self.enums.get_symbols())
+        symbols -= set(self.enum_aliases)
+        joined_names = ", ".join(str(n) for n in symbols)
+        part = f"from {modname} import {joined_names}"
+        if len(part) > 80:
+            txtwrapper = textwrap.TextWrapper(
+                subsequent_indent="    ", initial_indent="    ", break_long_words=False
+            )
+            joined_names = "\n".join(txtwrapper.wrap(joined_names))
+            part = f"from {modname} import (\n{joined_names}\n)"
+        return part
+
+    @property
+    def enum_aliases(self) -> Dict[str, str]:
+        return {k: v for k, v in self.aliases.items() if v in self.enums}
+
     def need_VARIANT_imports(self, value):
         text = repr(value)
         if "Decimal(" in text:
@@ -639,6 +670,8 @@ class CodeGenerator(object):
                 print("# Fixing keyword as EnumValue for %s" % tp.name)
         tp_name = self._to_type_name(tp)
         print("%s = %d" % (tp_name, value), file=self.stream)
+        if tp.enumeration.name:
+            self.enums.add(tp.enumeration.name, tp_name)
         self.names.add(tp_name)
 
     def Enumeration(self, tp: typedesc.Enumeration) -> None:
@@ -647,10 +680,6 @@ class CodeGenerator(object):
             print("# values for enumeration '%s'" % tp.name, file=self.stream)
         else:
             print("# values for unnamed enumeration", file=self.stream)
-        # Some enumerations have the same name for the enum type
-        # and an enum value.  Excel's XlDisplayShapes is such an example.
-        # Since we don't have separate namespaces for the type and the values,
-        # we generate the TYPE last, overwriting the value. XXX
         for item in tp.values:
             self.generate(item)
         if tp.name:
@@ -669,6 +698,7 @@ class CodeGenerator(object):
                 self.declarations.add(tp.name, definition)
             else:
                 print("%s = %s" % (tp.name, definition), file=self.stream)
+                self.aliases[tp.name] = definition
                 self.last_item_class = False
         self.names.add(tp.name)
 
@@ -1100,6 +1130,12 @@ class CodeGenerator(object):
             print("            return item", file=self.stream)
             print("        raise IndexError(index)", file=self.stream)
 
+        annotaions = typeannotator.ComInterfaceMembersAnnotator(head.itf).generate()
+        if annotaions:
+            print(file=self.stream)
+            print("    if TYPE_CHECKING:  # commembers", file=self.stream)
+            print(annotaions, file=self.stream, end="")
+
         print(file=self.stream)
         print(file=self.stream)
 
@@ -1221,6 +1257,13 @@ class CodeGenerator(object):
         print("    _iid_ = GUID(%r)" % head.itf.iid, file=self.stream)
         print("    _idlflags_ = %s" % head.itf.idlflags, file=self.stream)
         print("    _methods_ = []", file=self.stream)
+
+        annotaions = typeannotator.DispInterfaceMembersAnnotator(head.itf).generate()
+        if annotaions:
+            print(file=self.stream)
+            print("    if TYPE_CHECKING:  # dispmembers", file=self.stream)
+            print(annotaions, file=self.stream, end="")
+
         print(file=self.stream)
         print(file=self.stream)
 
@@ -1499,3 +1542,45 @@ class DeclaredNamespaces(object):
                 code = code + "  # %s" % comment
             lines.append(code)
         return "\n".join(lines)
+
+
+class EnumerationNamespaces(object):
+    def __init__(self):
+        self.data: Dict[str, List[str]] = {}
+
+    def add(self, enum_name: str, member_name: str) -> None:
+        """Adds a namespace will be enumeration and its member.
+
+        Examples:
+            >>> enums = EnumerationNamespaces()
+            >>> enums.add('Foo', 'ham')
+            >>> enums.add('Foo', 'spam')
+            >>> enums.add('Bar', 'bacon')
+            >>> assert 'Foo' in enums
+            >>> assert 'Baz' not in enums
+            >>> print(enums.getvalue())  # <BLANKLINE> is necessary for doctest
+            class Foo(IntFlag):
+                ham = __wrapper_module__.ham
+                spam = __wrapper_module__.spam
+            <BLANKLINE>
+            <BLANKLINE>
+            class Bar(IntFlag):
+                bacon = __wrapper_module__.bacon
+        """
+        self.data.setdefault(enum_name, []).append(member_name)
+
+    def __contains__(self, item: str) -> bool:
+        return item in self.data
+
+    def get_symbols(self) -> Set[str]:
+        return set(self.data)
+
+    def getvalue(self) -> str:
+        blocks = []
+        for enum_name, enum_members in self.data.items():
+            lines = []
+            lines.append(f"class {enum_name}(IntFlag):")
+            for member_name in enum_members:
+                lines.append(f"    {member_name} = __wrapper_module__.{member_name}")
+            blocks.append("\n".join(lines))
+        return "\n\n\n".join(blocks)