From 8bc20e741523fc432ac9b4fc5f8c6a946a9b57a1 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 8 Oct 2024 04:12:04 -0400 Subject: [PATCH] Bump pywin32 to 307 (#12742) --- .../@tests/stubtest_allowlist_win32.txt | 27 +- stubs/pywin32/METADATA.toml | 2 +- stubs/pywin32/_win32typing.pyi | 20 +- stubs/pywin32/afxres.pyi | 1 - stubs/pywin32/isapi/simple.pyi | 4 +- stubs/pywin32/isapi/threaded_extension.pyi | 2 - stubs/pywin32/win32/_wincerapi.pyi | 73 --- stubs/pywin32/win32/lib/afxres.pyi | 499 ------------------ stubs/pywin32/win32/lib/pywintypes.pyi | 5 +- stubs/pywin32/win32/lib/regutil.pyi | 1 - stubs/pywin32/win32/lib/win32evtlogutil.pyi | 3 +- stubs/pywin32/win32/lib/win32timezone.pyi | 6 +- stubs/pywin32/win32/lib/winnt.pyi | 7 +- stubs/pywin32/win32/win32api.pyi | 10 +- stubs/pywin32/win32/win32cred.pyi | 6 + stubs/pywin32/win32/win32gui.pyi | 17 +- stubs/pywin32/win32/win32service.pyi | 2 +- stubs/pywin32/win32/winxpgui.pyi | 9 +- .../win32com/axscript/client/debug.pyi | 1 + .../win32com/axscript/client/framework.pyi | 1 + .../win32com/axscript/server/error.pyi | 1 - stubs/pywin32/win32com/client/__init__.pyi | 6 +- stubs/pywin32/win32com/client/dynamic.pyi | 19 +- stubs/pywin32/win32com/server/connect.pyi | 3 - stubs/pywin32/win32com/server/dispatcher.pyi | 3 - stubs/pywin32/win32com/server/exception.pyi | 2 - stubs/pywin32/win32com/server/policy.pyi | 10 - stubs/pywin32/win32com/server/util.pyi | 2 - stubs/pywin32/win32com/universal.pyi | 5 +- stubs/pywin32/win32comext/adsi/__init__.pyi | 4 + stubs/pywin32/win32comext/axdebug/adb.pyi | 5 +- .../win32comext/axdebug/codecontainer.pyi | 5 +- .../pywin32/win32comext/axdebug/contexts.pyi | 3 +- .../pywin32/win32comext/axdebug/debugger.pyi | 4 +- .../pywin32/win32comext/axdebug/documents.pyi | 8 +- .../win32comext/axdebug/expressions.pyi | 2 - .../win32comext/axdebug/stackframe.pyi | 2 - stubs/pywin32/win32comext/axdebug/util.pyi | 7 +- .../win32comext/axscript/client/debug.pyi | 42 ++ .../win32comext/axscript/client/error.pyi | 32 +- .../win32comext/axscript/client/framework.pyi | 154 ++++++ .../win32comext/axscript/client/pyscript.pyi | 3 - .../win32comext/axscript/server/error.pyi | 6 - stubs/pywin32/win32comext/mapi/mapi.pyi | 9 + stubs/pywin32/win32comext/mapi/mapiutil.pyi | 13 +- stubs/pywin32/win32comext/shell/shell.pyi | 1 + stubs/pywin32/win32comext/shell/shellcon.pyi | 14 + 47 files changed, 341 insertions(+), 720 deletions(-) delete mode 100644 stubs/pywin32/afxres.pyi delete mode 100644 stubs/pywin32/win32/_wincerapi.pyi delete mode 100644 stubs/pywin32/win32/lib/afxres.pyi create mode 100644 stubs/pywin32/win32com/axscript/client/debug.pyi create mode 100644 stubs/pywin32/win32com/axscript/client/framework.pyi delete mode 100644 stubs/pywin32/win32com/axscript/server/error.pyi create mode 100644 stubs/pywin32/win32comext/axscript/client/debug.pyi create mode 100644 stubs/pywin32/win32comext/axscript/client/framework.pyi delete mode 100644 stubs/pywin32/win32comext/axscript/client/pyscript.pyi delete mode 100644 stubs/pywin32/win32comext/axscript/server/error.pyi diff --git a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt index eb913dba2..f091f0d03 100644 --- a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt +++ b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt @@ -1,7 +1,9 @@ # Not available at runtime. Contains type definitions that are otherwise not exposed _win32typing +# The exchdapi hasn't been built in years https://github.com/mhammond/pywin32/pull/2374 win32com(ext)?.mapi._exchdapi -win32._wincerapi +# Internal variable for deprecation message https://github.com/mhammond/pywin32/pull/2380 +win32com.server.dispatcher.DispatcherWin32dbg_deprecation_message # PyWin tool / debugger pythonwin.start_pythonwin @@ -29,10 +31,8 @@ win32com.server.localserver win32com.server.register win32com.servers.* # Active X Scripts -win32com(ext)?.axscript.client.framework win32com(ext)?.axscript.client.pyscript_rexec -# "pyscript.pyi" is necessary for mypy to not fail due to missing stub -win32com(ext)?.axscript.client.pyscript.* +win32com(ext)?.axscript.client.pyscript win32com(ext)?.axscript.client.scriptdispatch # Other scripts isapi.install @@ -44,18 +44,21 @@ win32com.test.* win32com(ext)?.axdebug.codecontainer win32com(ext)?.axdebug.dump win32com(ext)?.axdebug.debugger -win32com(ext)?.axscript.client.debug win32com(ext)?.axscript.client.pydumper win32com(ext)?.directsound.test.* # Deprecated and makes a buffer of random junk. Use something like `b"\x00" * bufferSize` instead # It's safer to not even expose this method as deprecated. -(win32.)?win(32|xp)gui.PyMakeBuffer +(win32.)?win32gui.PyMakeBuffer -# Axdebug is not built on Python 3.11 anyway: https://github.com/mhammond/pywin32/blob/main/setup.py#L403-L405 +# failed to import, ImportError: circular import https://github.com/mhammond/pywin32/pull/2381 +win32com.axscript.client.error +win32com.axscript.client.framework + +# Axdebug is not built on Python 3.11 anyway: https://github.com/mhammond/pywin32/blob/main/setup.py#L398-L402 # # failed to import, ImportError: DLL load failed while importing axdebug: The specified module could not be found. -win32com.axdebug.axdebug +win32com(ext)?.axdebug.axdebug win32com(ext)?.axdebug.codecontainer # failed to import, ModuleNotFoundError: No module named 'gateways' win32com(ext)?.axdebug.contexts @@ -66,7 +69,7 @@ win32com(ext)?.axdebug.expressions # failed to import, ModuleNotFoundError: No module named 'expressions' win32com(ext)?.axdebug.stackframe # failed to import, ImportError: cannot import name 'axdebug' from 'win32com.axdebug' -win32com.axdebug.gateways -win32comext.axdebug.gateways -# failed to import, ModuleNotFoundError: No module named 'win32comext.axdebug.axdebug' -win32comext.axdebug.axdebug +win32com(ext)?.axdebug.gateways +win32com(ext)?.axscript.client.debug +win32com(ext)?.axscript.client.error +win32com(ext)?.axscript.client.framework diff --git a/stubs/pywin32/METADATA.toml b/stubs/pywin32/METADATA.toml index 70aee5df3..1c4dc9a65 100644 --- a/stubs/pywin32/METADATA.toml +++ b/stubs/pywin32/METADATA.toml @@ -1,4 +1,4 @@ -version = "306.*" +version = "307.*" upstream_repository = "https://github.com/mhammond/pywin32" [tool.stubtest] diff --git a/stubs/pywin32/_win32typing.pyi b/stubs/pywin32/_win32typing.pyi index c80e822b0..3903be7e3 100644 --- a/stubs/pywin32/_win32typing.pyi +++ b/stubs/pywin32/_win32typing.pyi @@ -1,7 +1,7 @@ # Not available at runtime. Contains type definitions that are otherwise not exposed and not part of a specific module. from _typeshed import Incomplete, Unused from collections.abc import Iterable, Sequence -from typing import Literal, SupportsIndex, final, overload +from typing import Literal, NoReturn, SupportsIndex, final, overload from typing_extensions import Self, TypeAlias, deprecated from win32.lib.pywintypes import TimeType @@ -3658,6 +3658,23 @@ class PyIFileOperation: def PerformOperations(self) -> None: ... def GetAnyOperationsAborted(self): ... +class PyIFolderView: + def GetCurrentViewMode(self): ... + def SetCurrentViewMode(self, ViewMode: int, /): ... + def GetFolder(self, riid: PyIID | None, /): ... + def Item(self, iItemIndex: int, /): ... + def ItemCount(self, uFlags: int, /): ... + def Items(self) -> NoReturn: ... # Not Implemented + def GetSelectionMarkedItem(self): ... + def GetFocusedItem(self): ... + def GetItemPosition(self, pidl: PyIDL | None, /): ... + def GetSpacing(self, pt_x: int, pt_y: int, /): ... + def GetDefaultSpacing(self): ... + def GetAutoArrange(self): ... + def SelectItem(self, iItem: int, dwFlags: int, /): ... + def SelectAndPositionItems(self) -> NoReturn: ... # Not Implemented + def SelectAndPositionItem(self, apidl: PyIDL | None, pt: tuple[int, int], dwFlags: int, /): ... + class PyIIdentityName: ... class PyIInitializeWithFile: @@ -3911,6 +3928,7 @@ class PyIMsgServiceAdmin: class PyIMsgStore: def OpenEntry(self, entryId: str, iid: PyIID, flags, /): ... + def StoreLogoff(self, flags: int, /): ... def GetReceiveFolder(self, messageClass: str | None = ..., flags: int = ..., /) -> tuple[PyIID, str]: ... def GetReceiveFolderTable(self, flags, /) -> PyIMAPITable: ... def CompareEntryIDs(self, entryId: str, entryId1: str, flags: int = ..., /): ... diff --git a/stubs/pywin32/afxres.pyi b/stubs/pywin32/afxres.pyi deleted file mode 100644 index 0d3239c03..000000000 --- a/stubs/pywin32/afxres.pyi +++ /dev/null @@ -1 +0,0 @@ -from win32.lib.afxres import * diff --git a/stubs/pywin32/isapi/simple.pyi b/stubs/pywin32/isapi/simple.pyi index 7e9bc1b38..594f30bcd 100644 --- a/stubs/pywin32/isapi/simple.pyi +++ b/stubs/pywin32/isapi/simple.pyi @@ -1,12 +1,10 @@ -from _typeshed import Incomplete - class SimpleExtension: def GetExtensionVersion(self, vi) -> None: ... def HttpExtensionProc(self, control_block) -> None: ... def TerminateExtension(self, status) -> None: ... class SimpleFilter: - filter_flags: Incomplete + filter_flags: int | None def GetFilterVersion(self, fv) -> None: ... def HttpFilterProc(self, fc) -> None: ... def TerminateFilter(self, status) -> None: ... diff --git a/stubs/pywin32/isapi/threaded_extension.pyi b/stubs/pywin32/isapi/threaded_extension.pyi index 502351d2e..0a463a647 100644 --- a/stubs/pywin32/isapi/threaded_extension.pyi +++ b/stubs/pywin32/isapi/threaded_extension.pyi @@ -2,8 +2,6 @@ import threading from _typeshed import Incomplete import isapi.simple -from isapi import ExtensionError as ExtensionError, isapicon as isapicon -from win32event import INFINITE as INFINITE ISAPI_REQUEST: int ISAPI_SHUTDOWN: int diff --git a/stubs/pywin32/win32/_wincerapi.pyi b/stubs/pywin32/win32/_wincerapi.pyi deleted file mode 100644 index d5152b9e5..000000000 --- a/stubs/pywin32/win32/_wincerapi.pyi +++ /dev/null @@ -1,73 +0,0 @@ -from _typeshed import Incomplete - -import _win32typing - -def CeRapiInit() -> None: ... -def CeRapiUninit() -> None: ... -def CreateProcess( - appName: str | None, - commandLine: str, - processAttributes: _win32typing.PySECURITY_ATTRIBUTES | None, - threadAttributes: _win32typing.PySECURITY_ATTRIBUTES | None, - bInheritHandles: int | bool, - dwCreationFlags: int, - newEnvironment: dict[str, str] | None, - currentDirectory: str | None, - startupinfo: _win32typing.PySTARTUPINFO, - /, -) -> tuple[int, int, Incomplete, Incomplete]: ... -def CeRapiInitEx(): ... -def CeCopyFile(_from: str, to: str, bFailIfExists, /) -> None: ... -def CeCheckPassword(password: str, /) -> None: ... -def CeCreateFile( - fileName: str, - desiredAccess, - shareMode, - attributes: _win32typing.PySECURITY_ATTRIBUTES, - creationDisposition, - flagsAndAttributes, - hTemplateFile: int, - /, -) -> _win32typing.PyCEHANDLE: ... -def CeDeleteFile(fileName: str, /) -> None: ... -def CeMoveFile(existingFileName: str, newFileName: str, /) -> None: ... -def CeCreateDirectory(name: str, sa: _win32typing.PySECURITY_ATTRIBUTES, /) -> None: ... -def CeRemoveDirectory(lpPathName: str, /) -> None: ... -def CeGetTempPath() -> str: ... -def CeGetSystemInfo(): ... -def CeGetDesktopDeviceCaps(): ... -def CeGetSystemMetrics(): ... -def CeGetSpecialFolderPath() -> str: ... -def CeGetStoreInformation() -> tuple[Incomplete, Incomplete]: ... -def CeGetSystemPowerStatusEx(): ... -def CeSHCreateShortcut() -> None: ... -def CeSHGetShortcutTarget(): ... -def CeGetVersionEx() -> tuple[Incomplete, Incomplete, Incomplete, Incomplete, str]: ... -def CeGlobalMemoryStatus(): ... -def FindFiles(fileSpec: str, /): ... -def CeGetFileAttributes(fileName: str, /): ... -def CeSetFileAttributes(filename: str, newAttributes, /) -> None: ... -def CeGetFileSize(): ... -def CeReadFile(hFile: int, bufSize, /) -> str: ... -def WriteFile(hFile: int, data: str | bytes | _win32typing.PyOVERLAPPEDReadBuffer, /) -> tuple[int, int]: ... - -CSIDL_BITBUCKET = ... -CSIDL_COMMON_DESKTOPDIRECTORY = ... -CSIDL_COMMON_PROGRAMS = ... -CSIDL_COMMON_STARTMENU = ... -CSIDL_COMMON_STARTUP = ... -CSIDL_CONTROLS = ... -CSIDL_DESKTOP = ... -CSIDL_DESKTOPDIRECTORY = ... -CSIDL_DRIVES = ... -CSIDL_FONTS = ... -CSIDL_NETHOOD = ... -CSIDL_NETWORK = ... -CSIDL_PERSONAL = ... -CSIDL_PRINTERS = ... -CSIDL_PROGRAMS = ... -CSIDL_RECENT = ... -CSIDL_SENDTO = ... -CSIDL_STARTMENU = ... -CSIDL_STARTUP = ... -CSIDL_TEMPLATES = ... diff --git a/stubs/pywin32/win32/lib/afxres.pyi b/stubs/pywin32/win32/lib/afxres.pyi deleted file mode 100644 index 58a208695..000000000 --- a/stubs/pywin32/win32/lib/afxres.pyi +++ /dev/null @@ -1,499 +0,0 @@ -from _typeshed import Incomplete - -TCS_MULTILINE: int -CBRS_ALIGN_LEFT: int -CBRS_ALIGN_TOP: int -CBRS_ALIGN_RIGHT: int -CBRS_ALIGN_BOTTOM: int -CBRS_ALIGN_ANY: int -CBRS_BORDER_LEFT: int -CBRS_BORDER_TOP: int -CBRS_BORDER_RIGHT: int -CBRS_BORDER_BOTTOM: int -CBRS_BORDER_ANY: int -CBRS_TOOLTIPS: int -CBRS_FLYBY: int -CBRS_FLOAT_MULTI: int -CBRS_BORDER_3D: int -CBRS_HIDE_INPLACE: int -CBRS_SIZE_DYNAMIC: int -CBRS_SIZE_FIXED: int -CBRS_FLOATING: int -CBRS_GRIPPER: int -CBRS_ORIENT_HORZ: Incomplete -CBRS_ORIENT_VERT: Incomplete -CBRS_ORIENT_ANY: Incomplete -CBRS_ALL: int -CBRS_NOALIGN: int -CBRS_LEFT: Incomplete -CBRS_TOP: Incomplete -CBRS_RIGHT: Incomplete -CBRS_BOTTOM: Incomplete -SBPS_NORMAL: int -SBPS_NOBORDERS: int -SBPS_POPOUT: int -SBPS_OWNERDRAW: int -SBPS_DISABLED: int -SBPS_STRETCH: int -ID_INDICATOR_EXT: int -ID_INDICATOR_CAPS: int -ID_INDICATOR_NUM: int -ID_INDICATOR_SCRL: int -ID_INDICATOR_OVR: int -ID_INDICATOR_REC: int -ID_INDICATOR_KANA: int -ID_SEPARATOR: int -AFX_IDW_CONTROLBAR_FIRST: int -AFX_IDW_CONTROLBAR_LAST: int -AFX_IDW_TOOLBAR: int -AFX_IDW_STATUS_BAR: int -AFX_IDW_PREVIEW_BAR: int -AFX_IDW_RESIZE_BAR: int -AFX_IDW_DOCKBAR_TOP: int -AFX_IDW_DOCKBAR_LEFT: int -AFX_IDW_DOCKBAR_RIGHT: int -AFX_IDW_DOCKBAR_BOTTOM: int -AFX_IDW_DOCKBAR_FLOAT: int - -def AFX_CONTROLBAR_MASK(nIDC): ... - -AFX_IDW_PANE_FIRST: int -AFX_IDW_PANE_LAST: int -AFX_IDW_HSCROLL_FIRST: int -AFX_IDW_VSCROLL_FIRST: int -AFX_IDW_SIZE_BOX: int -AFX_IDW_PANE_SAVE: int -AFX_IDS_APP_TITLE: int -AFX_IDS_IDLEMESSAGE: int -AFX_IDS_HELPMODEMESSAGE: int -AFX_IDS_APP_TITLE_EMBEDDING: int -AFX_IDS_COMPANY_NAME: int -AFX_IDS_OBJ_TITLE_INPLACE: int -ID_FILE_NEW: int -ID_FILE_OPEN: int -ID_FILE_CLOSE: int -ID_FILE_SAVE: int -ID_FILE_SAVE_AS: int -ID_FILE_PAGE_SETUP: int -ID_FILE_PRINT_SETUP: int -ID_FILE_PRINT: int -ID_FILE_PRINT_DIRECT: int -ID_FILE_PRINT_PREVIEW: int -ID_FILE_UPDATE: int -ID_FILE_SAVE_COPY_AS: int -ID_FILE_SEND_MAIL: int -ID_FILE_MRU_FIRST: int -ID_FILE_MRU_FILE1: int -ID_FILE_MRU_FILE2: int -ID_FILE_MRU_FILE3: int -ID_FILE_MRU_FILE4: int -ID_FILE_MRU_FILE5: int -ID_FILE_MRU_FILE6: int -ID_FILE_MRU_FILE7: int -ID_FILE_MRU_FILE8: int -ID_FILE_MRU_FILE9: int -ID_FILE_MRU_FILE10: int -ID_FILE_MRU_FILE11: int -ID_FILE_MRU_FILE12: int -ID_FILE_MRU_FILE13: int -ID_FILE_MRU_FILE14: int -ID_FILE_MRU_FILE15: int -ID_FILE_MRU_FILE16: int -ID_FILE_MRU_LAST: int -ID_EDIT_CLEAR: int -ID_EDIT_CLEAR_ALL: int -ID_EDIT_COPY: int -ID_EDIT_CUT: int -ID_EDIT_FIND: int -ID_EDIT_PASTE: int -ID_EDIT_PASTE_LINK: int -ID_EDIT_PASTE_SPECIAL: int -ID_EDIT_REPEAT: int -ID_EDIT_REPLACE: int -ID_EDIT_SELECT_ALL: int -ID_EDIT_UNDO: int -ID_EDIT_REDO: int -ID_WINDOW_NEW: int -ID_WINDOW_ARRANGE: int -ID_WINDOW_CASCADE: int -ID_WINDOW_TILE_HORZ: int -ID_WINDOW_TILE_VERT: int -ID_WINDOW_SPLIT: int -AFX_IDM_WINDOW_FIRST: int -AFX_IDM_WINDOW_LAST: int -AFX_IDM_FIRST_MDICHILD: int -ID_APP_ABOUT: int -ID_APP_EXIT: int -ID_HELP_INDEX: int -ID_HELP_FINDER: int -ID_HELP_USING: int -ID_CONTEXT_HELP: int -ID_HELP: int -ID_DEFAULT_HELP: int -ID_NEXT_PANE: int -ID_PREV_PANE: int -ID_FORMAT_FONT: int -ID_OLE_INSERT_NEW: int -ID_OLE_EDIT_LINKS: int -ID_OLE_EDIT_CONVERT: int -ID_OLE_EDIT_CHANGE_ICON: int -ID_OLE_EDIT_PROPERTIES: int -ID_OLE_VERB_FIRST: int -ID_OLE_VERB_LAST: int -AFX_ID_PREVIEW_CLOSE: int -AFX_ID_PREVIEW_NUMPAGE: int -AFX_ID_PREVIEW_NEXT: int -AFX_ID_PREVIEW_PREV: int -AFX_ID_PREVIEW_PRINT: int -AFX_ID_PREVIEW_ZOOMIN: int -AFX_ID_PREVIEW_ZOOMOUT: int -ID_VIEW_TOOLBAR: int -ID_VIEW_STATUS_BAR: int -ID_RECORD_FIRST: int -ID_RECORD_LAST: int -ID_RECORD_NEXT: int -ID_RECORD_PREV: int -IDC_STATIC: int -AFX_IDS_SCFIRST: int -AFX_IDS_SCSIZE: int -AFX_IDS_SCMOVE: int -AFX_IDS_SCMINIMIZE: int -AFX_IDS_SCMAXIMIZE: int -AFX_IDS_SCNEXTWINDOW: int -AFX_IDS_SCPREVWINDOW: int -AFX_IDS_SCCLOSE: int -AFX_IDS_SCRESTORE: int -AFX_IDS_SCTASKLIST: int -AFX_IDS_MDICHILD: int -AFX_IDS_DESKACCESSORY: int -AFX_IDS_OPENFILE: int -AFX_IDS_SAVEFILE: int -AFX_IDS_ALLFILTER: int -AFX_IDS_UNTITLED: int -AFX_IDS_SAVEFILECOPY: int -AFX_IDS_PREVIEW_CLOSE: int -AFX_IDS_UNNAMED_FILE: int -AFX_IDS_ABOUT: int -AFX_IDS_HIDE: int -AFX_IDP_NO_ERROR_AVAILABLE: int -AFX_IDS_NOT_SUPPORTED_EXCEPTION: int -AFX_IDS_RESOURCE_EXCEPTION: int -AFX_IDS_MEMORY_EXCEPTION: int -AFX_IDS_USER_EXCEPTION: int -AFX_IDS_PRINTONPORT: int -AFX_IDS_ONEPAGE: int -AFX_IDS_TWOPAGE: int -AFX_IDS_PRINTPAGENUM: int -AFX_IDS_PREVIEWPAGEDESC: int -AFX_IDS_PRINTDEFAULTEXT: int -AFX_IDS_PRINTDEFAULT: int -AFX_IDS_PRINTFILTER: int -AFX_IDS_PRINTCAPTION: int -AFX_IDS_PRINTTOFILE: int -AFX_IDS_OBJECT_MENUITEM: int -AFX_IDS_EDIT_VERB: int -AFX_IDS_ACTIVATE_VERB: int -AFX_IDS_CHANGE_LINK: int -AFX_IDS_AUTO: int -AFX_IDS_MANUAL: int -AFX_IDS_FROZEN: int -AFX_IDS_ALL_FILES: int -AFX_IDS_SAVE_MENU: int -AFX_IDS_UPDATE_MENU: int -AFX_IDS_SAVE_AS_MENU: int -AFX_IDS_SAVE_COPY_AS_MENU: int -AFX_IDS_EXIT_MENU: int -AFX_IDS_UPDATING_ITEMS: int -AFX_IDS_METAFILE_FORMAT: int -AFX_IDS_DIB_FORMAT: int -AFX_IDS_BITMAP_FORMAT: int -AFX_IDS_LINKSOURCE_FORMAT: int -AFX_IDS_EMBED_FORMAT: int -AFX_IDS_PASTELINKEDTYPE: int -AFX_IDS_UNKNOWNTYPE: int -AFX_IDS_RTF_FORMAT: int -AFX_IDS_TEXT_FORMAT: int -AFX_IDS_INVALID_CURRENCY: int -AFX_IDS_INVALID_DATETIME: int -AFX_IDS_INVALID_DATETIMESPAN: int -AFX_IDP_INVALID_FILENAME: int -AFX_IDP_FAILED_TO_OPEN_DOC: int -AFX_IDP_FAILED_TO_SAVE_DOC: int -AFX_IDP_ASK_TO_SAVE: int -AFX_IDP_FAILED_TO_CREATE_DOC: int -AFX_IDP_FILE_TOO_LARGE: int -AFX_IDP_FAILED_TO_START_PRINT: int -AFX_IDP_FAILED_TO_LAUNCH_HELP: int -AFX_IDP_INTERNAL_FAILURE: int -AFX_IDP_COMMAND_FAILURE: int -AFX_IDP_FAILED_MEMORY_ALLOC: int -AFX_IDP_PARSE_INT: int -AFX_IDP_PARSE_REAL: int -AFX_IDP_PARSE_INT_RANGE: int -AFX_IDP_PARSE_REAL_RANGE: int -AFX_IDP_PARSE_STRING_SIZE: int -AFX_IDP_PARSE_RADIO_BUTTON: int -AFX_IDP_PARSE_BYTE: int -AFX_IDP_PARSE_UINT: int -AFX_IDP_PARSE_DATETIME: int -AFX_IDP_PARSE_CURRENCY: int -AFX_IDP_FAILED_INVALID_FORMAT: int -AFX_IDP_FAILED_INVALID_PATH: int -AFX_IDP_FAILED_DISK_FULL: int -AFX_IDP_FAILED_ACCESS_READ: int -AFX_IDP_FAILED_ACCESS_WRITE: int -AFX_IDP_FAILED_IO_ERROR_READ: int -AFX_IDP_FAILED_IO_ERROR_WRITE: int -AFX_IDP_STATIC_OBJECT: int -AFX_IDP_FAILED_TO_CONNECT: int -AFX_IDP_SERVER_BUSY: int -AFX_IDP_BAD_VERB: int -AFX_IDP_FAILED_TO_NOTIFY: int -AFX_IDP_FAILED_TO_LAUNCH: int -AFX_IDP_ASK_TO_UPDATE: int -AFX_IDP_FAILED_TO_UPDATE: int -AFX_IDP_FAILED_TO_REGISTER: int -AFX_IDP_FAILED_TO_AUTO_REGISTER: int -AFX_IDP_FAILED_TO_CONVERT: int -AFX_IDP_GET_NOT_SUPPORTED: int -AFX_IDP_SET_NOT_SUPPORTED: int -AFX_IDP_ASK_TO_DISCARD: int -AFX_IDP_FAILED_TO_CREATE: int -AFX_IDP_FAILED_MAPI_LOAD: int -AFX_IDP_INVALID_MAPI_DLL: int -AFX_IDP_FAILED_MAPI_SEND: int -AFX_IDP_FILE_NONE: int -AFX_IDP_FILE_GENERIC: int -AFX_IDP_FILE_NOT_FOUND: int -AFX_IDP_FILE_BAD_PATH: int -AFX_IDP_FILE_TOO_MANY_OPEN: int -AFX_IDP_FILE_ACCESS_DENIED: int -AFX_IDP_FILE_INVALID_FILE: int -AFX_IDP_FILE_REMOVE_CURRENT: int -AFX_IDP_FILE_DIR_FULL: int -AFX_IDP_FILE_BAD_SEEK: int -AFX_IDP_FILE_HARD_IO: int -AFX_IDP_FILE_SHARING: int -AFX_IDP_FILE_LOCKING: int -AFX_IDP_FILE_DISKFULL: int -AFX_IDP_FILE_EOF: int -AFX_IDP_ARCH_NONE: int -AFX_IDP_ARCH_GENERIC: int -AFX_IDP_ARCH_READONLY: int -AFX_IDP_ARCH_ENDOFFILE: int -AFX_IDP_ARCH_WRITEONLY: int -AFX_IDP_ARCH_BADINDEX: int -AFX_IDP_ARCH_BADCLASS: int -AFX_IDP_ARCH_BADSCHEMA: int -AFX_IDS_OCC_SCALEUNITS_PIXELS: int -AFX_IDS_STATUS_FONT: int -AFX_IDS_TOOLTIP_FONT: int -AFX_IDS_UNICODE_FONT: int -AFX_IDS_MINI_FONT: int -AFX_IDP_SQL_FIRST: int -AFX_IDP_SQL_CONNECT_FAIL: int -AFX_IDP_SQL_RECORDSET_FORWARD_ONLY: int -AFX_IDP_SQL_EMPTY_COLUMN_LIST: int -AFX_IDP_SQL_FIELD_SCHEMA_MISMATCH: int -AFX_IDP_SQL_ILLEGAL_MODE: int -AFX_IDP_SQL_MULTIPLE_ROWS_AFFECTED: int -AFX_IDP_SQL_NO_CURRENT_RECORD: int -AFX_IDP_SQL_NO_ROWS_AFFECTED: int -AFX_IDP_SQL_RECORDSET_READONLY: int -AFX_IDP_SQL_SQL_NO_TOTAL: int -AFX_IDP_SQL_ODBC_LOAD_FAILED: int -AFX_IDP_SQL_DYNASET_NOT_SUPPORTED: int -AFX_IDP_SQL_SNAPSHOT_NOT_SUPPORTED: int -AFX_IDP_SQL_API_CONFORMANCE: int -AFX_IDP_SQL_SQL_CONFORMANCE: int -AFX_IDP_SQL_NO_DATA_FOUND: int -AFX_IDP_SQL_ROW_UPDATE_NOT_SUPPORTED: int -AFX_IDP_SQL_ODBC_V2_REQUIRED: int -AFX_IDP_SQL_NO_POSITIONED_UPDATES: int -AFX_IDP_SQL_LOCK_MODE_NOT_SUPPORTED: int -AFX_IDP_SQL_DATA_TRUNCATED: int -AFX_IDP_SQL_ROW_FETCH: int -AFX_IDP_SQL_INCORRECT_ODBC: int -AFX_IDP_SQL_UPDATE_DELETE_FAILED: int -AFX_IDP_SQL_DYNAMIC_CURSOR_NOT_SUPPORTED: int -AFX_IDP_DAO_FIRST: int -AFX_IDP_DAO_ENGINE_INITIALIZATION: int -AFX_IDP_DAO_DFX_BIND: int -AFX_IDP_DAO_OBJECT_NOT_OPEN: int -AFX_IDP_DAO_ROWTOOSHORT: int -AFX_IDP_DAO_BADBINDINFO: int -AFX_IDP_DAO_COLUMNUNAVAILABLE: int -AFX_IDC_LISTBOX: int -AFX_IDC_CHANGE: int -AFX_IDC_PRINT_DOCNAME: int -AFX_IDC_PRINT_PRINTERNAME: int -AFX_IDC_PRINT_PORTNAME: int -AFX_IDC_PRINT_PAGENUM: int -ID_APPLY_NOW: int -ID_WIZBACK: int -ID_WIZNEXT: int -ID_WIZFINISH: int -AFX_IDC_TAB_CONTROL: int -AFX_IDD_FILEOPEN: int -AFX_IDD_FILESAVE: int -AFX_IDD_FONT: int -AFX_IDD_COLOR: int -AFX_IDD_PRINT: int -AFX_IDD_PRINTSETUP: int -AFX_IDD_FIND: int -AFX_IDD_REPLACE: int -AFX_IDD_NEWTYPEDLG: int -AFX_IDD_PRINTDLG: int -AFX_IDD_PREVIEW_TOOLBAR: int -AFX_IDD_PREVIEW_SHORTTOOLBAR: int -AFX_IDD_INSERTOBJECT: int -AFX_IDD_CHANGEICON: int -AFX_IDD_CONVERT: int -AFX_IDD_PASTESPECIAL: int -AFX_IDD_EDITLINKS: int -AFX_IDD_FILEBROWSE: int -AFX_IDD_BUSY: int -AFX_IDD_OBJECTPROPERTIES: int -AFX_IDD_CHANGESOURCE: int -AFX_IDC_CONTEXTHELP: int -AFX_IDC_MAGNIFY: int -AFX_IDC_SMALLARROWS: int -AFX_IDC_HSPLITBAR: int -AFX_IDC_VSPLITBAR: int -AFX_IDC_NODROPCRSR: int -AFX_IDC_TRACKNWSE: int -AFX_IDC_TRACKNESW: int -AFX_IDC_TRACKNS: int -AFX_IDC_TRACKWE: int -AFX_IDC_TRACK4WAY: int -AFX_IDC_MOVE4WAY: int -AFX_IDB_MINIFRAME_MENU: int -AFX_IDB_CHECKLISTBOX_NT: int -AFX_IDB_CHECKLISTBOX_95: int -AFX_IDR_PREVIEW_ACCEL: int -AFX_IDI_STD_MDIFRAME: int -AFX_IDI_STD_FRAME: int -AFX_IDC_FONTPROP: int -AFX_IDC_FONTNAMES: int -AFX_IDC_FONTSTYLES: int -AFX_IDC_FONTSIZES: int -AFX_IDC_STRIKEOUT: int -AFX_IDC_UNDERLINE: int -AFX_IDC_SAMPLEBOX: int -AFX_IDC_COLOR_BLACK: int -AFX_IDC_COLOR_WHITE: int -AFX_IDC_COLOR_RED: int -AFX_IDC_COLOR_GREEN: int -AFX_IDC_COLOR_BLUE: int -AFX_IDC_COLOR_YELLOW: int -AFX_IDC_COLOR_MAGENTA: int -AFX_IDC_COLOR_CYAN: int -AFX_IDC_COLOR_GRAY: int -AFX_IDC_COLOR_LIGHTGRAY: int -AFX_IDC_COLOR_DARKRED: int -AFX_IDC_COLOR_DARKGREEN: int -AFX_IDC_COLOR_DARKBLUE: int -AFX_IDC_COLOR_LIGHTBROWN: int -AFX_IDC_COLOR_DARKMAGENTA: int -AFX_IDC_COLOR_DARKCYAN: int -AFX_IDC_COLORPROP: int -AFX_IDC_SYSTEMCOLORS: int -AFX_IDC_PROPNAME: int -AFX_IDC_PICTURE: int -AFX_IDC_BROWSE: int -AFX_IDC_CLEAR: int -AFX_IDD_PROPPAGE_COLOR: int -AFX_IDD_PROPPAGE_FONT: int -AFX_IDD_PROPPAGE_PICTURE: int -AFX_IDB_TRUETYPE: int -AFX_IDS_PROPPAGE_UNKNOWN: int -AFX_IDS_COLOR_DESKTOP: int -AFX_IDS_COLOR_APPWORKSPACE: int -AFX_IDS_COLOR_WNDBACKGND: int -AFX_IDS_COLOR_WNDTEXT: int -AFX_IDS_COLOR_MENUBAR: int -AFX_IDS_COLOR_MENUTEXT: int -AFX_IDS_COLOR_ACTIVEBAR: int -AFX_IDS_COLOR_INACTIVEBAR: int -AFX_IDS_COLOR_ACTIVETEXT: int -AFX_IDS_COLOR_INACTIVETEXT: int -AFX_IDS_COLOR_ACTIVEBORDER: int -AFX_IDS_COLOR_INACTIVEBORDER: int -AFX_IDS_COLOR_WNDFRAME: int -AFX_IDS_COLOR_SCROLLBARS: int -AFX_IDS_COLOR_BTNFACE: int -AFX_IDS_COLOR_BTNSHADOW: int -AFX_IDS_COLOR_BTNTEXT: int -AFX_IDS_COLOR_BTNHIGHLIGHT: int -AFX_IDS_COLOR_DISABLEDTEXT: int -AFX_IDS_COLOR_HIGHLIGHT: int -AFX_IDS_COLOR_HIGHLIGHTTEXT: int -AFX_IDS_REGULAR: int -AFX_IDS_BOLD: int -AFX_IDS_ITALIC: int -AFX_IDS_BOLDITALIC: int -AFX_IDS_SAMPLETEXT: int -AFX_IDS_DISPLAYSTRING_FONT: int -AFX_IDS_DISPLAYSTRING_COLOR: int -AFX_IDS_DISPLAYSTRING_PICTURE: int -AFX_IDS_PICTUREFILTER: int -AFX_IDS_PICTYPE_UNKNOWN: int -AFX_IDS_PICTYPE_NONE: int -AFX_IDS_PICTYPE_BITMAP: int -AFX_IDS_PICTYPE_METAFILE: int -AFX_IDS_PICTYPE_ICON: int -AFX_IDS_COLOR_PPG: int -AFX_IDS_COLOR_PPG_CAPTION: int -AFX_IDS_FONT_PPG: int -AFX_IDS_FONT_PPG_CAPTION: int -AFX_IDS_PICTURE_PPG: int -AFX_IDS_PICTURE_PPG_CAPTION: int -AFX_IDS_PICTUREBROWSETITLE: int -AFX_IDS_BORDERSTYLE_0: int -AFX_IDS_BORDERSTYLE_1: int -AFX_IDS_VERB_EDIT: int -AFX_IDS_VERB_PROPERTIES: int -AFX_IDP_PICTURECANTOPEN: int -AFX_IDP_PICTURECANTLOAD: int -AFX_IDP_PICTURETOOLARGE: int -AFX_IDP_PICTUREREADFAILED: int -AFX_IDP_E_ILLEGALFUNCTIONCALL: int -AFX_IDP_E_OVERFLOW: int -AFX_IDP_E_OUTOFMEMORY: int -AFX_IDP_E_DIVISIONBYZERO: int -AFX_IDP_E_OUTOFSTRINGSPACE: int -AFX_IDP_E_OUTOFSTACKSPACE: int -AFX_IDP_E_BADFILENAMEORNUMBER: int -AFX_IDP_E_FILENOTFOUND: int -AFX_IDP_E_BADFILEMODE: int -AFX_IDP_E_FILEALREADYOPEN: int -AFX_IDP_E_DEVICEIOERROR: int -AFX_IDP_E_FILEALREADYEXISTS: int -AFX_IDP_E_BADRECORDLENGTH: int -AFX_IDP_E_DISKFULL: int -AFX_IDP_E_BADRECORDNUMBER: int -AFX_IDP_E_BADFILENAME: int -AFX_IDP_E_TOOMANYFILES: int -AFX_IDP_E_DEVICEUNAVAILABLE: int -AFX_IDP_E_PERMISSIONDENIED: int -AFX_IDP_E_DISKNOTREADY: int -AFX_IDP_E_PATHFILEACCESSERROR: int -AFX_IDP_E_PATHNOTFOUND: int -AFX_IDP_E_INVALIDPATTERNSTRING: int -AFX_IDP_E_INVALIDUSEOFNULL: int -AFX_IDP_E_INVALIDFILEFORMAT: int -AFX_IDP_E_INVALIDPROPERTYVALUE: int -AFX_IDP_E_INVALIDPROPERTYARRAYINDEX: int -AFX_IDP_E_SETNOTSUPPORTEDATRUNTIME: int -AFX_IDP_E_SETNOTSUPPORTED: int -AFX_IDP_E_NEEDPROPERTYARRAYINDEX: int -AFX_IDP_E_SETNOTPERMITTED: int -AFX_IDP_E_GETNOTSUPPORTEDATRUNTIME: int -AFX_IDP_E_GETNOTSUPPORTED: int -AFX_IDP_E_PROPERTYNOTFOUND: int -AFX_IDP_E_INVALIDCLIPBOARDFORMAT: int -AFX_IDP_E_INVALIDPICTURE: int -AFX_IDP_E_PRINTERERROR: int -AFX_IDP_E_CANTSAVEFILETOTEMP: int -AFX_IDP_E_SEARCHTEXTNOTFOUND: int -AFX_IDP_E_REPLACEMENTSTOOLONG: int diff --git a/stubs/pywin32/win32/lib/pywintypes.pyi b/stubs/pywin32/win32/lib/pywintypes.pyi index be2ecba41..395e911dd 100644 --- a/stubs/pywin32/win32/lib/pywintypes.pyi +++ b/stubs/pywin32/win32/lib/pywintypes.pyi @@ -4,7 +4,7 @@ from _typeshed import Incomplete from collections.abc import Sequence from datetime import datetime from typing import ClassVar, Final, NoReturn, SupportsInt, overload -from typing_extensions import Never, TypeAlias, deprecated +from typing_extensions import Never, deprecated import _win32typing @@ -16,8 +16,6 @@ class error(Exception): class com_error(Exception): ... -UnicodeType: TypeAlias = str - class HANDLEType: def __init__(self, *args: Never) -> NoReturn: ... @property @@ -34,7 +32,6 @@ class TimeType(datetime): # aka: PyTime, PyDateTime IIDType = _win32typing.PyIID def DosDateTimeToTime(FatDate: int, FatTime: int, /) -> TimeType: ... -def Unicode() -> str: ... def UnicodeFromRaw(_str: str, /) -> str: ... def IsTextUnicode(_str: str, flags, /) -> tuple[Incomplete, Incomplete]: ... def OVERLAPPED() -> _win32typing.PyOVERLAPPED: ... diff --git a/stubs/pywin32/win32/lib/regutil.pyi b/stubs/pywin32/win32/lib/regutil.pyi index 73aeee49f..60a3e80cc 100644 --- a/stubs/pywin32/win32/lib/regutil.pyi +++ b/stubs/pywin32/win32/lib/regutil.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -error: str CLSIDPyFile: str RegistryIDPyFile: str RegistryIDPycFile: str diff --git a/stubs/pywin32/win32/lib/win32evtlogutil.pyi b/stubs/pywin32/win32/lib/win32evtlogutil.pyi index 8ba408fad..b5a74189d 100644 --- a/stubs/pywin32/win32/lib/win32evtlogutil.pyi +++ b/stubs/pywin32/win32/lib/win32evtlogutil.pyi @@ -2,8 +2,9 @@ from _typeshed import Incomplete from collections.abc import Iterable import _win32typing -from win32.lib.pywintypes import error as error +import win32api +error = win32api.error langid: Incomplete def AddSourceToRegistry( diff --git a/stubs/pywin32/win32/lib/win32timezone.pyi b/stubs/pywin32/win32/lib/win32timezone.pyi index 763eee6be..2b604323a 100644 --- a/stubs/pywin32/win32/lib/win32timezone.pyi +++ b/stubs/pywin32/win32/lib/win32timezone.pyi @@ -34,9 +34,9 @@ class TimeZoneInfo(datetime.tzinfo): def dst(self, dt): ... def GetDSTStartTime(self, year): ... def GetDSTEndTime(self, year): ... - def __cmp__(self, other): ... - def __eq__(self, other): ... - def __ne__(self, other): ... + def __le__(self, other) -> bool: ... + def __eq__(self, other) -> bool: ... + def __ne__(self, other) -> bool: ... @classmethod def local(cls): ... @classmethod diff --git a/stubs/pywin32/win32/lib/winnt.pyi b/stubs/pywin32/win32/lib/winnt.pyi index 9c49122df..f1ec8493c 100644 --- a/stubs/pywin32/win32/lib/winnt.pyi +++ b/stubs/pywin32/win32/lib/winnt.pyi @@ -166,9 +166,6 @@ NLS_VALID_LOCALE_MASK: int def LANGIDFROMLCID(lcid): ... def SORTIDFROMLCID(lcid): ... -def UNREFERENCED_PARAMETER(P): ... -def DBG_UNREFERENCED_PARAMETER(P): ... -def DBG_UNREFERENCED_LOCAL_VARIABLE(V): ... MAXIMUM_WAIT_OBJECTS: int MAXIMUM_SUSPEND_COUNT: int @@ -836,8 +833,8 @@ IMAGE_ARCHIVE_LINKER_MEMBER: str IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR: int IMAGE_ORDINAL_FLAG: int -def IMAGE_SNAP_BY_ORDINAL(Ordina): ... -def IMAGE_ORDINAL(Ordina): ... +def IMAGE_SNAP_BY_ORDINAL(Ordinal): ... +def IMAGE_ORDINAL(Ordinal): ... IMAGE_RESOURCE_NAME_IS_STRING: int IMAGE_RESOURCE_DATA_IS_DIRECTORY: int diff --git a/stubs/pywin32/win32/win32api.pyi b/stubs/pywin32/win32/win32api.pyi index 658a50174..6856c263c 100644 --- a/stubs/pywin32/win32/win32api.pyi +++ b/stubs/pywin32/win32/win32api.pyi @@ -226,7 +226,7 @@ def SetSysColors(Elements, RgbValues, /) -> None: ... def SetLocalTime(SystemTime: TimeType, /) -> None: ... def SetSystemTime(year, month, dayOfWeek, day, hour, minute, second, millseconds, /): ... def SetClassLong(hwnd: int, offset, val, /): ... -@deprecated("This function is obsolete, use `win32api.SetClassLong` instead") +@deprecated("This function is obsolete, use `win32api.SetClassLong` instead.") def SetClassWord(hwnd: int, offset, val, /): ... def SetCursor(hCursor: int, /) -> int: ... def SetEnvironmentVariable(Name, Value, /) -> None: ... @@ -237,17 +237,13 @@ def SetSystemPowerState(Suspend, Force, /) -> None: ... def SetThreadLocale(lcid, /) -> None: ... def SetTimeZoneInformation(tzi, /): ... def SetWindowLong(hwnd: int | None, offset: int, value: float, /) -> int: ... - -# This method is accidentally overwritten in source, can re-introduce once fixed: -# https://github.com/mhammond/pywin32/pull/2199 -# @deprecated("This function is obsolete, use `win32api.SetWindowLong` instead") -# def SetWindowWord(hwnd, offset: int, val: int) -> int: ... +@deprecated("This function is obsolete, use `win32api.SetWindowLong` instead.") +def SetWindowWord(hwnd, offset: int, val: int) -> int: ... def ShellExecute(hwnd: int, op: str, file: str, params: str, _dir: str, bShow, /): ... def ShowCursor(show, /): ... def Sleep(time, bAlterable: int = ..., /): ... def TerminateProcess(handle: int, exitCode: int, /) -> None: ... def ToAsciiEx(vk, scancode, keyboardstate, flags: int = ..., hlayout: Incomplete | None = ..., /): ... -def Unicode() -> str: ... def UpdateResource( handle: int, type: _win32typing.PyResourceId | int, diff --git a/stubs/pywin32/win32/win32cred.pyi b/stubs/pywin32/win32/win32cred.pyi index a13f2953d..e0b9c52d3 100644 --- a/stubs/pywin32/win32/win32cred.pyi +++ b/stubs/pywin32/win32/win32cred.pyi @@ -5,6 +5,7 @@ def CredUnmarshalCredential(MarshaledCredential: str) -> tuple[Incomplete, str]: def CredIsMarshaledCredential(MarshaledCredential: str) -> bool: ... def CredEnumerate(Filter: str | None = ..., Flags: int = ...) -> tuple[dict[str, Incomplete], ...]: ... def CredGetTargetInfo(TargetName: str, Flags: int = ...): ... +def CredGetSessionTypes(MaximumPersistCount: int = 7) -> tuple[int, ...]: ... def CredWriteDomainCredentials(TargetInfo, Credential, Flags: int = ...) -> None: ... def CredReadDomainCredentials(TargetInfo, Flags: int = ...) -> tuple[Incomplete, ...]: ... def CredDelete(TargetName: str, Type, Flags: int = ...) -> None: ... @@ -54,6 +55,7 @@ CREDUI_MAX_PASSWORD_LENGTH: int CREDUI_MAX_USERNAME_LENGTH: int CRED_ALLOW_NAME_RESOLUTION: int CRED_CACHE_TARGET_INFORMATION: int +CRED_ENUMERATE_ALL_CREDENTIALS: int CRED_FLAGS_OWF_CRED_BLOB: int CRED_FLAGS_PASSWORD_FOR_CERT: int CRED_FLAGS_PROMPT_NOW: int @@ -78,8 +80,12 @@ CRED_TI_USERNAME_TARGET: int CRED_TI_VALID_FLAGS: int CRED_TI_WORKGROUP_MEMBER: int CRED_TYPE_DOMAIN_CERTIFICATE: int +CRED_TYPE_DOMAIN_EXTENDED: int CRED_TYPE_DOMAIN_PASSWORD: int CRED_TYPE_DOMAIN_VISIBLE_PASSWORD: int CRED_TYPE_GENERIC: int +CRED_TYPE_GENERIC_CERTIFICATE: int +CRED_TYPE_MAXIMUM: int +CRED_TYPE_MAXIMUM_EX: int CertCredential: int UsernameTargetCredential: int diff --git a/stubs/pywin32/win32/win32gui.pyi b/stubs/pywin32/win32/win32gui.pyi index 46c34e8ed..cd341a68c 100644 --- a/stubs/pywin32/win32/win32gui.pyi +++ b/stubs/pywin32/win32/win32gui.pyi @@ -56,7 +56,13 @@ def DefWindowProc( ) -> int: ... def EnumWindows(callback: Callable[[int, _T], int | None], extra: _T, /) -> None: ... def EnumThreadWindows(dwThreadId, callback: Callable[[int, _T], int | None], extra: _T, /) -> None: ... -def EnumChildWindows(hwnd: int | None, callback: Callable[[int, _T], int | None], extra: _T, /) -> None: ... +def EnumChildWindows( + hwnd: _win32typing.PyHANDLE | int | None, callback: Callable[[int, _T], int | None], extra: _T, / +) -> None: ... +def EnumDesktopWindows( + hDesktop: _win32typing.PyHANDLE | int | None, callback: Callable[[int, _T], int | None], extra: _T, / +) -> None: ... +def GetThreadDesktop(ThreadId: int, /) -> int: ... def DialogBox(hInstance: int, TemplateName: _win32typing.PyResourceId, hWndParent: int, DialogFunc, InitParam: int = ..., /): ... def DialogBoxParam(): ... def DialogBoxIndirect( @@ -358,6 +364,9 @@ def WindowFromDC(hDC: int, /) -> int: ... def GetUpdateRgn(hWnd: int, hRgn: _win32typing.PyGdiHANDLE, Erase, /): ... def GetWindowRgn(hWnd: int, hRgn: _win32typing.PyGdiHANDLE, /): ... def SetWindowRgn(hWnd: int, hRgn: _win32typing.PyGdiHANDLE | None, Redraw: bool, /) -> None: ... + +# Actually returns a list, but the length is always fixed +def GetWindowRgnBox(hWnd: _win32typing.PyHANDLE | int | None) -> tuple[int, tuple[int, int, int, int]]: ... def ValidateRgn(hWnd: int, hRgn: _win32typing.PyGdiHANDLE, /) -> None: ... def InvalidateRgn(hWnd: int, hRgn: _win32typing.PyGdiHANDLE, Erase, /) -> None: ... def GetRgnBox(hrgn: _win32typing.PyGdiHANDLE, /) -> tuple[Incomplete, _win32typing.PyRECT]: ... @@ -405,7 +414,8 @@ def ScrollWindowEx( ) -> tuple[Incomplete, _win32typing.PyRECT]: ... def SetScrollInfo(hwnd: int, nBar, scollInfo: _win32typing.PySCROLLINFO, bRedraw=..., /) -> None: ... def GetScrollInfo(hwnd: int, nBar, mask, /) -> _win32typing.PySCROLLINFO: ... -def GetClassName(hwnd: int, /) -> str: ... +def GetClassName(hwnd: _win32typing.PyHANDLE | int | None, /) -> str | None: ... +def RealGetWindowClass(hwnd: _win32typing.PyHANDLE | int | None, /) -> str | None: ... def WindowFromPoint(point: tuple[int, int], /) -> int: ... def ChildWindowFromPoint(hwndParent: int, point: tuple[Incomplete, Incomplete], /): ... def CreateDC(Driver: str, Device: str, InitData: _win32typing.PyDEVMODE, /): ... @@ -459,7 +469,8 @@ def DrawTextW(hDC: int, String: str, Count, Rect: _win32typing.PyRECT, Format) - 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 RegisterHotKey(hWnd: _win32typing.PyHANDLE | int | None, _id: int, Modifiers: int, vk: int, /) -> None: ... +def UnregisterHotKey(hWnd: _win32typing.PyHANDLE | int | None, _id: int, /) -> None: ... def GetAncestor(hwnd: int, gaFlags: int, /) -> int: ... def GetTopWindow(hWnd: int | None, /) -> int: ... def ChildWindowFromPointEx(*args): ... # incomplete diff --git a/stubs/pywin32/win32/win32service.pyi b/stubs/pywin32/win32/win32service.pyi index e066194ea..30797ebef 100644 --- a/stubs/pywin32/win32/win32service.pyi +++ b/stubs/pywin32/win32/win32service.pyi @@ -4,7 +4,7 @@ from collections.abc import Iterable import _win32typing from win32.lib.pywintypes import error as error -def GetThreadDesktop(ThreadId, /) -> _win32typing.PyHDESK: ... +def GetThreadDesktop(ThreadId: int, /) -> _win32typing.PyHDESK: ... def EnumWindowStations() -> tuple[tuple[str, Incomplete], ...]: ... def GetUserObjectInformation(Handle: int, _type, /) -> None: ... def SetUserObjectInformation(Handle: int, info, _type, /) -> None: ... diff --git a/stubs/pywin32/win32/winxpgui.pyi b/stubs/pywin32/win32/winxpgui.pyi index 631ec869e..156611576 100644 --- a/stubs/pywin32/win32/winxpgui.pyi +++ b/stubs/pywin32/win32/winxpgui.pyi @@ -1,6 +1,5 @@ -from win32.win32gui import * +# The `winxpgui` module is obsolete and has been completely replaced +# by `win32gui` and `win32console.GetConsoleWindow`. Use those instead. -def GetConsoleWindow() -> int: ... - -# Actually returns a list of int|tuple, but lists don't support positional types -def GetWindowRgnBox(hWnd: int, /) -> tuple[int, tuple[int, int, int, int]]: ... +from win32console import GetConsoleWindow as GetConsoleWindow +from win32gui import * diff --git a/stubs/pywin32/win32com/axscript/client/debug.pyi b/stubs/pywin32/win32com/axscript/client/debug.pyi new file mode 100644 index 000000000..a39e0e145 --- /dev/null +++ b/stubs/pywin32/win32com/axscript/client/debug.pyi @@ -0,0 +1 @@ +from win32comext.axscript.client.debug import * diff --git a/stubs/pywin32/win32com/axscript/client/framework.pyi b/stubs/pywin32/win32com/axscript/client/framework.pyi new file mode 100644 index 000000000..cec9c9a8a --- /dev/null +++ b/stubs/pywin32/win32com/axscript/client/framework.pyi @@ -0,0 +1 @@ +from win32comext.axscript.client.framework import * diff --git a/stubs/pywin32/win32com/axscript/server/error.pyi b/stubs/pywin32/win32com/axscript/server/error.pyi deleted file mode 100644 index 6de1e5dd2..000000000 --- a/stubs/pywin32/win32com/axscript/server/error.pyi +++ /dev/null @@ -1 +0,0 @@ -from win32comext.axscript.server.error import * diff --git a/stubs/pywin32/win32com/client/__init__.pyi b/stubs/pywin32/win32com/client/__init__.pyi index fc2753db6..4b43a733b 100644 --- a/stubs/pywin32/win32com/client/__init__.pyi +++ b/stubs/pywin32/win32com/client/__init__.pyi @@ -3,7 +3,7 @@ from typing import Final from typing_extensions import TypeAlias import _win32typing -from win32com.client import dynamic as dynamic, gencache as gencache +from win32com.client import dynamic _Stringifiable: TypeAlias = object @@ -15,7 +15,6 @@ def Dispatch( userName: str | None = ..., resultCLSID: _Stringifiable | None = ..., typeinfo: _win32typing.PyITypeInfo | None = ..., - UnicodeToString: None = None, clsctx: int = ..., ) -> dynamic.CDispatch: ... def DispatchEx( @@ -24,7 +23,6 @@ def DispatchEx( userName: Incomplete | None = ..., resultCLSID: Incomplete | None = ..., typeinfo: Incomplete | None = ..., - UnicodeToString: None = None, clsctx: Incomplete | None = ..., ): ... @@ -67,7 +65,7 @@ class CoClassBaseClass: def __maybe__int__(self, *args): ... def __maybe__iter__(self): ... def __maybe__len__(self): ... - def __maybe__nonzero__(self): ... + def __maybe__bool__(self): ... class VARIANT: varianttype: Incomplete diff --git a/stubs/pywin32/win32com/client/dynamic.pyi b/stubs/pywin32/win32com/client/dynamic.pyi index 041de32eb..17b3cb620 100644 --- a/stubs/pywin32/win32com/client/dynamic.pyi +++ b/stubs/pywin32/win32com/client/dynamic.pyi @@ -4,7 +4,7 @@ from typing_extensions import TypeAlias import _win32typing from win32.lib.pywintypes import IIDType -from win32com.client import build as build +from win32com.client import build _T_co = TypeVar("_T_co", covariant=True) _T = TypeVar("_T") @@ -15,7 +15,6 @@ class _DispatchCreateClass(Protocol[_T_co]): IDispatch: str | PyIDispatchType | _GoodDispatchTypes | PyIUnknownType, olerepr: build.DispatchItem | build.LazyDispatchItem, userName: str | None = ..., - UnicodeToString: None = None, lazydata: Incomplete | None = ..., ) -> _T_co: ... @@ -27,7 +26,6 @@ ALL_INVOKE_TYPES: Incomplete def debug_print(*args) -> None: ... def debug_attr_print(*args) -> None: ... -def MakeMethod(func, inst, cls): ... PyIDispatchType = _win32typing.PyIDispatch PyIUnknownType = _win32typing.PyIUnknown @@ -40,7 +38,6 @@ def Dispatch( userName: str | None, createClass: _DispatchCreateClass[_T], typeinfo: _win32typing.PyITypeInfo | None = ..., - UnicodeToString: None = None, clsctx: int = ..., ) -> _T: ... @overload @@ -49,23 +46,13 @@ def Dispatch( userName: str | None = ..., createClass: None = None, typeinfo: _win32typing.PyITypeInfo | None = ..., - UnicodeToString: None = None, clsctx: int = ..., ) -> CDispatch: ... def MakeOleRepr(IDispatch, typeinfo, typecomp): ... -def DumbDispatch( - IDispatch, userName: Incomplete | None = ..., createClass: Incomplete | None = ..., UnicodeToString: None = ..., clsctx=... -): ... +def DumbDispatch(IDispatch, userName: Incomplete | None = ..., createClass: Incomplete | None = ..., clsctx=...): ... class CDispatch: - def __init__( - self, - IDispatch, - olerepr, - userName: Incomplete | None = ..., - UnicodeToString: None = None, - lazydata: Incomplete | None = ..., - ) -> None: ... + def __init__(self, IDispatch, olerepr, userName: Incomplete | None = ..., lazydata: Incomplete | None = ...) -> None: ... def __call__(self, *args): ... def __bool__(self) -> bool: ... def __dir__(self): ... diff --git a/stubs/pywin32/win32com/server/connect.pyi b/stubs/pywin32/win32com/server/connect.pyi index cf8670a6d..4c8a18785 100644 --- a/stubs/pywin32/win32com/server/connect.pyi +++ b/stubs/pywin32/win32com/server/connect.pyi @@ -1,8 +1,5 @@ from _typeshed import Incomplete -from win32com import olectl as olectl -from win32com.server.exception import Exception as Exception - IConnectionPointContainer_methods: Incomplete IConnectionPoint_methods: Incomplete diff --git a/stubs/pywin32/win32com/server/dispatcher.pyi b/stubs/pywin32/win32com/server/dispatcher.pyi index 6ed1e3410..a43da7595 100644 --- a/stubs/pywin32/win32com/server/dispatcher.pyi +++ b/stubs/pywin32/win32com/server/dispatcher.pyi @@ -1,9 +1,6 @@ from _typeshed import Incomplete from typing_extensions import TypeAlias, deprecated -from win32com.server.exception import IsCOMServerException as IsCOMServerException -from win32com.util import IIDToInterfaceName as IIDToInterfaceName - class DispatcherBase: policy: Incomplete logger: Incomplete diff --git a/stubs/pywin32/win32com/server/exception.pyi b/stubs/pywin32/win32com/server/exception.pyi index 6d27f7094..39e793a33 100644 --- a/stubs/pywin32/win32com/server/exception.pyi +++ b/stubs/pywin32/win32com/server/exception.pyi @@ -19,7 +19,5 @@ class COMException(pythoncom.com_error): hresult: Incomplete | None = ..., ) -> None: ... -Exception = COMException - def IsCOMException(t: Incomplete | None = ...): ... def IsCOMServerException(t: Incomplete | None = ...): ... diff --git a/stubs/pywin32/win32com/server/policy.pyi b/stubs/pywin32/win32com/server/policy.pyi index 801047eac..a6c079adc 100644 --- a/stubs/pywin32/win32com/server/policy.pyi +++ b/stubs/pywin32/win32com/server/policy.pyi @@ -1,19 +1,9 @@ from _typeshed import Incomplete from abc import ABC, abstractmethod -from pythoncom import ( - DISPID_COLLECT as DISPID_COLLECT, - DISPID_CONSTRUCTOR as DISPID_CONSTRUCTOR, - DISPID_DESTRUCTOR as DISPID_DESTRUCTOR, - DISPID_UNKNOWN as DISPID_UNKNOWN, -) -from win32com.server.dispatcher import DispatcherTrace as DispatcherTrace, DispatcherWin32trace as DispatcherWin32trace -from win32com.server.exception import COMException as COMException - S_OK: int IDispatchType: Incomplete IUnknownType: Incomplete -error: str regSpec: str regPolicy: str regDispatcher: str diff --git a/stubs/pywin32/win32com/server/util.pyi b/stubs/pywin32/win32com/server/util.pyi index 7e5001429..eb1051f81 100644 --- a/stubs/pywin32/win32com/server/util.pyi +++ b/stubs/pywin32/win32com/server/util.pyi @@ -1,8 +1,6 @@ from _typeshed import Incomplete import _win32typing -from win32com.server import policy as policy -from win32com.server.exception import COMException as COMException def wrap(ob, iid: Incomplete | None = ..., usePolicy: Incomplete | None = ..., useDispatcher: Incomplete | None = ...): ... def unwrap(ob): ... diff --git a/stubs/pywin32/win32com/universal.pyi b/stubs/pywin32/win32com/universal.pyi index 29452a20d..fe0e626fc 100644 --- a/stubs/pywin32/win32com/universal.pyi +++ b/stubs/pywin32/win32com/universal.pyi @@ -2,8 +2,9 @@ from _typeshed import Incomplete from collections.abc import Callable from typing_extensions import TypeAlias -from pythoncom import com_error as com_error -from win32com.client import gencache as gencache +import pythoncom + +com_error = pythoncom.com_error # Type of pythoncom._univgw.WriteFromOutTuple # The two tuples must be of equal length diff --git a/stubs/pywin32/win32comext/adsi/__init__.pyi b/stubs/pywin32/win32comext/adsi/__init__.pyi index 8a3afe5f5..e409f094e 100644 --- a/stubs/pywin32/win32comext/adsi/__init__.pyi +++ b/stubs/pywin32/win32comext/adsi/__init__.pyi @@ -2,6 +2,9 @@ from _typeshed import Incomplete import _win32typing import win32com.client + +# Re-export everything from win32comext/adsi/adsi.pyd +# Not using a star export because the redefinitions below mess up mypy, pyright and stubtest from win32comext.adsi.adsi import ( DBPROPSET_ADSISEARCH as DBPROPSET_ADSISEARCH, ADsBuildEnumerator as ADsBuildEnumerator, @@ -50,6 +53,7 @@ from win32comext.adsi.adsi import ( IID_IDsObjectPicker as IID_IDsObjectPicker, LIBID_ADs as LIBID_ADs, StringAsDS_SELECTION_LIST as StringAsDS_SELECTION_LIST, + error as error, ) LCID: int diff --git a/stubs/pywin32/win32comext/axdebug/adb.pyi b/stubs/pywin32/win32comext/axdebug/adb.pyi index 3a1a293c9..ec29264a8 100644 --- a/stubs/pywin32/win32comext/axdebug/adb.pyi +++ b/stubs/pywin32/win32comext/axdebug/adb.pyi @@ -1,9 +1,8 @@ import bdb from _typeshed import Incomplete -from win32com.axdebug.util import trace -from win32com.server.util import unwrap as unwrap -from win32comext.axdebug import gateways as gateways +from win32comext.axdebug import gateways +from win32comext.axdebug.util import trace def fnull(*args) -> None: ... diff --git a/stubs/pywin32/win32comext/axdebug/codecontainer.pyi b/stubs/pywin32/win32comext/axdebug/codecontainer.pyi index 32647ae27..62bc0606a 100644 --- a/stubs/pywin32/win32comext/axdebug/codecontainer.pyi +++ b/stubs/pywin32/win32comext/axdebug/codecontainer.pyi @@ -1,8 +1,5 @@ from _typeshed import Incomplete -from win32comext.axdebug import contexts as contexts -from win32comext.axdebug.util import RaiseNotImpl as RaiseNotImpl - name: str class SourceCodeContainer: @@ -13,7 +10,7 @@ class SourceCodeContainer: codeContexts: Incomplete site: Incomplete startLineNumber: Incomplete - debugDocument: Incomplete + debugDocument: Incomplete | None def __init__( self, text, diff --git a/stubs/pywin32/win32comext/axdebug/contexts.pyi b/stubs/pywin32/win32comext/axdebug/contexts.pyi index 4561b453c..f3d9528f7 100644 --- a/stubs/pywin32/win32comext/axdebug/contexts.pyi +++ b/stubs/pywin32/win32comext/axdebug/contexts.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete -from win32comext.axdebug import adb as adb, gateways -from win32comext.axdebug.util import trace as trace +from win32comext.axdebug import gateways class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext): debugSite: Incomplete diff --git a/stubs/pywin32/win32comext/axdebug/debugger.pyi b/stubs/pywin32/win32comext/axdebug/debugger.pyi index f8d294be9..851ce60c2 100644 --- a/stubs/pywin32/win32comext/axdebug/debugger.pyi +++ b/stubs/pywin32/win32comext/axdebug/debugger.pyi @@ -1,8 +1,6 @@ from _typeshed import Incomplete -from win32com.axdebug import contexts as contexts, documents, gateways as gateways -from win32com.axdebug.util import trace as trace -from win32com.axscript import axscript as axscript +from win32comext.axdebug import documents currentDebugger: Incomplete diff --git a/stubs/pywin32/win32comext/axdebug/documents.pyi b/stubs/pywin32/win32comext/axdebug/documents.pyi index 5be676213..33b767822 100644 --- a/stubs/pywin32/win32comext/axdebug/documents.pyi +++ b/stubs/pywin32/win32comext/axdebug/documents.pyi @@ -1,8 +1,6 @@ from _typeshed import Incomplete -from win32com.server.exception import Exception as Exception -from win32comext.axdebug import codecontainer as codecontainer, contexts as contexts, gateways -from win32comext.axdebug.util import RaiseNotImpl as RaiseNotImpl, trace as trace +from win32comext.axdebug import gateways def GetGoodFileName(fname): ... @@ -13,9 +11,7 @@ class DebugDocumentProvider(gateways.DebugDocumentProvider): def GetDocumentClassId(self): ... def GetDocument(self): ... -# error: Cannot determine consistent method resolution order (MRO) for "DebugDocumentText" -# pyright doesn't have a specific error code for MRO error! -class DebugDocumentText(gateways.DebugDocumentInfo, gateways.DebugDocumentText, gateways.DebugDocument): # type: ignore[misc] # pyright: ignore[reportGeneralTypeIssues] +class DebugDocumentText(gateways.DebugDocumentText): codeContainer: Incomplete def __init__(self, codeContainer) -> None: ... def GetName(self, dnt): ... diff --git a/stubs/pywin32/win32comext/axdebug/expressions.pyi b/stubs/pywin32/win32comext/axdebug/expressions.pyi index fac92805b..2406702c2 100644 --- a/stubs/pywin32/win32comext/axdebug/expressions.pyi +++ b/stubs/pywin32/win32comext/axdebug/expressions.pyi @@ -1,9 +1,7 @@ from _typeshed import Incomplete -from win32com.server.exception import COMException as COMException from win32com.server.util import ListEnumeratorGateway from win32comext.axdebug import gateways -from win32comext.axdebug.util import RaiseNotImpl as RaiseNotImpl def MakeNiceString(ob): ... diff --git a/stubs/pywin32/win32comext/axdebug/stackframe.pyi b/stubs/pywin32/win32comext/axdebug/stackframe.pyi index 931a1013b..6c12e6d28 100644 --- a/stubs/pywin32/win32comext/axdebug/stackframe.pyi +++ b/stubs/pywin32/win32comext/axdebug/stackframe.pyi @@ -1,8 +1,6 @@ from _typeshed import Incomplete -from win32com.server.exception import COMException as COMException from win32comext.axdebug import gateways -from win32comext.axdebug.util import RaiseNotImpl as RaiseNotImpl, trace as trace class EnumDebugStackFrames(gateways.EnumDebugStackFrames): def __init__(self, debugger) -> None: ... diff --git a/stubs/pywin32/win32comext/axdebug/util.pyi b/stubs/pywin32/win32comext/axdebug/util.pyi index 5ec04b350..82b53ac6c 100644 --- a/stubs/pywin32/win32comext/axdebug/util.pyi +++ b/stubs/pywin32/win32comext/axdebug/util.pyi @@ -1,14 +1,11 @@ from _typeshed import Incomplete -import win32com.server.policy +import win32com.server.dispatcher debugging: int def trace(*args) -> None: ... - -all_wrapped: Incomplete - def RaiseNotImpl(who: Incomplete | None = ...) -> None: ... -class Dispatcher(win32com.server.policy.DispatcherWin32trace): +class Dispatcher(win32com.server.dispatcher.DispatcherWin32trace): def __init__(self, policyClass, object) -> None: ... diff --git a/stubs/pywin32/win32comext/axscript/client/debug.pyi b/stubs/pywin32/win32comext/axscript/client/debug.pyi new file mode 100644 index 000000000..8c1752564 --- /dev/null +++ b/stubs/pywin32/win32comext/axscript/client/debug.pyi @@ -0,0 +1,42 @@ +from _typeshed import Incomplete + +from win32comext.axdebug import gateways +from win32comext.axdebug.codecontainer import SourceCodeContainer + +debuggingTrace: int + +def trace(*args) -> None: ... + +class DebugManager: + scriptEngine: Incomplete + adb: Incomplete + rootNode: Incomplete + debugApplication: Incomplete + ccProvider: Incomplete + scriptSiteDebug: Incomplete + activeScriptDebug: Incomplete + codeContainers: Incomplete + def __init__(self, scriptEngine) -> None: ... + def Close(self) -> None: ... + def IsAnyHost(self): ... + def IsSimpleHost(self): ... + def HandleRuntimeError(self): ... + def OnEnterScript(self) -> None: ... + def OnLeaveScript(self) -> None: ... + def AddScriptBlock(self, codeBlock) -> None: ... + +class DebugCodeBlockContainer(SourceCodeContainer): + codeBlock: Incomplete + def __init__(self, codeBlock, site) -> None: ... + def GetName(self, dnt): ... + +class EnumDebugCodeContexts(gateways.EnumDebugCodeContexts): ... + +class ActiveScriptDebug: + debugMgr: Incomplete + scriptSiteDebug: Incomplete + codeContainers: Incomplete + def __init__(self, debugMgr, codeContainers) -> None: ... + def GetScriptTextAttributes(self, code, delim, flags): ... + def GetScriptletTextAttributes(self, code, delim, flags): ... + def EnumCodeContextsOfPosition(self, context, charOffset, numChars): ... diff --git a/stubs/pywin32/win32comext/axscript/client/error.pyi b/stubs/pywin32/win32comext/axscript/client/error.pyi index 24ce7a521..40d95a89c 100644 --- a/stubs/pywin32/win32comext/axscript/client/error.pyi +++ b/stubs/pywin32/win32comext/axscript/client/error.pyi @@ -1,21 +1,35 @@ +from types import TracebackType + from win32com.server.exception import COMException +from win32comext.axscript.client.debug import DebugManager +from win32comext.axscript.client.framework import AXScriptCodeBlock, COMScript +from win32comext.axscript.server.axsite import AXSite debugging: int -def FormatForAX(text): ... -def ExpandTabs(text): ... -def AddCR(text): ... +def FormatForAX(text: str) -> str: ... +def ExpandTabs(text: str) -> str: ... +def AddCR(text: str) -> str: ... class IActiveScriptError: - def GetSourceLineText(self): ... - def GetSourcePosition(self): ... - def GetExceptionInfo(self): ... + def GetSourceLineText(self) -> str | None: ... + def GetSourcePosition(self) -> tuple[int, int, int]: ... + def GetExceptionInfo(self) -> AXScriptException: ... class AXScriptException(COMException): sourceContext: int startLineNo: int linetext: str - def __init__(self, site, codeBlock, exc_type, exc_value, exc_traceback) -> None: ... - def ExtractTracebackInfo(self, tb, site): ... + def __init__( + self, + site: COMScript, + codeBlock: AXScriptCodeBlock | None, + exc_type: None = None, + exc_value: BaseException | None = None, + exc_traceback: None = None, + ) -> None: ... + def ExtractTracebackInfo(self, tb: TracebackType, site: COMScript) -> tuple[str, int, str, str | None]: ... -def ProcessAXScriptException(scriptingSite, debugManager, exceptionInstance): ... +def ProcessAXScriptException( + scriptingSite: AXSite, debugManager: DebugManager, exceptionInstance: AXScriptException +) -> None | COMException | AXScriptException: ... diff --git a/stubs/pywin32/win32comext/axscript/client/framework.pyi b/stubs/pywin32/win32comext/axscript/client/framework.pyi new file mode 100644 index 000000000..5a2dd0745 --- /dev/null +++ b/stubs/pywin32/win32comext/axscript/client/framework.pyi @@ -0,0 +1,154 @@ +from _typeshed import Incomplete +from typing import NoReturn + +def RemoveCR(text): ... + +SCRIPTTEXT_FORCEEXECUTION: int +SCRIPTTEXT_ISEXPRESSION: int +SCRIPTTEXT_ISPERSISTENT: int +state_map: Incomplete + +def profile(fn, *args): ... + +class SafeOutput: + softspace: int + redir: Incomplete + def __init__(self, redir: Incomplete | None = None) -> None: ... + def write(self, message) -> None: ... + def flush(self) -> None: ... + def close(self) -> None: ... + +def MakeValidSysOuts() -> None: ... +def trace(*args) -> None: ... +def RaiseAssert(scode, desc) -> NoReturn: ... + +class AXScriptCodeBlock: + name: Incomplete + codeText: Incomplete + codeObject: Incomplete + sourceContextCookie: Incomplete + startLineNumber: Incomplete + flags: Incomplete + beenExecuted: int + def __init__(self, name: str, codeText: str, sourceContextCookie: int, startLineNumber: int, flags) -> None: ... + def GetFileName(self): ... + def GetDisplayName(self): ... + def GetLineNo(self, no: int): ... + +class Event: + name: str + def __init__(self) -> None: ... + def Reset(self) -> None: ... + def Close(self) -> None: ... + dispid: Incomplete + def Build(self, typeinfo, funcdesc) -> None: ... + +class EventSink: + events: Incomplete + connection: Incomplete + coDispatch: Incomplete + myScriptItem: Incomplete + myInvokeMethod: Incomplete + iid: Incomplete + def __init__(self, myItem, coDispatch) -> None: ... + def Reset(self) -> None: ... + def Close(self) -> None: ... + def GetSourceTypeInfo(self, typeinfo): ... + def BuildEvents(self) -> None: ... + def Connect(self) -> None: ... + def Disconnect(self) -> None: ... + +class ScriptItem: + parentItem: Incomplete + dispatch: Incomplete + name: Incomplete + flags: Incomplete + eventSink: Incomplete + subItems: Incomplete + createdConnections: int + isRegistered: int + def __init__(self, parentItem, name, dispatch, flags) -> None: ... + def Reset(self) -> None: ... + def Close(self) -> None: ... + def Register(self) -> None: ... + def IsGlobal(self): ... + def IsVisible(self): ... + def GetEngine(self): ... + def GetSubItemClass(self): ... + def GetSubItem(self, name): ... + def GetCreateSubItem(self, parentItem, name, dispatch, flags): ... + def CreateConnections(self) -> None: ... + def Connect(self) -> None: ... + def Disconnect(self) -> None: ... + def BuildEvents(self) -> None: ... + def FindBuildSubItemEvents(self) -> None: ... + def GetDefaultSourceTypeInfo(self, typeinfo): ... + +IActiveScriptMethods: Incomplete +IActiveScriptParseMethods: Incomplete +IObjectSafetyMethods: Incomplete +IActiveScriptParseProcedureMethods: Incomplete + +class COMScript: + baseThreadId: int + debugManager: Incomplete + threadState: Incomplete + scriptState: Incomplete + scriptSite: Incomplete + safetyOptions: int + lcid: int + subItems: Incomplete + scriptCodeBlocks: Incomplete + def __init__(self) -> None: ... + def InitNew(self) -> None: ... + def AddScriptlet( + self, defaultName, code, itemName, subItemName, eventName, delimiter, sourceContextCookie, startLineNumber + ) -> None: ... + def ParseScriptText(self, code, itemName, context, delimiter, sourceContextCookie, startLineNumber, flags, bWantResult): ... + def ParseProcedureText( + self, code, formalParams, procName, itemName, unkContext, delimiter, contextCookie, startingLineNumber, flags + ) -> None: ... + def SetScriptSite(self, site) -> None: ... + def GetScriptSite(self, iid): ... + def SetScriptState(self, state) -> None: ... + def GetScriptState(self): ... + persistLoaded: int + def Close(self) -> None: ... + def AddNamedItem(self, name, flags) -> None: ... + def GetScriptDispatch(self, name) -> None: ... + def GetCurrentScriptThreadID(self): ... + def GetScriptThreadID(self, win32ThreadId): ... + def GetScriptThreadState(self, scriptThreadId): ... + def AddTypeLib(self, uuid, major, minor, flags) -> None: ... + def Clone(self) -> None: ... + def SetInterfaceSafetyOptions(self, iid, optionsMask, enabledOptions) -> None: ... + def GetInterfaceSafetyOptions(self, iid): ... + def ExecutePendingScripts(self) -> None: ... + def ProcessScriptItemEvent(self, item, event, lcid, wFlags, args): ... + def ResetNamedItems(self) -> None: ... + def GetCurrentSafetyOptions(self): ... + def ProcessNewNamedItemsConnections(self) -> None: ... + def RegisterNewNamedItems(self) -> None: ... + def RegisterNamedItem(self, item) -> None: ... + def CheckConnectedOrDisconnected(self) -> None: ... + def Connect(self) -> None: ... + def Run(self) -> None: ... + def Stop(self) -> None: ... + def Disconnect(self) -> None: ... + def ConnectEventHandlers(self) -> None: ... + def DisconnectEventHandlers(self) -> None: ... + def Reset(self) -> None: ... + def ChangeScriptState(self, state) -> None: ... + def ApplyInScriptedSection(self, codeBlock: AXScriptCodeBlock | None, fn, args): ... + def CompileInScriptedSection(self, codeBlock: AXScriptCodeBlock, type, realCode: Incomplete | None = None): ... + def ExecInScriptedSection(self, codeBlock: AXScriptCodeBlock, globals, locals: Incomplete | None = None): ... + def EvalInScriptedSection(self, codeBlock, globals, locals: Incomplete | None = None): ... + def HandleException(self, codeBlock: AXScriptCodeBlock | None) -> NoReturn: ... + def BeginScriptedSection(self) -> None: ... + def EndScriptedSection(self) -> None: ... + def DisableInterrupts(self) -> None: ... + def EnableInterrupts(self) -> None: ... + def GetNamedItem(self, name): ... + def GetNamedItemClass(self): ... + +def dumptypeinfo(typeinfo) -> None: ... diff --git a/stubs/pywin32/win32comext/axscript/client/pyscript.pyi b/stubs/pywin32/win32comext/axscript/client/pyscript.pyi deleted file mode 100644 index 548e95fe2..000000000 --- a/stubs/pywin32/win32comext/axscript/client/pyscript.pyi +++ /dev/null @@ -1,3 +0,0 @@ -# Necessary for mypy to not fail with: -# 'error: Cannot find implementation or library stub for module named "win32comext.axscript.client.pyscript"' -# in: .gateways, .stackframe, .expressions, .adb, .contexts, .codecontainer, .documents, .debugger diff --git a/stubs/pywin32/win32comext/axscript/server/error.pyi b/stubs/pywin32/win32comext/axscript/server/error.pyi deleted file mode 100644 index deb38c3cf..000000000 --- a/stubs/pywin32/win32comext/axscript/server/error.pyi +++ /dev/null @@ -1,6 +0,0 @@ -from _typeshed import Incomplete - -class Exception: - activeScriptError: Incomplete - def __init__(self, activeScriptError) -> None: ... - def __getattr__(self, attr: str): ... diff --git a/stubs/pywin32/win32comext/mapi/mapi.pyi b/stubs/pywin32/win32comext/mapi/mapi.pyi index 6b3a42261..f0f98a3a1 100644 --- a/stubs/pywin32/win32comext/mapi/mapi.pyi +++ b/stubs/pywin32/win32comext/mapi/mapi.pyi @@ -100,6 +100,15 @@ FORCE_SAVE: int GENERATE_RECEIPT_ONLY: int KEEP_OPEN_READONLY: int KEEP_OPEN_READWRITE: int +LOGOFF_ABORT: int +LOGOFF_COMPLETE: int +LOGOFF_INBOUND: int +LOGOFF_NO_WAIT: int +LOGOFF_ORDERLY: int +LOGOFF_OUTBOUND: int +LOGOFF_OUTBOUND_QUEUE: int +LOGOFF_PURGE: int +LOGOFF_QUIET: int MAIL_E_NAMENOTFOUND: int MAPI_ABCONT: int MAPI_ADDRBOOK: int diff --git a/stubs/pywin32/win32comext/mapi/mapiutil.pyi b/stubs/pywin32/win32comext/mapi/mapiutil.pyi index f370af558..a595c8968 100644 --- a/stubs/pywin32/win32comext/mapi/mapiutil.pyi +++ b/stubs/pywin32/win32comext/mapi/mapiutil.pyi @@ -1,19 +1,12 @@ -from _typeshed import Incomplete - -from win32comext.mapi import mapi as mapi, mapitags as mapitags - -TupleType = tuple -ListType = list -IntType = int -prTable: Incomplete +prTable: dict[int, str] def GetPropTagName(pt): ... -mapiErrorTable: Incomplete +mapiErrorTable: dict[int, str] def GetScodeString(hr): ... -ptTable: Incomplete +ptTable: dict[int, str] def GetMapiTypeName(propType, rawType: bool = ...): ... def GetProperties(obj, propList): ... diff --git a/stubs/pywin32/win32comext/shell/shell.pyi b/stubs/pywin32/win32comext/shell/shell.pyi index f8702c785..7688b08f8 100644 --- a/stubs/pywin32/win32comext/shell/shell.pyi +++ b/stubs/pywin32/win32comext/shell/shell.pyi @@ -354,6 +354,7 @@ IID_IExtractIconW: _win32typing.PyIID IID_IExtractImage: _win32typing.PyIID IID_IFileOperation: _win32typing.PyIID IID_IFileOperationProgressSink: _win32typing.PyIID +IID_IFolderView: _win32typing.PyIID IID_IIdentityName: _win32typing.PyIID IID_IKnownFolder: _win32typing.PyIID IID_IKnownFolderManager: _win32typing.PyIID diff --git a/stubs/pywin32/win32comext/shell/shellcon.pyi b/stubs/pywin32/win32comext/shell/shellcon.pyi index 88e92081b..8e6090af3 100644 --- a/stubs/pywin32/win32comext/shell/shellcon.pyi +++ b/stubs/pywin32/win32comext/shell/shellcon.pyi @@ -221,6 +221,12 @@ SVSI_DESELECTOTHERS: int SVSI_ENSUREVISIBLE: int SVSI_FOCUSED: int SVSI_TRANSLATEPT: int +SVSI_SELECTIONMARK: int +SVSI_POSITIONITEM: int +SVSI_CHECK: int +SVSI_CHECK2: int +SVSI_KEYBOARDSELECT: int +SVSI_NOTAKEFOCUS: int SVGIO_BACKGROUND: int SVGIO_SELECTION: int SVGIO_ALLVIEW: int @@ -449,6 +455,14 @@ SHCNF_PATH: int SHCNF_PRINTER: int QIF_CACHED: int QIF_DONTEXPANDFOLDER: int +SWFO_NEEDDISPATCH: int +SWFO_INCLUDEPENDING: int +SWFO_COOKIEPASSED: int +SWC_EXPLORER: int +SWC_BROWSER: int +SWC_3RDPARTY: int +SWC_CALLBACK: int +SWC_DESKTOP: int SHARD_PIDL: int SHARD_PATHA: int SHARD_PATHW: int