From 95c9e6e4e15eaf4e9dfffb5fd779fb35eb0aa705 Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 10 Nov 2022 12:41:53 -0500 Subject: [PATCH] Update pywin32 to 305 --- stubs/pywin32/@tests/stubtest_allowlist.txt | 2 -- stubs/pywin32/METADATA.toml | 2 +- stubs/pywin32/_win32typing.pyi | 3 +++ stubs/pywin32/win32/win32api.pyi | 2 +- stubs/pywin32/win32/win32event.pyi | 11 +++++++++++ stubs/pywin32/win32/win32gui.pyi | 2 ++ stubs/pywin32/win32/win32pipe.pyi | 3 +++ stubs/pywin32/win32comext/internet/internet.pyi | 11 +++++++++-- 8 files changed, 30 insertions(+), 6 deletions(-) diff --git a/stubs/pywin32/@tests/stubtest_allowlist.txt b/stubs/pywin32/@tests/stubtest_allowlist.txt index 84543ae7efd1..071d21fa207e 100644 --- a/stubs/pywin32/@tests/stubtest_allowlist.txt +++ b/stubs/pywin32/@tests/stubtest_allowlist.txt @@ -65,5 +65,3 @@ win32com(ext)?.axdebug.documents win32com(ext)?.axdebug.expressions # failed to import, ModuleNotFoundError: No module named 'expressions' win32com(ext)?.axdebug.stackframe -# failed to import, SystemError: CoInternetCreateSecurityManager() method: bad call flags -win32com(ext)?.internet.internet diff --git a/stubs/pywin32/METADATA.toml b/stubs/pywin32/METADATA.toml index 065ecdef0ffa..b2d4e9598153 100644 --- a/stubs/pywin32/METADATA.toml +++ b/stubs/pywin32/METADATA.toml @@ -1,4 +1,4 @@ -version = "304.*" +version = "305.*" [tool.stubtest] ignore_missing_stub = false # The library only works on Windows; we currently only run stubtest on Ubuntu for third-party stubs in CI. diff --git a/stubs/pywin32/_win32typing.pyi b/stubs/pywin32/_win32typing.pyi index 63ccbb0b10a3..cdfc27926e82 100644 --- a/stubs/pywin32/_win32typing.pyi +++ b/stubs/pywin32/_win32typing.pyi @@ -209,6 +209,9 @@ class PyCEHANDLE: ... class PyCERTSTORE: @property def HCERTSTORE(self): ... + # Flags argument is deprecated. + # The underlying function is now always called with `CERT_CLOSE_STORE_CHECK_FLAG`, + # and support for this param will be dropped at some point in the future. def CertCloseStore(self, Flags: int = ...) -> None: ... def CertControlStore(self, Flags, CtrlType, CtrlPara: int) -> None: ... def CertEnumCertificatesInStore(self) -> list[PyCERT_CONTEXT]: ... diff --git a/stubs/pywin32/win32/win32api.pyi b/stubs/pywin32/win32/win32api.pyi index 447409a5436b..e5acc93807fa 100644 --- a/stubs/pywin32/win32/win32api.pyi +++ b/stubs/pywin32/win32/win32api.pyi @@ -110,7 +110,7 @@ def GetSystemTime(): ... def GetTempFileName(path: str, prefix: str, nUnique): ... def GetTempPath() -> str: ... def GetThreadLocale(): ... -def GetTickCount(): ... +def GetTickCount() -> int: ... def GetTimeFormat(locale, flags, time: _win32typing.PyTime, _format: str) -> str: ... def GetTimeZoneInformation(times_as_tuples: bool = ...): ... def GetVersion(): ... diff --git a/stubs/pywin32/win32/win32event.pyi b/stubs/pywin32/win32/win32event.pyi index b552a45947a4..91c15ec83038 100644 --- a/stubs/pywin32/win32/win32event.pyi +++ b/stubs/pywin32/win32/win32event.pyi @@ -8,6 +8,12 @@ def CreateSemaphore( SemaphoreAttributes: _win32typing.PySECURITY_ATTRIBUTES, InitialCount, MaximumCount, SemaphoreName ) -> int: ... def CreateWaitableTimer(TimerAttributes: _win32typing.PySECURITY_ATTRIBUTES, ManualReset, TimerName) -> int: ... +def CreateWaitableTimerEx( + __lpTimerAttributes: _win32typing.PySECURITY_ATTRIBUTES | None, + __lpTimerName: str | None, + __dwFlags: int, + __dwDesiredAccess: int, +) -> _win32typing.PyHANDLE: ... def MsgWaitForMultipleObjects(handlelist: list[int], bWaitAll, milliseconds, wakeMask): ... def MsgWaitForMultipleObjectsEx(handlelist: list[int], milliseconds, wakeMask, waitFlags): ... def OpenEvent(desiredAccess, bInheritHandle, name: str) -> int: ... @@ -27,6 +33,8 @@ def WaitForSingleObjectEx(hHandle: int, milliseconds, bAlertable): ... def WaitForInputIdle(hProcess: int, milliseconds): ... def SignalObjectAndWait(*args, **kwargs): ... # incomplete +CREATE_WAITABLE_TIMER_HIGH_RESOLUTION: int +CREATE_WAITABLE_TIMER_MANUAL_RESET: int EVENT_ALL_ACCESS: int EVENT_MODIFY_STATE: int INFINITE: int @@ -44,6 +52,9 @@ QS_POSTMESSAGE: int QS_SENDMESSAGE: int QS_TIMER: int SYNCHRONIZE: int +TIMER_ALL_ACCESS: int +TIMER_MODIFY_STATE: int +TIMER_QUERY_STATE: int WAIT_ABANDONED: int WAIT_ABANDONED_0: int WAIT_FAILED: int diff --git a/stubs/pywin32/win32/win32gui.pyi b/stubs/pywin32/win32/win32gui.pyi index 8b4d893ac55f..b51e1e13a4c1 100644 --- a/stubs/pywin32/win32/win32gui.pyi +++ b/stubs/pywin32/win32/win32gui.pyi @@ -411,6 +411,8 @@ def EnumPropsEx(hWnd: int, EnumFunc, Param) -> None: ... def RegisterDeviceNotification(handle: int, _filter, flags) -> _win32typing.PyHDEVNOTIFY: ... def UnregisterDeviceNotification() -> None: ... def RegisterHotKey(hWnd: int, _id, Modifiers, vk) -> None: ... +def GetAncestor(__hwnd: int, __gaFlags: int) -> int: ... +def GetTopWindow(__hWnd: int | None) -> int: ... def ChildWindowFromPointEx(*args, **kwargs): ... # incomplete def CreateDialogIndirectParam(*args, **kwargs): ... # incomplete def DestroyAcceleratorTable(*args, **kwargs): ... # incomplete diff --git a/stubs/pywin32/win32/win32pipe.pyi b/stubs/pywin32/win32/win32pipe.pyi index 5e62224e8d26..1f5a9ab9a7bc 100644 --- a/stubs/pywin32/win32/win32pipe.pyi +++ b/stubs/pywin32/win32/win32pipe.pyi @@ -39,6 +39,9 @@ def popen2(*args, **kwargs): ... # incomplete def popen3(*args, **kwargs): ... # incomplete def popen4(*args, **kwargs): ... # incomplete +FILE_FLAG_FIRST_PIPE_INSTANCE: int +PIPE_ACCEPT_REMOTE_CLIENTS: int +PIPE_REJECT_REMOTE_CLIENTS: int NMPWAIT_NOWAIT: int NMPWAIT_USE_DEFAULT_WAIT: int NMPWAIT_WAIT_FOREVER: int diff --git a/stubs/pywin32/win32comext/internet/internet.pyi b/stubs/pywin32/win32comext/internet/internet.pyi index 2bfbaf6cf490..8fd6b38069fb 100644 --- a/stubs/pywin32/win32comext/internet/internet.pyi +++ b/stubs/pywin32/win32comext/internet/internet.pyi @@ -1,5 +1,3 @@ -# Can't generate with stubgen because: -# "SystemError: CoInternetCreateSecurityManager() method: bad call flags" import _win32typing def CoInternetCreateSecurityManager(reserved) -> _win32typing.PyIInternetSecurityManager: ... @@ -34,6 +32,15 @@ GET_FEATURE_FROM_THREAD_INTRANET: int GET_FEATURE_FROM_THREAD_LOCALMACHINE: int GET_FEATURE_FROM_THREAD_RESTRICTED: int GET_FEATURE_FROM_THREAD_TRUSTED: int +IID_IDocHostUIHandler: _win32typing.PyIID +IID_IHTMLOMWindowServices: _win32typing.PyIID +IID_IInternetBindInfo: _win32typing.PyIID +IID_IInternetPriority: _win32typing.PyIID +IID_IInternetProtocol: _win32typing.PyIID +IID_IInternetProtocolInfo: _win32typing.PyIID +IID_IInternetProtocolRoot: _win32typing.PyIID +IID_IInternetProtocolSink: _win32typing.PyIID +IID_IInternetSecurityManager: _win32typing.PyIID SET_FEATURE_IN_REGISTRY: int SET_FEATURE_ON_PROCESS: int SET_FEATURE_ON_THREAD: int