From e3fd66b3d6cd7f9745b0bc8b31d93c80bea051bd Mon Sep 17 00:00:00 2001 From: hakril Date: Fri, 14 Jun 2024 14:24:19 +0200 Subject: [PATCH] ctypes generation detect duplicate def in source file + fix duplicates --- .../definitions/defines/event_trace.txt | 3 - .../definitions/defines/security.txt | 1 - .../definitions/defines/services.txt | 4 - .../definitions/defines/windef.txt | 5 +- .../definitions/functions/com.txt | 4 - .../definitions/functions/crypto_wintrust.txt | 22 - .../definitions/functions/file.txt | 3 - .../definitions/functions/internet.txt | 14 - .../definitions/functions/netapi.txt | 28 -- .../definitions/functions/security.txt | 7 +- .../definitions/functions/service.txt | 5 - .../definitions/functions/syscall.txt | 13 - .../definitions/functions/winfunc.txt | 37 -- .../definitions/simple_types.txt | 7 +- .../definitions/structures/alpc.txt | 6 +- .../definitions/structures/cfgmgr32.txt | 13 - .../definitions/structures/crypto.txt | 15 - .../definitions/structures/disk.txt | 2 +- .../definitions/structures/lsa.txt | 6 - .../definitions/structures/winstruct.txt | 11 - .../structures/winstruct_apisetmap.txt | 2 +- ctypes_generation/generate.py | 27 +- docs/source/windef_generated.rst | 10 +- docs/source/winstructs_generated.rst | 470 +----------------- windows/generated_def/meta.py | 7 +- windows/generated_def/windef.py | 10 +- windows/generated_def/winfuncs.py | 95 ---- windows/generated_def/winstructs.py | 103 +--- 28 files changed, 53 insertions(+), 877 deletions(-) diff --git a/ctypes_generation/definitions/defines/event_trace.txt b/ctypes_generation/definitions/defines/event_trace.txt index fabd677..be2a55c 100644 --- a/ctypes_generation/definitions/defines/event_trace.txt +++ b/ctypes_generation/definitions/defines/event_trace.txt @@ -45,9 +45,6 @@ #define EVENT_TRACE_FILE_MODE_NEWFILE 0x00000008 // Auto-switch log file #define EVENT_TRACE_FILE_MODE_PREALLOCATE 0x00000020 // Pre-allocate mode -#define EVENT_TRACE_FILE_MODE_NEWFILE 0x00000008 // Auto-switch log file -#define EVENT_TRACE_FILE_MODE_PREALLOCATE 0x00000020 // Pre-allocate mode - // // Logger Mode flags on Vista and above // diff --git a/ctypes_generation/definitions/defines/security.txt b/ctypes_generation/definitions/defines/security.txt index 3bb1043..56ae9e7 100644 --- a/ctypes_generation/definitions/defines/security.txt +++ b/ctypes_generation/definitions/defines/security.txt @@ -23,7 +23,6 @@ #define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE (0xF) #define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE (0x10) #define SYSTEM_MANDATORY_LABEL_ACE_TYPE (0x11) -#define ACCESS_MAX_MS_V5_ACE_TYPE (0x11) #define SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE (0x12) #define SYSTEM_SCOPED_POLICY_ID_ACE_TYPE (0x13) #define SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE (0x14) diff --git a/ctypes_generation/definitions/defines/services.txt b/ctypes_generation/definitions/defines/services.txt index 5a738e6..40bd924 100644 --- a/ctypes_generation/definitions/defines/services.txt +++ b/ctypes_generation/definitions/defines/services.txt @@ -35,10 +35,6 @@ #define SERVICE_WIN32_OWN_PROCESS 0x00000010 #define SERVICE_WIN32_SHARE_PROCESS 0x00000020 -#define SERVICE_USER_OWN_PROCESS 0x00000050 -#define SERVICE_USER_SHARE_PROCESS 0x00000060 - - #define SERVICE_WIN32 (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS) diff --git a/ctypes_generation/definitions/defines/windef.txt b/ctypes_generation/definitions/defines/windef.txt index dba8efc..6595c2e 100644 --- a/ctypes_generation/definitions/defines/windef.txt +++ b/ctypes_generation/definitions/defines/windef.txt @@ -131,6 +131,9 @@ #define TH32CS_INHERIT 0x80000000 #define CONTEXT_I386 0x00010000 +#define CONTEXT_AMD64 0x00100000 +#define CONTEXT_ARM 0x00200000 +#define CONTEXT_ARM64 0x00400000 #define CONTEXT_CONTROL 0x00000001L #define CONTEXT_INTEGER 0x00000002L @@ -141,8 +144,6 @@ #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) #define CONTEXT_ALL (CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) -#define CONTEXT_FULL CONTEXT_I386 | CONTEXT_FULL -#define CONTEXT_ALL CONTEXT_I386 | CONTEXT_ALL #define CONTEXT_XSTATE (CONTEXT_I386 | 0x00000040L) diff --git a/ctypes_generation/definitions/functions/com.txt b/ctypes_generation/definitions/functions/com.txt index 96d7098..2c83230 100644 --- a/ctypes_generation/definitions/functions/com.txt +++ b/ctypes_generation/definitions/functions/com.txt @@ -118,10 +118,6 @@ HRESULT SafeArrayGetVartype( [out] VARTYPE *pvt ); -VOID SysFreeString( - [in, optional] BSTR bstrString -); - HRESULT SafeArrayCopy( [in] SAFEARRAY *psa, [out] LPSAFEARRAY *ppsaOut diff --git a/ctypes_generation/definitions/functions/crypto_wintrust.txt b/ctypes_generation/definitions/functions/crypto_wintrust.txt index 0fdc122..5994154 100644 --- a/ctypes_generation/definitions/functions/crypto_wintrust.txt +++ b/ctypes_generation/definitions/functions/crypto_wintrust.txt @@ -52,11 +52,6 @@ BOOL WINAPI CryptCATAdminReleaseContext( _In_ DWORD dwFlags ); -CRYPTCATATTRIBUTE* WINAPI CryptCATGetAttrInfo( - _In_ HANDLE hCatalog, - _In_ CRYPTCATMEMBER *pCatMember, - _In_ LPWSTR pwszReferenceTag -); CRYPTCATMEMBER* WINAPI CryptCATGetMemberInfo( _In_ HANDLE hCatalog, @@ -323,24 +318,7 @@ BOOL CryptDestroyHash( HCRYPTHASH hHash ); -BOOL CryptEncrypt( - HCRYPTKEY hKey, - HCRYPTHASH hHash, - BOOL Final, - DWORD dwFlags, - BYTE *pbData, - DWORD *pdwDataLen, - DWORD dwBufLen -); -BOOL CryptDecrypt( - HCRYPTKEY hKey, - HCRYPTHASH hHash, - BOOL Final, - DWORD dwFlags, - BYTE *pbData, - DWORD *pdwDataLen -); BOOL CryptDeriveKey( HCRYPTPROV hProv, diff --git a/ctypes_generation/definitions/functions/file.txt b/ctypes_generation/definitions/functions/file.txt index 59cc2ef..0149b96 100644 --- a/ctypes_generation/definitions/functions/file.txt +++ b/ctypes_generation/definitions/functions/file.txt @@ -45,9 +45,6 @@ BOOL FindCloseChangeNotification( HANDLE hChangeHandle ); -BOOL FindNextChangeNotification( - HANDLE hChangeHandle -); BOOL ReadDirectoryChangesW( HANDLE hDirectory, diff --git a/ctypes_generation/definitions/functions/internet.txt b/ctypes_generation/definitions/functions/internet.txt index 2865a6f..4517e2a 100644 --- a/ctypes_generation/definitions/functions/internet.txt +++ b/ctypes_generation/definitions/functions/internet.txt @@ -104,21 +104,7 @@ BOOL InternetSetOptionW( DWORD dwBufferLength ); -BOOL HttpSendRequestA( - HINTERNET hRequest, - LPCSTR lpszHeaders, - DWORD dwHeadersLength, - LPVOID lpOptional, - DWORD dwOptionalLength -); -BOOL HttpSendRequestW( - HINTERNET hRequest, - LPCWSTR lpszHeaders, - DWORD dwHeadersLength, - LPVOID lpOptional, - DWORD dwOptionalLength -); BOOL InternetReadFile( HINTERNET hFile, diff --git a/ctypes_generation/definitions/functions/netapi.txt b/ctypes_generation/definitions/functions/netapi.txt index 517611d..6112fa0 100644 --- a/ctypes_generation/definitions/functions/netapi.txt +++ b/ctypes_generation/definitions/functions/netapi.txt @@ -1,14 +1,3 @@ -NET_API_STATUS NetLocalGroupGetMembers( - [in] LPCWSTR servername, - [in] LPCWSTR localgroupname, - [in] DWORD level, - [out] LPBYTE *bufptr, - [in] DWORD prefmaxlen, - [out] LPDWORD entriesread, - [out] LPDWORD totalentries, - [in, out] PDWORD_PTR resumehandle -); - NET_API_STATUS NetQueryDisplayInformation( [in] LPCWSTR ServerName, [in] DWORD Level, @@ -68,12 +57,6 @@ NET_API_STATUS NetLocalGroupEnum( [in, out] PDWORD_PTR resumehandle ); -NET_API_STATUS NetLocalGroupGetInfo( - [in] LPCWSTR servername, - [in] LPCWSTR groupname, - [in] DWORD level, - [out] LPBYTE *bufptr -); NET_API_STATUS NetLocalGroupGetMembers( [in] LPCWSTR servername, @@ -93,17 +76,6 @@ NET_API_STATUS NetLocalGroupGetInfo( [out] LPBYTE *bufptr ); -NET_API_STATUS NetLocalGroupEnum( - [in] LPCWSTR servername, - [in] DWORD level, - [out] LPBYTE *bufptr, - [in] DWORD prefmaxlen, - [out] LPDWORD entriesread, - [out] LPDWORD totalentries, - [in, out] PDWORD_PTR resumehandle -); - - NET_API_STATUS NetApiBufferFree( [in] LPVOID Buffer ); \ No newline at end of file diff --git a/ctypes_generation/definitions/functions/security.txt b/ctypes_generation/definitions/functions/security.txt index 6b0303d..3e1e2a5 100644 --- a/ctypes_generation/definitions/functions/security.txt +++ b/ctypes_generation/definitions/functions/security.txt @@ -333,9 +333,4 @@ BOOL WINAPI MakeSelfRelativeSD( [in] PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor, [out, optional] PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor, [in, out] LPDWORD lpdwBufferLength -); - -BOOL WINAPI InitializeSecurityDescriptor( - [out] PSECURITY_DESCRIPTOR pSecurityDescriptor, - [in] DWORD dwRevision -); +); \ No newline at end of file diff --git a/ctypes_generation/definitions/functions/service.txt b/ctypes_generation/definitions/functions/service.txt index d689a19..b2f88fb 100644 --- a/ctypes_generation/definitions/functions/service.txt +++ b/ctypes_generation/definitions/functions/service.txt @@ -67,11 +67,6 @@ SC_HANDLE WINAPI OpenServiceW( _In_ DWORD dwDesiredAccess ); -BOOL ControlService( - SC_HANDLE hService, - DWORD dwControl, - LPSERVICE_STATUS lpServiceStatus -); BOOL QueryServiceStatus( SC_HANDLE hService, diff --git a/ctypes_generation/definitions/functions/syscall.txt b/ctypes_generation/definitions/functions/syscall.txt index 0141265..6ddb980 100644 --- a/ctypes_generation/definitions/functions/syscall.txt +++ b/ctypes_generation/definitions/functions/syscall.txt @@ -314,19 +314,6 @@ NTSTATUS WINAPI NtFreeVirtualMemory( ); - -NTSTATUS WINAPI NtGetContextThread( - __in HANDLE hThread, - __inout LPCONTEXT lpContext -); - - -NTSTATUS WINAPI NtSetContextThread( - __in HANDLE hThread, - __in CONST LPCONTEXT lpContext -); - - NTSTATUS NtCreateSection( PHANDLE SectionHandle, ACCESS_MASK DesiredAccess, diff --git a/ctypes_generation/definitions/functions/winfunc.txt b/ctypes_generation/definitions/functions/winfunc.txt index d77d7c6..3b22324 100644 --- a/ctypes_generation/definitions/functions/winfunc.txt +++ b/ctypes_generation/definitions/functions/winfunc.txt @@ -150,13 +150,6 @@ HANDLE WINAPI CreateRemoteThread( _Out_ LPDWORD lpThreadId ); -BOOL WINAPI VirtualProtect( - _In_ LPVOID lpAddress, - _In_ SIZE_T dwSize, - _In_ DWORD flNewProtect, - _Out_ PDWORD lpflOldProtect -); - BOOL WINAPI CreateProcessA( __in_opt LPCSTR lpApplicationName, __inout_opt LPSTR lpCommandLine, @@ -300,15 +293,6 @@ HANDLE WINAPI CreateFileW( ); - - - -BOOL WINAPI OpenProcessToken( - _In_ HANDLE ProcessHandle, - _In_ DWORD DesiredAccess, - _Out_ PHANDLE TokenHandle -); - BOOL WINAPI DuplicateToken( _In_ HANDLE ExistingTokenHandle, _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, @@ -326,13 +310,6 @@ BOOL WINAPI DuplicateTokenEx( ); -BOOL WINAPI OpenThreadToken( - _In_ HANDLE ThreadHandle, - _In_ DWORD DesiredAccess, - _In_ BOOL OpenAsSelf, - _Out_ PHANDLE TokenHandle -); - BOOL WINAPI SetThreadToken( _In_opt_ PHANDLE Thread, _In_opt_ HANDLE Token @@ -540,14 +517,6 @@ BOOL WINAPI DeviceIoControl( _Inout_opt_ LPOVERLAPPED lpOverlapped ); -BOOL WINAPI GetTokenInformation( - _In_ HANDLE TokenHandle, - _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, - _Out_opt_ LPVOID TokenInformation, - _In_ DWORD TokenInformationLength, - _Out_ PDWORD ReturnLength -); - BOOL WINAPI Wow64DisableWow64FsRedirection( _Out_ PVOID *OldValue @@ -571,12 +540,6 @@ BOOL WINAPI SetConsoleCtrlHandler( _In_ BOOL Add ); -LONG WINAPI WinVerifyTrust( - _In_opt_ HWND hwnd, - _In_ GUID *pgActionID, - _Inout_ LPVOID pWVTData -); - HGLOBAL WINAPI GlobalAlloc( _In_ UINT uFlags, _In_ SIZE_T dwBytes diff --git a/ctypes_generation/definitions/simple_types.txt b/ctypes_generation/definitions/simple_types.txt index e41e41b..bbbf8e0 100644 --- a/ctypes_generation/definitions/simple_types.txt +++ b/ctypes_generation/definitions/simple_types.txt @@ -9,8 +9,6 @@ NTSTATUS = DWORD TDHSTATUS = ULONG DNS_STATUS = ULONG LSTATUS = LONG # Registry functions return value | typedef _Return_type_success_(return==ERROR_SUCCESS) LONG LSTATUS; -SECURITY_INFORMATION = DWORD -PSECURITY_INFORMATION = POINTER(SECURITY_INFORMATION) PULONG = POINTER(ULONG) PDWORD = POINTER(DWORD) LPDWORD = POINTER(DWORD) @@ -66,8 +64,6 @@ PULONG64 = POINTER(ULONG64) PBYTE = POINTER(BYTE) PUINT = POINTER(UINT) PHKEY = POINTER(HKEY) -ACCESS_MASK = DWORD -REGSAM = ACCESS_MASK PBOOLEAN = POINTER(BOOLEAN) SECURITY_CONTEXT_TRACKING_MODE = BOOLEAN HCRYPTPROV_LEGACY = PULONG @@ -118,7 +114,6 @@ INT64 = LONGLONG UINT8 = BYTE UINT16 = USHORT UINT32 = UINT -UINT64 = ULONGLONG /* LONG sized (lol..) */ ULONG32 = UINT32 @@ -160,6 +155,8 @@ PSECURITY_DESCRIPTOR_CONTROL = POINTER(SECURITY_DESCRIPTOR_CONTROL) ACCESS_MASK = DWORD PACCESS_MASK = POINTER(ACCESS_MASK) +REGSAM = ACCESS_MASK + SECURITY_INFORMATION = DWORD PSECURITY_INFORMATION = POINTER(SECURITY_INFORMATION) PSECURITY_ATTRIBUTES_OPAQUE = PVOID diff --git a/ctypes_generation/definitions/structures/alpc.txt b/ctypes_generation/definitions/structures/alpc.txt index 3e29974..47d7b6f 100644 --- a/ctypes_generation/definitions/structures/alpc.txt +++ b/ctypes_generation/definitions/structures/alpc.txt @@ -63,16 +63,16 @@ typedef union _PORT_MESSAGE32_TMP_UNION { ULONG ClientViewSize; ULONG CallbackId; -} PORT_MESSAGE_TMP_UNION; +} PORT_MESSAGE32_TMP_UNION; typedef union _PORT_MESSAGE64_TMP_UNION { ULONGLONG ClientViewSize; ULONG CallbackId; -} PORT_MESSAGE_TMP_UNION; +} PORT_MESSAGE64_TMP_UNION; -typedef struct _PORT_MESSAGE_TMP_SUBSTRUCT_S1 +typedef struct { CSHORT DataLength; CSHORT TotalLength; diff --git a/ctypes_generation/definitions/structures/cfgmgr32.txt b/ctypes_generation/definitions/structures/cfgmgr32.txt index 6e4c9e6..942f1a4 100644 --- a/ctypes_generation/definitions/structures/cfgmgr32.txt +++ b/ctypes_generation/definitions/structures/cfgmgr32.txt @@ -193,25 +193,12 @@ typedef struct CS_Resource_s { CS_DES CS_Header; } CS_RESOURCE, *PCS_RESOURCE; -typedef struct DMA_Des_s { - DWORD DD_Count; - DWORD DD_Type; - DWORD DD_Flags; - ULONG DD_Alloc_Chan; -} DMA_DES, *PDMA_DES; typedef struct DMA_Resource_s { DMA_DES DMA_Header; DMA_RANGE DMA_Data[ANYSIZE_ARRAY]; } DMA_RESOURCE, *PDMA_RESOURCE; -typedef struct IO_Des_s { - DWORD IOD_Count; - DWORD IOD_Type; - DWORDLONG IOD_Alloc_Base; - DWORDLONG IOD_Alloc_End; - DWORD IOD_DesFlags; -} IO_DES, *PIO_DES; typedef struct IO_Resource_s { IO_DES IO_Header; diff --git a/ctypes_generation/definitions/structures/crypto.txt b/ctypes_generation/definitions/structures/crypto.txt index 3145a52..ac41ab2 100644 --- a/ctypes_generation/definitions/structures/crypto.txt +++ b/ctypes_generation/definitions/structures/crypto.txt @@ -98,12 +98,6 @@ typedef struct _CTL_ENTRY { } CTL_ENTRY, *PCTL_ENTRY; -typedef struct _CRYPT_ATTRIBUTE { - LPSTR pszObjId; - DWORD cValue; - PCRYPT_ATTR_BLOB rgValue; -} CRYPT_ATTRIBUTE, *PCRYPT_ATTRIBUTE; - typedef struct _CRYPT_ATTRIBUTES { DWORD cAttr; PCRYPT_ATTRIBUTE rgAttr; @@ -597,15 +591,6 @@ typedef struct _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO { -typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO { - DWORD cbSize; - CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; - PVOID pvKeyEncryptionAuxInfo; - HCRYPTPROV_LEGACY hCryptProv; - CRYPT_BIT_BLOB RecipientPublicKey; - CERT_ID RecipientId; -} CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO; - typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO { DWORD cbSize; CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; diff --git a/ctypes_generation/definitions/structures/disk.txt b/ctypes_generation/definitions/structures/disk.txt index 75cde41..fea7928 100644 --- a/ctypes_generation/definitions/structures/disk.txt +++ b/ctypes_generation/definitions/structures/disk.txt @@ -90,4 +90,4 @@ typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS { ULONGLONG RestrictedLength; } Version2; }; -} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; \ No newline at end of file +} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; diff --git a/ctypes_generation/definitions/structures/lsa.txt b/ctypes_generation/definitions/structures/lsa.txt index 88ac25a..6f32db4 100644 --- a/ctypes_generation/definitions/structures/lsa.txt +++ b/ctypes_generation/definitions/structures/lsa.txt @@ -49,12 +49,6 @@ typedef struct _POLICY_ACCOUNT_DOMAIN_INFO { } POLICY_ACCOUNT_DOMAIN_INFO, *PPOLICY_ACCOUNT_DOMAIN_INFO; -typedef struct _POLICY_PRIMARY_DOMAIN_INFO { - LSA_UNICODE_STRING Name; - PSID Sid; -} POLICY_PRIMARY_DOMAIN_INFO, *PPOLICY_PRIMARY_DOMAIN_INFO; - - typedef struct _LSA_TRANSLATED_SID { SID_NAME_USE Use; ULONG RelativeId; diff --git a/ctypes_generation/definitions/structures/winstruct.txt b/ctypes_generation/definitions/structures/winstruct.txt index 6415d29..12ca82a 100644 --- a/ctypes_generation/definitions/structures/winstruct.txt +++ b/ctypes_generation/definitions/structures/winstruct.txt @@ -862,10 +862,6 @@ typedef enum _SE_OBJECT_TYPE { SE_REGISTRY_WOW64_32KEY = 12, } SE_OBJECT_TYPE; -typedef enum _SECTION_INHERIT { - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; typedef struct _CLIENT_ID{ HANDLE UniqueProcess; @@ -2025,13 +2021,6 @@ typedef struct _FILE_FS_OBJECTID_INFORMATION { UCHAR ExtendedInfo[48]; } FILE_FS_OBJECTID_INFORMATION, *PFILE_FS_OBJECTID_INFORMATION; -typedef struct _FILE_FS_DRIVER_PATH_INFORMATION { - BOOLEAN DriverInPath; - ULONG DriverNameLength; - WCHAR DriverName[1]; -} FILE_FS_DRIVER_PATH_INFORMATION, *PFILE_FS_DRIVER_PATH_INFORMATION; - - typedef struct _FILE_FS_DRIVER_PATH_INFORMATION { BOOLEAN DriverInPath; ULONG DriverNameLength; diff --git a/ctypes_generation/definitions/structures/winstruct_apisetmap.txt b/ctypes_generation/definitions/structures/winstruct_apisetmap.txt index 07a54a3..083cbb6 100644 --- a/ctypes_generation/definitions/structures/winstruct_apisetmap.txt +++ b/ctypes_generation/definitions/structures/winstruct_apisetmap.txt @@ -62,7 +62,7 @@ typedef struct _API_SET_VALUE_ARRAY_V4 { ULONG GuessFlags; ULONG Count; API_SET_VALUE_ENTRY_V2 Array[ANYSIZE_ARRAY]; -} API_SET_VALUE_ARRAY_V4,*PAPI_SET_VALUE_ARRAY_V2; +} API_SET_VALUE_ARRAY_V4,*PAPI_SET_VALUE_ARRAY_V4; typedef struct _API_SET_NAMESPACE_ARRAY_V4 { ULONG Version; diff --git a/ctypes_generation/generate.py b/ctypes_generation/generate.py index 6918eed..9f9beff 100644 --- a/ctypes_generation/generate.py +++ b/ctypes_generation/generate.py @@ -47,6 +47,9 @@ class ParsedFile(object): self.compute_imports_exports(self.data) def add_exports(self, *names): + new_names = set(names) + if self.exports & new_names: + raise ValueError("Error: file <{0}> have multiple definition for <{1}>".format(self.filename, self.exports & new_names)) self.exports.update(names) def add_imports(self, *names): @@ -69,23 +72,24 @@ class StructureParsedFile(ParsedFile): structs, enums = data for enum in enums: self.add_exports(enum.name) - self.add_exports(*enum.typedef) + self.add_exports(*[n for n in enum.typedef if n != enum.name]) for struct in structs: self.compute_imports_exports_for_struct(struct) - def compute_imports_exports_for_struct(self, struct): + def compute_imports_exports_for_struct(self, struct, is_sub_struct=False): self.asser_struct_not_already_in_import(struct) if any(x in self.imports for x in [struct.name] + list(struct.typedef)): print("Export <{0}> defined after first use".format(struct.name)) raise ValueError("LOL") - if struct.name is not None: # Anonymous structs + if struct.name is not None and not is_sub_struct: # Anonymous structs self.add_exports(struct.name) - self.add_exports(*struct.typedef) + if not is_sub_struct: # Sub struct will not be directly exposed : so not an export + self.add_exports(*[n for n in struct.typedef if n != struct.name]) for field_type, field_name, nb_rep in struct.fields: if field_name is None: # Anon sub-struct/union - self.compute_imports_exports_for_struct(field_type) + self.compute_imports_exports_for_struct(field_type, is_sub_struct=True) continue if field_type.name not in self.exports: self.add_imports(field_type.name) @@ -117,6 +121,8 @@ class DefinitionParsedFile(ParsedFile): def compute_imports_exports(self, data): for windef in data: + if windef.name in self.exports: + raise ValueError("File <{filename}> define <{windef}> multiple times".format(filename=self.filename, windef=windef.name)) self.add_exports(windef.name) # No dependancy check on rvalue for now if "|" in windef.code: # Multi flags ? Allow cross-file dependancies # Quick parsing: add all names in the imports @@ -567,12 +573,18 @@ class StructureDocGenerator(NoTemplatedGenerator): self.emitline(struct.name) self.emitline(self.STRUCT_NAME_SEPARATOR * len(struct.name)) # Emit typedef - for name, type in sorted(struct.typedef.items()): + for name, type in sorted(struct.typedef.items()): + # May have no real type def -> ignore + if name == type.name: + continue self.emitline(".. class:: {0}".format(name)) self.emitline("") if hasattr(type, "type"): self.emitline(" Pointer to :class:`{0}`".format(type.type.name)) else: + if "SYMSRV_INDEX_INFOW" in type.name: + import pdb;pdb.set_trace() + self.emitline(" Alias for :class:`{0}`".format(type.name)) self.emitline("") # Emit struct Definition @@ -606,6 +618,9 @@ class StructureDocGenerator(NoTemplatedGenerator): self.emitline(self.STRUCT_NAME_SEPARATOR * len(enum.name)) # Emit typedef for name, type in sorted(enum.typedef.items()): + # May have no real type def -> ignore + if name == type.name: + continue self.emitline(".. class:: {0}".format(name)) self.emitline("") if hasattr(type, "type"): diff --git a/docs/source/windef_generated.rst b/docs/source/windef_generated.rst index b6ac74d..2466055 100644 --- a/docs/source/windef_generated.rst +++ b/docs/source/windef_generated.rst @@ -492,8 +492,6 @@ WinDef .. autodata:: EVENT_TRACE_USE_PAGED_MEMORY .. autodata:: EVENT_TRACE_FILE_MODE_NEWFILE .. autodata:: EVENT_TRACE_FILE_MODE_PREALLOCATE -.. autodata:: EVENT_TRACE_FILE_MODE_NEWFILE -.. autodata:: EVENT_TRACE_FILE_MODE_PREALLOCATE .. autodata:: EVENT_TRACE_NONSTOPPABLE_MODE .. autodata:: EVENT_TRACE_SECURE_MODE .. autodata:: EVENT_TRACE_USE_KBYTES_FOR_SIZE @@ -1154,7 +1152,6 @@ WinDef .. autodata:: SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE .. autodata:: SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE .. autodata:: SYSTEM_MANDATORY_LABEL_ACE_TYPE -.. autodata:: ACCESS_MAX_MS_V5_ACE_TYPE .. autodata:: SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE .. autodata:: SYSTEM_SCOPED_POLICY_ID_ACE_TYPE .. autodata:: SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE @@ -1246,8 +1243,6 @@ WinDef .. autodata:: SERVICE_DRIVER .. autodata:: SERVICE_WIN32_OWN_PROCESS .. autodata:: SERVICE_WIN32_SHARE_PROCESS -.. autodata:: SERVICE_USER_OWN_PROCESS -.. autodata:: SERVICE_USER_SHARE_PROCESS .. autodata:: SERVICE_WIN32 .. autodata:: SERVICE_INTERACTIVE_PROCESS .. autodata:: SERVICE_TYPE_ALL @@ -1844,6 +1839,9 @@ WinDef .. autodata:: TH32CS_SNAPALL .. autodata:: TH32CS_INHERIT .. autodata:: CONTEXT_I386 +.. autodata:: CONTEXT_AMD64 +.. autodata:: CONTEXT_ARM +.. autodata:: CONTEXT_ARM64 .. autodata:: CONTEXT_CONTROL .. autodata:: CONTEXT_INTEGER .. autodata:: CONTEXT_SEGMENTS @@ -1852,8 +1850,6 @@ WinDef .. autodata:: CONTEXT_EXTENDED_REGISTERS .. autodata:: CONTEXT_FULL .. autodata:: CONTEXT_ALL -.. autodata:: CONTEXT_FULL -.. autodata:: CONTEXT_ALL .. autodata:: CONTEXT_XSTATE .. autodata:: PAGE_NOACCESS .. autodata:: PAGE_READONLY diff --git a/docs/source/winstructs_generated.rst b/docs/source/winstructs_generated.rst index 8e26a48..37f32a3 100644 --- a/docs/source/winstructs_generated.rst +++ b/docs/source/winstructs_generated.rst @@ -59,12 +59,6 @@ Simple types .. autoclass:: LSTATUS -.. autoclass:: SECURITY_INFORMATION - -.. class:: PSECURITY_INFORMATION - - Pointer to :class:`SECURITY_INFORMATION` - .. class:: PULONG Pointer to :class:`ULONG` @@ -205,10 +199,6 @@ Simple types Pointer to :class:`HKEY` -.. autoclass:: ACCESS_MASK - -.. autoclass:: REGSAM - .. class:: PBOOLEAN Pointer to :class:`BOOLEAN` @@ -287,8 +277,6 @@ Simple types .. autoclass:: UINT32 -.. autoclass:: UINT64 - .. autoclass:: ULONG32 .. autoclass:: LONG32 @@ -351,6 +339,8 @@ Simple types Pointer to :class:`ACCESS_MASK` +.. autoclass:: REGSAM + .. autoclass:: SECURITY_INFORMATION .. class:: PSECURITY_INFORMATION @@ -546,10 +536,6 @@ __MIDL_IBackgroundCopyJob2_0004 BG_AUTH_CREDENTIALS ''''''''''''''''''' -.. class:: BG_AUTH_CREDENTIALS - - Alias for :class:`BG_AUTH_CREDENTIALS` - .. class:: BG_AUTH_CREDENTIALS .. attribute:: Target @@ -1118,37 +1104,6 @@ CS_Resource_s :class:`CS_DES` -DMA_Des_s -''''''''' -.. class:: DMA_DES - - Alias for :class:`DMA_Des_s` - -.. class:: PDMA_DES - - Pointer to :class:`DMA_Des_s` - -.. class:: DMA_Des_s - - .. attribute:: DD_Count - - :class:`DWORD` - - - .. attribute:: DD_Type - - :class:`DWORD` - - - .. attribute:: DD_Flags - - :class:`DWORD` - - - .. attribute:: DD_Alloc_Chan - - :class:`ULONG` - DMA_Resource_s '''''''''''''' .. class:: DMA_RESOURCE @@ -1170,42 +1125,6 @@ DMA_Resource_s :class:`DMA_RANGE` ``[ANYSIZE_ARRAY]`` -IO_Des_s -'''''''' -.. class:: IO_DES - - Alias for :class:`IO_Des_s` - -.. class:: PIO_DES - - Pointer to :class:`IO_Des_s` - -.. class:: IO_Des_s - - .. attribute:: IOD_Count - - :class:`DWORD` - - - .. attribute:: IOD_Type - - :class:`DWORD` - - - .. attribute:: IOD_Alloc_Base - - :class:`DWORDLONG` - - - .. attribute:: IOD_Alloc_End - - :class:`DWORDLONG` - - - .. attribute:: IOD_DesFlags - - :class:`DWORD` - IO_Resource_s ''''''''''''' .. class:: IO_RESOURCE @@ -2551,10 +2470,6 @@ _MIB_IPNETTABLE IP6_ADDRESS ''''''''''' -.. class:: IP6_ADDRESS - - Alias for :class:`IP6_ADDRESS` - .. class:: PIP6_ADDRESS Pointer to :class:`IP6_ADDRESS` @@ -3137,10 +3052,6 @@ _DNS_CACHE_ENTRY DNS_A_DATA '''''''''' -.. class:: DNS_A_DATA - - Alias for :class:`DNS_A_DATA` - .. class:: PDNS_A_DATA Pointer to :class:`DNS_A_DATA` @@ -3153,10 +3064,6 @@ DNS_A_DATA DNS_PTR_DATAW ''''''''''''' -.. class:: DNS_PTR_DATAW - - Alias for :class:`DNS_PTR_DATAW` - .. class:: PDNS_PTR_DATAW Pointer to :class:`DNS_PTR_DATAW` @@ -3169,10 +3076,6 @@ DNS_PTR_DATAW DNS_PTR_DATAA ''''''''''''' -.. class:: DNS_PTR_DATAA - - Alias for :class:`DNS_PTR_DATAA` - .. class:: PDNS_PTR_DATAA Pointer to :class:`DNS_PTR_DATAA` @@ -3185,10 +3088,6 @@ DNS_PTR_DATAA DNS_SOA_DATAW ''''''''''''' -.. class:: DNS_SOA_DATAW - - Alias for :class:`DNS_SOA_DATAW` - .. class:: PDNS_SOA_DATAW Pointer to :class:`DNS_SOA_DATAW` @@ -3231,10 +3130,6 @@ DNS_SOA_DATAW DNS_SOA_DATAA ''''''''''''' -.. class:: DNS_SOA_DATAA - - Alias for :class:`DNS_SOA_DATAA` - .. class:: PDNS_SOA_DATAA Pointer to :class:`DNS_SOA_DATAA` @@ -3277,10 +3172,6 @@ DNS_SOA_DATAA DNS_MINFO_DATAW ''''''''''''''' -.. class:: DNS_MINFO_DATAW - - Alias for :class:`DNS_MINFO_DATAW` - .. class:: PDNS_MINFO_DATAW Pointer to :class:`DNS_MINFO_DATAW` @@ -3298,10 +3189,6 @@ DNS_MINFO_DATAW DNS_MINFO_DATAA ''''''''''''''' -.. class:: DNS_MINFO_DATAA - - Alias for :class:`DNS_MINFO_DATAA` - .. class:: PDNS_MINFO_DATAA Pointer to :class:`DNS_MINFO_DATAA` @@ -3319,10 +3206,6 @@ DNS_MINFO_DATAA DNS_MX_DATAW '''''''''''' -.. class:: DNS_MX_DATAW - - Alias for :class:`DNS_MX_DATAW` - .. class:: PDNS_MX_DATAW Pointer to :class:`DNS_MX_DATAW` @@ -3345,10 +3228,6 @@ DNS_MX_DATAW DNS_MX_DATAA '''''''''''' -.. class:: DNS_MX_DATAA - - Alias for :class:`DNS_MX_DATAA` - .. class:: PDNS_MX_DATAA Pointer to :class:`DNS_MX_DATAA` @@ -3371,10 +3250,6 @@ DNS_MX_DATAA DNS_TXT_DATAW ''''''''''''' -.. class:: DNS_TXT_DATAW - - Alias for :class:`DNS_TXT_DATAW` - .. class:: PDNS_TXT_DATAW Pointer to :class:`DNS_TXT_DATAW` @@ -3392,10 +3267,6 @@ DNS_TXT_DATAW DNS_TXT_DATAA ''''''''''''' -.. class:: DNS_TXT_DATAA - - Alias for :class:`DNS_TXT_DATAA` - .. class:: PDNS_TXT_DATAA Pointer to :class:`DNS_TXT_DATAA` @@ -3413,10 +3284,6 @@ DNS_TXT_DATAA DNS_NULL_DATA ''''''''''''' -.. class:: DNS_NULL_DATA - - Alias for :class:`DNS_NULL_DATA` - .. class:: PDNS_NULL_DATA Pointer to :class:`DNS_NULL_DATA` @@ -3434,10 +3301,6 @@ DNS_NULL_DATA DNS_WKS_DATA '''''''''''' -.. class:: DNS_WKS_DATA - - Alias for :class:`DNS_WKS_DATA` - .. class:: PDNS_WKS_DATA Pointer to :class:`DNS_WKS_DATA` @@ -3460,10 +3323,6 @@ DNS_WKS_DATA DNS_AAAA_DATA ''''''''''''' -.. class:: DNS_AAAA_DATA - - Alias for :class:`DNS_AAAA_DATA` - .. class:: PDNS_AAAA_DATA Pointer to :class:`DNS_AAAA_DATA` @@ -3480,10 +3339,6 @@ DNS_SIG_DATAW Alias for :class:`DNS_SIG_DATAW` -.. class:: DNS_SIG_DATAW - - Alias for :class:`DNS_SIG_DATAW` - .. class:: PDNS_RRSIG_DATAW Pointer to :class:`DNS_SIG_DATAW` @@ -3549,10 +3404,6 @@ DNS_SIG_DATAA Alias for :class:`DNS_SIG_DATAA` -.. class:: DNS_SIG_DATAA - - Alias for :class:`DNS_SIG_DATAA` - .. class:: PDNS_RRSIG_DATAA Pointer to :class:`DNS_SIG_DATAA` @@ -3618,10 +3469,6 @@ DNS_KEY_DATA Alias for :class:`DNS_KEY_DATA` -.. class:: DNS_KEY_DATA - - Alias for :class:`DNS_KEY_DATA` - .. class:: PDNS_DNSKEY_DATA Pointer to :class:`DNS_KEY_DATA` @@ -3663,10 +3510,6 @@ DNS_KEY_DATA DNS_DHCID_DATA '''''''''''''' -.. class:: DNS_DHCID_DATA - - Alias for :class:`DNS_DHCID_DATA` - .. class:: PDNS_DHCID_DATA Pointer to :class:`DNS_DHCID_DATA` @@ -3684,10 +3527,6 @@ DNS_DHCID_DATA DNS_NSEC_DATAW '''''''''''''' -.. class:: DNS_NSEC_DATAW - - Alias for :class:`DNS_NSEC_DATAW` - .. class:: PDNS_NSEC_DATAW Pointer to :class:`DNS_NSEC_DATAW` @@ -3715,10 +3554,6 @@ DNS_NSEC_DATAW DNS_NSEC_DATAA '''''''''''''' -.. class:: DNS_NSEC_DATAA - - Alias for :class:`DNS_NSEC_DATAA` - .. class:: PDNS_NSEC_DATAA Pointer to :class:`DNS_NSEC_DATAA` @@ -3746,10 +3581,6 @@ DNS_NSEC_DATAA DNS_NSEC3_DATA '''''''''''''' -.. class:: DNS_NSEC3_DATA - - Alias for :class:`DNS_NSEC3_DATA` - .. class:: PDNS_NSEC3_DATA Pointer to :class:`DNS_NSEC3_DATA` @@ -3792,10 +3623,6 @@ DNS_NSEC3_DATA DNS_NSEC3PARAM_DATA ''''''''''''''''''' -.. class:: DNS_NSEC3PARAM_DATA - - Alias for :class:`DNS_NSEC3PARAM_DATA` - .. class:: PDNS_NSEC3PARAM_DATA Pointer to :class:`DNS_NSEC3PARAM_DATA` @@ -3833,10 +3660,6 @@ DNS_NSEC3PARAM_DATA DNS_DS_DATA ''''''''''' -.. class:: DNS_DS_DATA - - Alias for :class:`DNS_DS_DATA` - .. class:: PDNS_DS_DATA Pointer to :class:`DNS_DS_DATA` @@ -3874,10 +3697,6 @@ DNS_DS_DATA DNS_OPT_DATA '''''''''''' -.. class:: DNS_OPT_DATA - - Alias for :class:`DNS_OPT_DATA` - .. class:: PDNS_OPT_DATA Pointer to :class:`DNS_OPT_DATA` @@ -3900,10 +3719,6 @@ DNS_OPT_DATA DNS_LOC_DATA '''''''''''' -.. class:: DNS_LOC_DATA - - Alias for :class:`DNS_LOC_DATA` - .. class:: PDNS_LOC_DATA Pointer to :class:`DNS_LOC_DATA` @@ -3946,10 +3761,6 @@ DNS_LOC_DATA DNS_NXT_DATAW ''''''''''''' -.. class:: DNS_NXT_DATAW - - Alias for :class:`DNS_NXT_DATAW` - .. class:: PDNS_NXT_DATAW Pointer to :class:`DNS_NXT_DATAW` @@ -3972,10 +3783,6 @@ DNS_NXT_DATAW DNS_NXT_DATAA ''''''''''''' -.. class:: DNS_NXT_DATAA - - Alias for :class:`DNS_NXT_DATAA` - .. class:: PDNS_NXT_DATAA Pointer to :class:`DNS_NXT_DATAA` @@ -3998,10 +3805,6 @@ DNS_NXT_DATAA DNS_SRV_DATAW ''''''''''''' -.. class:: DNS_SRV_DATAW - - Alias for :class:`DNS_SRV_DATAW` - .. class:: PDNS_SRV_DATAW Pointer to :class:`DNS_SRV_DATAW` @@ -4034,10 +3837,6 @@ DNS_SRV_DATAW DNS_SRV_DATAA ''''''''''''' -.. class:: DNS_SRV_DATAA - - Alias for :class:`DNS_SRV_DATAA` - .. class:: PDNS_SRV_DATAA Pointer to :class:`DNS_SRV_DATAA` @@ -4070,10 +3869,6 @@ DNS_SRV_DATAA DNS_NAPTR_DATAW ''''''''''''''' -.. class:: DNS_NAPTR_DATAW - - Alias for :class:`DNS_NAPTR_DATAW` - .. class:: PDNS_NAPTR_DATAW Pointer to :class:`DNS_NAPTR_DATAW` @@ -4111,10 +3906,6 @@ DNS_NAPTR_DATAW DNS_NAPTR_DATAA ''''''''''''''' -.. class:: DNS_NAPTR_DATAA - - Alias for :class:`DNS_NAPTR_DATAA` - .. class:: PDNS_NAPTR_DATAA Pointer to :class:`DNS_NAPTR_DATAA` @@ -4152,10 +3943,6 @@ DNS_NAPTR_DATAA DNS_ATMA_DATA ''''''''''''' -.. class:: DNS_ATMA_DATA - - Alias for :class:`DNS_ATMA_DATA` - .. class:: PDNS_ATMA_DATA Pointer to :class:`DNS_ATMA_DATA` @@ -4173,10 +3960,6 @@ DNS_ATMA_DATA DNS_TKEY_DATAW '''''''''''''' -.. class:: DNS_TKEY_DATAW - - Alias for :class:`DNS_TKEY_DATAW` - .. class:: PDNS_TKEY_DATAW Pointer to :class:`DNS_TKEY_DATAW` @@ -4244,10 +4027,6 @@ DNS_TKEY_DATAW DNS_TKEY_DATAA '''''''''''''' -.. class:: DNS_TKEY_DATAA - - Alias for :class:`DNS_TKEY_DATAA` - .. class:: PDNS_TKEY_DATAA Pointer to :class:`DNS_TKEY_DATAA` @@ -4315,10 +4094,6 @@ DNS_TKEY_DATAA DNS_TSIG_DATAW '''''''''''''' -.. class:: DNS_TSIG_DATAW - - Alias for :class:`DNS_TSIG_DATAW` - .. class:: PDNS_TSIG_DATAW Pointer to :class:`DNS_TSIG_DATAW` @@ -4386,10 +4161,6 @@ DNS_TSIG_DATAW DNS_TSIG_DATAA '''''''''''''' -.. class:: DNS_TSIG_DATAA - - Alias for :class:`DNS_TSIG_DATAA` - .. class:: PDNS_TSIG_DATAA Pointer to :class:`DNS_TSIG_DATAA` @@ -4457,10 +4228,6 @@ DNS_TSIG_DATAA DNS_WINS_DATA ''''''''''''' -.. class:: DNS_WINS_DATA - - Alias for :class:`DNS_WINS_DATA` - .. class:: PDNS_WINS_DATA Pointer to :class:`DNS_WINS_DATA` @@ -4493,10 +4260,6 @@ DNS_WINS_DATA DNS_WINSR_DATAW ''''''''''''''' -.. class:: DNS_WINSR_DATAW - - Alias for :class:`DNS_WINSR_DATAW` - .. class:: PDNS_WINSR_DATAW Pointer to :class:`DNS_WINSR_DATAW` @@ -4524,10 +4287,6 @@ DNS_WINSR_DATAW DNS_WINSR_DATAA ''''''''''''''' -.. class:: DNS_WINSR_DATAA - - Alias for :class:`DNS_WINSR_DATAA` - .. class:: PDNS_WINSR_DATAA Pointer to :class:`DNS_WINSR_DATAA` @@ -4555,10 +4314,6 @@ DNS_WINSR_DATAA DNS_TLSA_DATA ''''''''''''' -.. class:: DNS_TLSA_DATA - - Alias for :class:`DNS_TLSA_DATA` - .. class:: PDNS_TLSA_DATA Pointer to :class:`DNS_TLSA_DATA` @@ -4596,10 +4351,6 @@ DNS_TLSA_DATA DNS_UNKNOWN_DATA '''''''''''''''' -.. class:: DNS_UNKNOWN_DATA - - Alias for :class:`DNS_UNKNOWN_DATA` - .. class:: PDNS_UNKNOWN_DATA Pointer to :class:`DNS_UNKNOWN_DATA` @@ -4936,10 +4687,6 @@ _DNS_QUERY_RESULT IP_ADDRESS_STRING ''''''''''''''''' -.. class:: IP_ADDRESS_STRING - - Alias for :class:`IP_ADDRESS_STRING` - .. class:: IP_MASK_STRING Alias for :class:`IP_ADDRESS_STRING` @@ -7427,10 +7174,6 @@ SYMSRV_INDEX_INFOW Pointer to :class:`SYMSRV_INDEX_INFOW` -.. class:: SYMSRV_INDEX_INFOW - - Alias for :class:`SYMSRV_INDEX_INFOW` - .. class:: SYMSRV_INDEX_INFOW .. attribute:: sizeofstruct @@ -7488,10 +7231,6 @@ SYMSRV_INDEX_INFO Pointer to :class:`SYMSRV_INDEX_INFO` -.. class:: SYMSRV_INDEX_INFO - - Alias for :class:`SYMSRV_INDEX_INFO` - .. class:: SYMSRV_INDEX_INFO .. attribute:: sizeofstruct @@ -14525,32 +14264,6 @@ _FILE_FS_DRIVER_PATH_INFORMATION :class:`WCHAR` -_FILE_FS_DRIVER_PATH_INFORMATION -'''''''''''''''''''''''''''''''' -.. class:: FILE_FS_DRIVER_PATH_INFORMATION - - Alias for :class:`_FILE_FS_DRIVER_PATH_INFORMATION` - -.. class:: PFILE_FS_DRIVER_PATH_INFORMATION - - Pointer to :class:`_FILE_FS_DRIVER_PATH_INFORMATION` - -.. class:: _FILE_FS_DRIVER_PATH_INFORMATION - - .. attribute:: DriverInPath - - :class:`BOOLEAN` - - - .. attribute:: DriverNameLength - - :class:`ULONG` - - - .. attribute:: DriverName - - :class:`WCHAR` - _FILE_FS_VOLUME_INFORMATION ''''''''''''''''''''''''''' .. class:: FILE_FS_VOLUME_INFORMATION @@ -14994,7 +14707,7 @@ _ALPC_MESSAGE_ATTRIBUTES _PORT_MESSAGE32_TMP_UNION ''''''''''''''''''''''''' -.. class:: PORT_MESSAGE_TMP_UNION +.. class:: PORT_MESSAGE32_TMP_UNION Alias for :class:`_PORT_MESSAGE32_TMP_UNION` @@ -15011,7 +14724,7 @@ _PORT_MESSAGE32_TMP_UNION _PORT_MESSAGE64_TMP_UNION ''''''''''''''''''''''''' -.. class:: PORT_MESSAGE_TMP_UNION +.. class:: PORT_MESSAGE64_TMP_UNION Alias for :class:`_PORT_MESSAGE64_TMP_UNION` @@ -15028,10 +14741,6 @@ _PORT_MESSAGE64_TMP_UNION _PORT_MESSAGE_TMP_SUBSTRUCT_S1 '''''''''''''''''''''''''''''' -.. class:: _PORT_MESSAGE_TMP_SUBSTRUCT_S1 - - Alias for :class:`_PORT_MESSAGE_TMP_SUBSTRUCT_S1` - .. class:: _PORT_MESSAGE_TMP_SUBSTRUCT_S1 .. attribute:: DataLength @@ -15045,10 +14754,6 @@ _PORT_MESSAGE_TMP_SUBSTRUCT_S1 _PORT_MESSAGE_TMP_UNION_U1 '''''''''''''''''''''''''' -.. class:: _PORT_MESSAGE_TMP_UNION_U1 - - Alias for :class:`_PORT_MESSAGE_TMP_UNION_U1` - .. class:: _PORT_MESSAGE_TMP_UNION_U1 .. attribute:: Length @@ -15062,10 +14767,6 @@ _PORT_MESSAGE_TMP_UNION_U1 _PORT_MESSAGE_TMP_SUBSTRUCT_S2 '''''''''''''''''''''''''''''' -.. class:: _PORT_MESSAGE_TMP_SUBSTRUCT_S2 - - Alias for :class:`_PORT_MESSAGE_TMP_SUBSTRUCT_S2` - .. class:: _PORT_MESSAGE_TMP_SUBSTRUCT_S2 .. attribute:: Type @@ -15079,10 +14780,6 @@ _PORT_MESSAGE_TMP_SUBSTRUCT_S2 _PORT_MESSAGE_TMP_UNION_U2 '''''''''''''''''''''''''' -.. class:: _PORT_MESSAGE_TMP_UNION_U2 - - Alias for :class:`_PORT_MESSAGE_TMP_UNION_U2` - .. class:: _PORT_MESSAGE_TMP_UNION_U2 .. attribute:: ZeroInit @@ -15202,10 +14899,6 @@ _ALPC_SERVER_INFORMATION_TMP_OUT ALPC_SERVER_INFORMATION ''''''''''''''''''''''' -.. class:: ALPC_SERVER_INFORMATION - - Alias for :class:`ALPC_SERVER_INFORMATION` - .. class:: ALPC_SERVER_INFORMATION .. attribute:: In @@ -16891,32 +16584,6 @@ _CTL_ENTRY :class:`PCRYPT_ATTRIBUTE` -_CRYPT_ATTRIBUTE -'''''''''''''''' -.. class:: CRYPT_ATTRIBUTE - - Alias for :class:`_CRYPT_ATTRIBUTE` - -.. class:: PCRYPT_ATTRIBUTE - - Pointer to :class:`_CRYPT_ATTRIBUTE` - -.. class:: _CRYPT_ATTRIBUTE - - .. attribute:: pszObjId - - :class:`LPSTR` - - - .. attribute:: cValue - - :class:`DWORD` - - - .. attribute:: rgValue - - :class:`PCRYPT_ATTR_BLOB` - _CRYPT_ATTRIBUTES ''''''''''''''''' .. class:: CRYPT_ATTRIBUTES @@ -18913,47 +18580,6 @@ _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO :class:`CERT_ID` -_CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO -''''''''''''''''''''''''''''''''''''' -.. class:: CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO - - Alias for :class:`_CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO` - -.. class:: PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO - - Pointer to :class:`_CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO` - -.. class:: _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO - - .. attribute:: cbSize - - :class:`DWORD` - - - .. attribute:: KeyEncryptionAlgorithm - - :class:`CRYPT_ALGORITHM_IDENTIFIER` - - - .. attribute:: pvKeyEncryptionAuxInfo - - :class:`PVOID` - - - .. attribute:: hCryptProv - - :class:`HCRYPTPROV_LEGACY` - - - .. attribute:: RecipientPublicKey - - :class:`CRYPT_BIT_BLOB` - - - .. attribute:: RecipientId - - :class:`CERT_ID` - _TMPUNION_CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO '''''''''''''''''''''''''''''''''''''''''''''' .. class:: TMPUNION_CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO @@ -21586,27 +21212,6 @@ _POLICY_ACCOUNT_DOMAIN_INFO :class:`PSID` -_POLICY_PRIMARY_DOMAIN_INFO -''''''''''''''''''''''''''' -.. class:: POLICY_PRIMARY_DOMAIN_INFO - - Alias for :class:`_POLICY_PRIMARY_DOMAIN_INFO` - -.. class:: PPOLICY_PRIMARY_DOMAIN_INFO - - Pointer to :class:`_POLICY_PRIMARY_DOMAIN_INFO` - -.. class:: _POLICY_PRIMARY_DOMAIN_INFO - - .. attribute:: Name - - :class:`LSA_UNICODE_STRING` - - - .. attribute:: Sid - - :class:`PSID` - _LSA_TRANSLATED_SID ''''''''''''''''''' .. class:: LSA_TRANSLATED_SID @@ -26144,7 +25749,7 @@ _API_SET_VALUE_ARRAY_V4 Alias for :class:`_API_SET_VALUE_ARRAY_V4` -.. class:: PAPI_SET_VALUE_ARRAY_V2 +.. class:: PAPI_SET_VALUE_ARRAY_V4 Pointer to :class:`_API_SET_VALUE_ARRAY_V4` @@ -26893,11 +26498,6 @@ WinEnums -------- NDR_FORMAT_CHARACTER '''''''''''''''''''' -.. class:: NDR_FORMAT_CHARACTER - - Alias for :class:`NDR_FORMAT_CHARACTER` - - .. class:: NDR_FORMAT_CHARACTER @@ -27672,11 +27272,6 @@ _INTERNAL_IF_OPER_STATUS DNS_FREE_TYPE ''''''''''''' -.. class:: DNS_FREE_TYPE - - Alias for :class:`DNS_FREE_TYPE` - - .. class:: DNS_FREE_TYPE @@ -27786,11 +27381,6 @@ _SC_ENUM_TYPE ACTIVATEOPTIONS ''''''''''''''' -.. class:: ACTIVATEOPTIONS - - Alias for :class:`ACTIVATEOPTIONS` - - .. class:: ACTIVATEOPTIONS @@ -27810,11 +27400,6 @@ ACTIVATEOPTIONS PACKAGE_EXECUTION_STATE ''''''''''''''''''''''' -.. class:: PACKAGE_EXECUTION_STATE - - Alias for :class:`PACKAGE_EXECUTION_STATE` - - .. class:: PACKAGE_EXECUTION_STATE @@ -27834,11 +27419,6 @@ PACKAGE_EXECUTION_STATE SYM_TYPE '''''''' -.. class:: SYM_TYPE - - Alias for :class:`SYM_TYPE` - - .. class:: SYM_TYPE @@ -28233,11 +27813,6 @@ _CBA_EVENT_SEVERITY ADDRESS_MODE '''''''''''' -.. class:: ADDRESS_MODE - - Alias for :class:`ADDRESS_MODE` - - .. class:: ADDRESS_MODE @@ -28467,11 +28042,6 @@ _TASK_CREATION TASK_RUN_FLAGS '''''''''''''' -.. class:: TASK_RUN_FLAGS - - Alias for :class:`TASK_RUN_FLAGS` - - .. class:: TASK_RUN_FLAGS @@ -30369,21 +29939,6 @@ _SE_OBJECT_TYPE .. attribute:: SE_REGISTRY_WOW64_32KEY(12) -_SECTION_INHERIT -'''''''''''''''' -.. class:: SECTION_INHERIT - - Alias for :class:`_SECTION_INHERIT` - - -.. class:: _SECTION_INHERIT - - - .. attribute:: ViewShare(1) - - - .. attribute:: ViewUnmap(2) - tagCOINIT ''''''''' .. class:: COINIT @@ -30697,11 +30252,6 @@ SICHINTF GETPROPERTYSTOREFLAGS ''''''''''''''''''''' -.. class:: GETPROPERTYSTOREFLAGS - - Alias for :class:`GETPROPERTYSTOREFLAGS` - - .. class:: GETPROPERTYSTOREFLAGS @@ -32023,11 +31573,6 @@ _COMPUTER_NAME_FORMAT TRACE_INFO_CLASS '''''''''''''''' -.. class:: TRACE_INFO_CLASS - - Alias for :class:`TRACE_INFO_CLASS` - - .. class:: TRACE_QUERY_INFO_CLASS Alias for :class:`TRACE_INFO_CLASS` @@ -33151,11 +32696,6 @@ tag_WBEM_QUERY_FLAG_TYPE WMIDPREQUESTCODE '''''''''''''''' -.. class:: WMIDPREQUESTCODE - - Alias for :class:`WMIDPREQUESTCODE` - - .. class:: WMIDPREQUESTCODE diff --git a/windows/generated_def/meta.py b/windows/generated_def/meta.py index 0faacfe..84bf8cb 100644 --- a/windows/generated_def/meta.py +++ b/windows/generated_def/meta.py @@ -658,6 +658,9 @@ windef = {'ABOVE_NORMAL_PRIORITY_CLASS', 'COM_EXECUTE_REMOTE', 'CONTAINER_INHERIT_ACE', 'CONTEXT_ALL', +'CONTEXT_AMD64', +'CONTEXT_ARM', +'CONTEXT_ARM64', 'CONTEXT_CONTROL', 'CONTEXT_DEBUG_REGISTERS', 'CONTEXT_EXTENDED_REGISTERS', @@ -12713,6 +12716,7 @@ structs = {'ACCESS_ALLOWED_ACE', 'PAPI_SET_NAMESPACE_ENTRY_V2', 'PAPI_SET_NAMESPACE_ENTRY_V4', 'PAPI_SET_VALUE_ARRAY_V2', +'PAPI_SET_VALUE_ARRAY_V4', 'PAPI_SET_VALUE_ENTRY', 'PAPI_SET_VALUE_ENTRY_V2', 'PARAMDESC', @@ -13080,8 +13084,9 @@ structs = {'ACCESS_ALLOWED_ACE', 'POLICY_PRIMARY_DOMAIN_INFO', 'POPEN_VIRTUAL_DISK_PARAMETERS', 'PORT_MESSAGE32', +'PORT_MESSAGE32_TMP_UNION', 'PORT_MESSAGE64', -'PORT_MESSAGE_TMP_UNION', +'PORT_MESSAGE64_TMP_UNION', 'PORT_VIEW', 'POSVERSIONINFOA', 'POSVERSIONINFOEXA', diff --git a/windows/generated_def/windef.py b/windows/generated_def/windef.py index adbb043..04904b4 100644 --- a/windows/generated_def/windef.py +++ b/windows/generated_def/windef.py @@ -509,8 +509,6 @@ EVENT_TRACE_RELOG_MODE = make_flag("EVENT_TRACE_RELOG_MODE", 0x00010000) EVENT_TRACE_USE_PAGED_MEMORY = make_flag("EVENT_TRACE_USE_PAGED_MEMORY", 0x01000000) EVENT_TRACE_FILE_MODE_NEWFILE = make_flag("EVENT_TRACE_FILE_MODE_NEWFILE", 0x00000008) EVENT_TRACE_FILE_MODE_PREALLOCATE = make_flag("EVENT_TRACE_FILE_MODE_PREALLOCATE", 0x00000020) -EVENT_TRACE_FILE_MODE_NEWFILE = make_flag("EVENT_TRACE_FILE_MODE_NEWFILE", 0x00000008) -EVENT_TRACE_FILE_MODE_PREALLOCATE = make_flag("EVENT_TRACE_FILE_MODE_PREALLOCATE", 0x00000020) EVENT_TRACE_NONSTOPPABLE_MODE = make_flag("EVENT_TRACE_NONSTOPPABLE_MODE", 0x00000040) EVENT_TRACE_SECURE_MODE = make_flag("EVENT_TRACE_SECURE_MODE", 0x00000080) EVENT_TRACE_USE_KBYTES_FOR_SIZE = make_flag("EVENT_TRACE_USE_KBYTES_FOR_SIZE", 0x00002000) @@ -1171,7 +1169,6 @@ SYSTEM_ALARM_CALLBACK_ACE_TYPE = make_flag("SYSTEM_ALARM_CALLBACK_ACE_TYPE", ( 0 SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE = make_flag("SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE", ( 0xF )) SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE = make_flag("SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE", ( 0x10 )) SYSTEM_MANDATORY_LABEL_ACE_TYPE = make_flag("SYSTEM_MANDATORY_LABEL_ACE_TYPE", ( 0x11 )) -ACCESS_MAX_MS_V5_ACE_TYPE = make_flag("ACCESS_MAX_MS_V5_ACE_TYPE", ( 0x11 )) SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE = make_flag("SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE", ( 0x12 )) SYSTEM_SCOPED_POLICY_ID_ACE_TYPE = make_flag("SYSTEM_SCOPED_POLICY_ID_ACE_TYPE", ( 0x13 )) SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE = make_flag("SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE", ( 0x14 )) @@ -1263,8 +1260,6 @@ SERVICE_RECOGNIZER_DRIVER = make_flag("SERVICE_RECOGNIZER_DRIVER", 0x00000008) SERVICE_DRIVER = make_flag("SERVICE_DRIVER", ( SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER )) SERVICE_WIN32_OWN_PROCESS = make_flag("SERVICE_WIN32_OWN_PROCESS", 0x00000010) SERVICE_WIN32_SHARE_PROCESS = make_flag("SERVICE_WIN32_SHARE_PROCESS", 0x00000020) -SERVICE_USER_OWN_PROCESS = make_flag("SERVICE_USER_OWN_PROCESS", 0x00000050) -SERVICE_USER_SHARE_PROCESS = make_flag("SERVICE_USER_SHARE_PROCESS", 0x00000060) SERVICE_WIN32 = make_flag("SERVICE_WIN32", ( SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS )) SERVICE_INTERACTIVE_PROCESS = make_flag("SERVICE_INTERACTIVE_PROCESS", 0x00000100) SERVICE_TYPE_ALL = make_flag("SERVICE_TYPE_ALL", ( SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS )) @@ -1861,6 +1856,9 @@ TH32CS_SNAPMODULE32 = make_flag("TH32CS_SNAPMODULE32", 0x00000010) TH32CS_SNAPALL = make_flag("TH32CS_SNAPALL", ( TH32CS_SNAPHEAPLIST | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD | TH32CS_SNAPMODULE )) TH32CS_INHERIT = make_flag("TH32CS_INHERIT", 0x80000000) CONTEXT_I386 = make_flag("CONTEXT_I386", 0x00010000) +CONTEXT_AMD64 = make_flag("CONTEXT_AMD64", 0x00100000) +CONTEXT_ARM = make_flag("CONTEXT_ARM", 0x00200000) +CONTEXT_ARM64 = make_flag("CONTEXT_ARM64", 0x00400000) CONTEXT_CONTROL = make_flag("CONTEXT_CONTROL", 0x00000001) CONTEXT_INTEGER = make_flag("CONTEXT_INTEGER", 0x00000002) CONTEXT_SEGMENTS = make_flag("CONTEXT_SEGMENTS", 0x00000004) @@ -1869,8 +1867,6 @@ CONTEXT_DEBUG_REGISTERS = make_flag("CONTEXT_DEBUG_REGISTERS", 0x00000010) CONTEXT_EXTENDED_REGISTERS = make_flag("CONTEXT_EXTENDED_REGISTERS", 0x00000020) CONTEXT_FULL = make_flag("CONTEXT_FULL", ( CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS )) CONTEXT_ALL = make_flag("CONTEXT_ALL", ( CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS )) -CONTEXT_FULL = make_flag("CONTEXT_FULL", CONTEXT_I386 | CONTEXT_FULL) -CONTEXT_ALL = make_flag("CONTEXT_ALL", CONTEXT_I386 | CONTEXT_ALL) CONTEXT_XSTATE = make_flag("CONTEXT_XSTATE", ( CONTEXT_I386 | 0x00000040 )) PAGE_NOACCESS = make_flag("PAGE_NOACCESS", 0x01) PAGE_READONLY = make_flag("PAGE_READONLY", 0x02) diff --git a/windows/generated_def/winfuncs.py b/windows/generated_def/winfuncs.py index 49dcac3..d6b90de 100644 --- a/windows/generated_def/winfuncs.py +++ b/windows/generated_def/winfuncs.py @@ -385,11 +385,6 @@ SafeArrayPutElementParams = ((1, 'psa'), (1, 'rgIndices'), (1, 'pv')) SafeArrayGetVartypePrototype = WINFUNCTYPE(HRESULT, POINTER(SAFEARRAY), POINTER(VARTYPE)) SafeArrayGetVartypeParams = ((1, 'psa'), (1, 'pvt')) -#def SysFreeString(bstrString): -# return SysFreeString.ctypes_function(bstrString) -SysFreeStringPrototype = WINFUNCTYPE(VOID, BSTR) -SysFreeStringParams = ((1, 'bstrString'),) - #def SafeArrayCopy(psa, ppsaOut): # return SafeArrayCopy.ctypes_function(psa, ppsaOut) SafeArrayCopyPrototype = WINFUNCTYPE(HRESULT, POINTER(SAFEARRAY), POINTER(LPSAFEARRAY)) @@ -450,11 +445,6 @@ CryptCATAdminReleaseCatalogContextParams = ((1, 'hCatAdmin'), (1, 'hCatInfo'), ( CryptCATAdminReleaseContextPrototype = WINFUNCTYPE(BOOL, HCATADMIN, DWORD) CryptCATAdminReleaseContextParams = ((1, 'hCatAdmin'), (1, 'dwFlags')) -#def CryptCATGetAttrInfo(hCatalog, pCatMember, pwszReferenceTag): -# return CryptCATGetAttrInfo.ctypes_function(hCatalog, pCatMember, pwszReferenceTag) -CryptCATGetAttrInfoPrototype = WINFUNCTYPE(POINTER(CRYPTCATATTRIBUTE), HANDLE, POINTER(CRYPTCATMEMBER), LPWSTR) -CryptCATGetAttrInfoParams = ((1, 'hCatalog'), (1, 'pCatMember'), (1, 'pwszReferenceTag')) - #def CryptCATGetMemberInfo(hCatalog, pwszReferenceTag): # return CryptCATGetMemberInfo.ctypes_function(hCatalog, pwszReferenceTag) CryptCATGetMemberInfoPrototype = WINFUNCTYPE(POINTER(CRYPTCATMEMBER), HANDLE, LPWSTR) @@ -620,16 +610,6 @@ CryptSignHashWParams = ((1, 'hHash'), (1, 'dwKeySpec'), (1, 'szDescription'), (1 CryptDestroyHashPrototype = WINFUNCTYPE(BOOL, HCRYPTHASH) CryptDestroyHashParams = ((1, 'hHash'),) -#def CryptEncrypt(hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen): -# return CryptEncrypt.ctypes_function(hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen) -CryptEncryptPrototype = WINFUNCTYPE(BOOL, HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, POINTER(BYTE), POINTER(DWORD), DWORD) -CryptEncryptParams = ((1, 'hKey'), (1, 'hHash'), (1, 'Final'), (1, 'dwFlags'), (1, 'pbData'), (1, 'pdwDataLen'), (1, 'dwBufLen')) - -#def CryptDecrypt(hKey, hHash, Final, dwFlags, pbData, pdwDataLen): -# return CryptDecrypt.ctypes_function(hKey, hHash, Final, dwFlags, pbData, pdwDataLen) -CryptDecryptPrototype = WINFUNCTYPE(BOOL, HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, POINTER(BYTE), POINTER(DWORD)) -CryptDecryptParams = ((1, 'hKey'), (1, 'hHash'), (1, 'Final'), (1, 'dwFlags'), (1, 'pbData'), (1, 'pdwDataLen')) - #def CryptDeriveKey(hProv, Algid, hBaseData, dwFlags, phKey): # return CryptDeriveKey.ctypes_function(hProv, Algid, hBaseData, dwFlags, phKey) CryptDeriveKeyPrototype = WINFUNCTYPE(BOOL, HCRYPTPROV, ALG_ID, HCRYPTHASH, DWORD, POINTER(HCRYPTKEY)) @@ -1195,11 +1175,6 @@ FindNextChangeNotificationParams = ((1, 'hChangeHandle'),) FindCloseChangeNotificationPrototype = WINFUNCTYPE(BOOL, HANDLE) FindCloseChangeNotificationParams = ((1, 'hChangeHandle'),) -#def FindNextChangeNotification(hChangeHandle): -# return FindNextChangeNotification.ctypes_function(hChangeHandle) -FindNextChangeNotificationPrototype = WINFUNCTYPE(BOOL, HANDLE) -FindNextChangeNotificationParams = ((1, 'hChangeHandle'),) - #def ReadDirectoryChangesW(hDirectory, lpBuffer, nBufferLength, bWatchSubtree, dwNotifyFilter, lpBytesReturned, lpOverlapped, lpCompletionRoutine): # return ReadDirectoryChangesW.ctypes_function(hDirectory, lpBuffer, nBufferLength, bWatchSubtree, dwNotifyFilter, lpBytesReturned, lpOverlapped, lpCompletionRoutine) ReadDirectoryChangesWPrototype = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, BOOL, DWORD, LPDWORD, LPOVERLAPPED, LPOVERLAPPED_COMPLETION_ROUTINE) @@ -1285,16 +1260,6 @@ InternetSetOptionAParams = ((1, 'hInternet'), (1, 'dwOption'), (1, 'lpBuffer'), InternetSetOptionWPrototype = WINFUNCTYPE(BOOL, HINTERNET, DWORD, LPVOID, DWORD) InternetSetOptionWParams = ((1, 'hInternet'), (1, 'dwOption'), (1, 'lpBuffer'), (1, 'dwBufferLength')) -#def HttpSendRequestA(hRequest, lpszHeaders, dwHeadersLength, lpOptional, dwOptionalLength): -# return HttpSendRequestA.ctypes_function(hRequest, lpszHeaders, dwHeadersLength, lpOptional, dwOptionalLength) -HttpSendRequestAPrototype = WINFUNCTYPE(BOOL, HINTERNET, LPCSTR, DWORD, LPVOID, DWORD) -HttpSendRequestAParams = ((1, 'hRequest'), (1, 'lpszHeaders'), (1, 'dwHeadersLength'), (1, 'lpOptional'), (1, 'dwOptionalLength')) - -#def HttpSendRequestW(hRequest, lpszHeaders, dwHeadersLength, lpOptional, dwOptionalLength): -# return HttpSendRequestW.ctypes_function(hRequest, lpszHeaders, dwHeadersLength, lpOptional, dwOptionalLength) -HttpSendRequestWPrototype = WINFUNCTYPE(BOOL, HINTERNET, LPCWSTR, DWORD, LPVOID, DWORD) -HttpSendRequestWParams = ((1, 'hRequest'), (1, 'lpszHeaders'), (1, 'dwHeadersLength'), (1, 'lpOptional'), (1, 'dwOptionalLength')) - #def InternetReadFile(hFile, lpBuffer, dwNumberOfBytesToRead, lpdwNumberOfBytesRead): # return InternetReadFile.ctypes_function(hFile, lpBuffer, dwNumberOfBytesToRead, lpdwNumberOfBytesRead) InternetReadFilePrototype = WINFUNCTYPE(BOOL, HINTERNET, LPVOID, DWORD, LPDWORD) @@ -1475,11 +1440,6 @@ OpenFileMappingAParams = ((1, 'dwDesiredAccess'), (1, 'bInheritHandle'), (1, 'lp UnmapViewOfFilePrototype = WINFUNCTYPE(BOOL, LPCVOID) UnmapViewOfFileParams = ((1, 'lpBaseAddress'),) -#def NetLocalGroupGetMembers(servername, localgroupname, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle): -# return NetLocalGroupGetMembers.ctypes_function(servername, localgroupname, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle) -NetLocalGroupGetMembersPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, LPCWSTR, DWORD, POINTER(LPBYTE), DWORD, LPDWORD, LPDWORD, PDWORD_PTR) -NetLocalGroupGetMembersParams = ((1, 'servername'), (1, 'localgroupname'), (1, 'level'), (1, 'bufptr'), (1, 'prefmaxlen'), (1, 'entriesread'), (1, 'totalentries'), (1, 'resumehandle')) - #def NetQueryDisplayInformation(ServerName, Level, Index, EntriesRequested, PreferredMaximumLength, ReturnedEntryCount, SortedBuffer): # return NetQueryDisplayInformation.ctypes_function(ServerName, Level, Index, EntriesRequested, PreferredMaximumLength, ReturnedEntryCount, SortedBuffer) NetQueryDisplayInformationPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, DWORD, DWORD, DWORD, DWORD, LPDWORD, POINTER(PVOID)) @@ -1510,11 +1470,6 @@ NetGroupGetUsersParams = ((1, 'servername'), (1, 'groupname'), (1, 'level'), (1, NetLocalGroupEnumPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, DWORD, POINTER(LPBYTE), DWORD, LPDWORD, LPDWORD, PDWORD_PTR) NetLocalGroupEnumParams = ((1, 'servername'), (1, 'level'), (1, 'bufptr'), (1, 'prefmaxlen'), (1, 'entriesread'), (1, 'totalentries'), (1, 'resumehandle')) -#def NetLocalGroupGetInfo(servername, groupname, level, bufptr): -# return NetLocalGroupGetInfo.ctypes_function(servername, groupname, level, bufptr) -NetLocalGroupGetInfoPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, LPCWSTR, DWORD, POINTER(LPBYTE)) -NetLocalGroupGetInfoParams = ((1, 'servername'), (1, 'groupname'), (1, 'level'), (1, 'bufptr')) - #def NetLocalGroupGetMembers(servername, localgroupname, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle): # return NetLocalGroupGetMembers.ctypes_function(servername, localgroupname, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle) NetLocalGroupGetMembersPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, LPCWSTR, DWORD, POINTER(LPBYTE), DWORD, LPDWORD, LPDWORD, PDWORD_PTR) @@ -1525,11 +1480,6 @@ NetLocalGroupGetMembersParams = ((1, 'servername'), (1, 'localgroupname'), (1, ' NetLocalGroupGetInfoPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, LPCWSTR, DWORD, POINTER(LPBYTE)) NetLocalGroupGetInfoParams = ((1, 'servername'), (1, 'groupname'), (1, 'level'), (1, 'bufptr')) -#def NetLocalGroupEnum(servername, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle): -# return NetLocalGroupEnum.ctypes_function(servername, level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle) -NetLocalGroupEnumPrototype = WINFUNCTYPE(NET_API_STATUS, LPCWSTR, DWORD, POINTER(LPBYTE), DWORD, LPDWORD, LPDWORD, PDWORD_PTR) -NetLocalGroupEnumParams = ((1, 'servername'), (1, 'level'), (1, 'bufptr'), (1, 'prefmaxlen'), (1, 'entriesread'), (1, 'totalentries'), (1, 'resumehandle')) - #def NetApiBufferFree(Buffer): # return NetApiBufferFree.ctypes_function(Buffer) NetApiBufferFreePrototype = WINFUNCTYPE(NET_API_STATUS, LPVOID) @@ -2145,11 +2095,6 @@ MakeAbsoluteSDParams = ((1, 'pSelfRelativeSecurityDescriptor'), (1, 'pAbsoluteSe MakeSelfRelativeSDPrototype = WINFUNCTYPE(BOOL, PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD) MakeSelfRelativeSDParams = ((1, 'pAbsoluteSecurityDescriptor'), (1, 'pSelfRelativeSecurityDescriptor'), (1, 'lpdwBufferLength')) -#def InitializeSecurityDescriptor(pSecurityDescriptor, dwRevision): -# return InitializeSecurityDescriptor.ctypes_function(pSecurityDescriptor, dwRevision) -InitializeSecurityDescriptorPrototype = WINFUNCTYPE(BOOL, PSECURITY_DESCRIPTOR, DWORD) -InitializeSecurityDescriptorParams = ((1, 'pSecurityDescriptor'), (1, 'dwRevision')) - #def OpenSCManagerA(lpMachineName, lpDatabaseName, dwDesiredAccess): # return OpenSCManagerA.ctypes_function(lpMachineName, lpDatabaseName, dwDesiredAccess) OpenSCManagerAPrototype = WINFUNCTYPE(SC_HANDLE, LPCSTR, LPCSTR, DWORD) @@ -2195,11 +2140,6 @@ OpenServiceAParams = ((1, 'hSCManager'), (1, 'lpServiceName'), (1, 'dwDesiredAcc OpenServiceWPrototype = WINFUNCTYPE(SC_HANDLE, SC_HANDLE, LPCWSTR, DWORD) OpenServiceWParams = ((1, 'hSCManager'), (1, 'lpServiceName'), (1, 'dwDesiredAccess')) -#def ControlService(hService, dwControl, lpServiceStatus): -# return ControlService.ctypes_function(hService, dwControl, lpServiceStatus) -ControlServicePrototype = WINFUNCTYPE(BOOL, SC_HANDLE, DWORD, LPSERVICE_STATUS) -ControlServiceParams = ((1, 'hService'), (1, 'dwControl'), (1, 'lpServiceStatus')) - #def QueryServiceStatus(hService, lpServiceStatus): # return QueryServiceStatus.ctypes_function(hService, lpServiceStatus) QueryServiceStatusPrototype = WINFUNCTYPE(BOOL, SC_HANDLE, LPSERVICE_STATUS) @@ -2930,16 +2870,6 @@ NtEnumerateSystemEnvironmentValuesExParams = ((1, 'InformationClass'), (1, 'Buff NtFreeVirtualMemoryPrototype = WINFUNCTYPE(NTSTATUS, HANDLE, POINTER(PVOID), PSIZE_T, ULONG) NtFreeVirtualMemoryParams = ((1, 'ProcessHandle'), (1, 'BaseAddress'), (1, 'RegionSize'), (1, 'FreeType')) -#def NtGetContextThread(hThread, lpContext): -# return NtGetContextThread.ctypes_function(hThread, lpContext) -NtGetContextThreadPrototype = WINFUNCTYPE(NTSTATUS, HANDLE, LPCONTEXT) -NtGetContextThreadParams = ((1, 'hThread'), (1, 'lpContext')) - -#def NtSetContextThread(hThread, lpContext): -# return NtSetContextThread.ctypes_function(hThread, lpContext) -NtSetContextThreadPrototype = WINFUNCTYPE(NTSTATUS, HANDLE, LPCONTEXT) -NtSetContextThreadParams = ((1, 'hThread'), (1, 'lpContext')) - #def NtCreateSection(SectionHandle, DesiredAccess, ObjectAttributes, MaximumSize, SectionPageProtection, AllocationAttributes, FileHandle): # return NtCreateSection.ctypes_function(SectionHandle, DesiredAccess, ObjectAttributes, MaximumSize, SectionPageProtection, AllocationAttributes, FileHandle) NtCreateSectionPrototype = WINFUNCTYPE(NTSTATUS, PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PLARGE_INTEGER, ULONG, ULONG, HANDLE) @@ -3355,11 +3285,6 @@ CreateThreadParams = ((1, 'lpThreadAttributes'), (1, 'dwStackSize'), (1, 'lpStar CreateRemoteThreadPrototype = WINFUNCTYPE(HANDLE, HANDLE, LPSECURITY_ATTRIBUTES, SIZE_T, LPTHREAD_START_ROUTINE, LPVOID, DWORD, LPDWORD) CreateRemoteThreadParams = ((1, 'hProcess'), (1, 'lpThreadAttributes'), (1, 'dwStackSize'), (1, 'lpStartAddress'), (1, 'lpParameter'), (1, 'dwCreationFlags'), (1, 'lpThreadId')) -#def VirtualProtect(lpAddress, dwSize, flNewProtect, lpflOldProtect): -# return VirtualProtect.ctypes_function(lpAddress, dwSize, flNewProtect, lpflOldProtect) -VirtualProtectPrototype = WINFUNCTYPE(BOOL, LPVOID, SIZE_T, DWORD, PDWORD) -VirtualProtectParams = ((1, 'lpAddress'), (1, 'dwSize'), (1, 'flNewProtect'), (1, 'lpflOldProtect')) - #def CreateProcessA(lpApplicationName, lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation): # return CreateProcessA.ctypes_function(lpApplicationName, lpCommandLine, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation) CreateProcessAPrototype = WINFUNCTYPE(BOOL, LPCSTR, LPSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, LPCSTR, LPSTARTUPINFOA, LPPROCESS_INFORMATION) @@ -3440,11 +3365,6 @@ CreateFileAParams = ((1, 'lpFileName'), (1, 'dwDesiredAccess'), (1, 'dwShareMode CreateFileWPrototype = WINFUNCTYPE(HANDLE, LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE) CreateFileWParams = ((1, 'lpFileName'), (1, 'dwDesiredAccess'), (1, 'dwShareMode'), (1, 'lpSecurityAttributes'), (1, 'dwCreationDisposition'), (1, 'dwFlagsAndAttributes'), (1, 'hTemplateFile')) -#def OpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle): -# return OpenProcessToken.ctypes_function(ProcessHandle, DesiredAccess, TokenHandle) -OpenProcessTokenPrototype = WINFUNCTYPE(BOOL, HANDLE, DWORD, PHANDLE) -OpenProcessTokenParams = ((1, 'ProcessHandle'), (1, 'DesiredAccess'), (1, 'TokenHandle')) - #def DuplicateToken(ExistingTokenHandle, ImpersonationLevel, DuplicateTokenHandle): # return DuplicateToken.ctypes_function(ExistingTokenHandle, ImpersonationLevel, DuplicateTokenHandle) DuplicateTokenPrototype = WINFUNCTYPE(BOOL, HANDLE, SECURITY_IMPERSONATION_LEVEL, PHANDLE) @@ -3455,11 +3375,6 @@ DuplicateTokenParams = ((1, 'ExistingTokenHandle'), (1, 'ImpersonationLevel'), ( DuplicateTokenExPrototype = WINFUNCTYPE(BOOL, HANDLE, DWORD, LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL, TOKEN_TYPE, PHANDLE) DuplicateTokenExParams = ((1, 'hExistingToken'), (1, 'dwDesiredAccess'), (1, 'lpTokenAttributes'), (1, 'ImpersonationLevel'), (1, 'TokenType'), (1, 'phNewToken')) -#def OpenThreadToken(ThreadHandle, DesiredAccess, OpenAsSelf, TokenHandle): -# return OpenThreadToken.ctypes_function(ThreadHandle, DesiredAccess, OpenAsSelf, TokenHandle) -OpenThreadTokenPrototype = WINFUNCTYPE(BOOL, HANDLE, DWORD, BOOL, PHANDLE) -OpenThreadTokenParams = ((1, 'ThreadHandle'), (1, 'DesiredAccess'), (1, 'OpenAsSelf'), (1, 'TokenHandle')) - #def SetThreadToken(Thread, Token): # return SetThreadToken.ctypes_function(Thread, Token) SetThreadTokenPrototype = WINFUNCTYPE(BOOL, PHANDLE, HANDLE) @@ -3665,11 +3580,6 @@ GetThreadIdParams = ((1, 'Thread'),) DeviceIoControlPrototype = WINFUNCTYPE(BOOL, HANDLE, DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED) DeviceIoControlParams = ((1, 'hDevice'), (1, 'dwIoControlCode'), (1, 'lpInBuffer'), (1, 'nInBufferSize'), (1, 'lpOutBuffer'), (1, 'nOutBufferSize'), (1, 'lpBytesReturned'), (1, 'lpOverlapped')) -#def GetTokenInformation(TokenHandle, TokenInformationClass, TokenInformation, TokenInformationLength, ReturnLength): -# return GetTokenInformation.ctypes_function(TokenHandle, TokenInformationClass, TokenInformation, TokenInformationLength, ReturnLength) -GetTokenInformationPrototype = WINFUNCTYPE(BOOL, HANDLE, TOKEN_INFORMATION_CLASS, LPVOID, DWORD, PDWORD) -GetTokenInformationParams = ((1, 'TokenHandle'), (1, 'TokenInformationClass'), (1, 'TokenInformation'), (1, 'TokenInformationLength'), (1, 'ReturnLength')) - #def Wow64DisableWow64FsRedirection(OldValue): # return Wow64DisableWow64FsRedirection.ctypes_function(OldValue) Wow64DisableWow64FsRedirectionPrototype = WINFUNCTYPE(BOOL, POINTER(PVOID)) @@ -3695,11 +3605,6 @@ Wow64GetThreadContextParams = ((1, 'hThread'), (1, 'lpContext')) SetConsoleCtrlHandlerPrototype = WINFUNCTYPE(BOOL, PHANDLER_ROUTINE, BOOL) SetConsoleCtrlHandlerParams = ((1, 'HandlerRoutine'), (1, 'Add')) -#def WinVerifyTrust(hwnd, pgActionID, pWVTData): -# return WinVerifyTrust.ctypes_function(hwnd, pgActionID, pWVTData) -WinVerifyTrustPrototype = WINFUNCTYPE(LONG, HWND, POINTER(GUID), LPVOID) -WinVerifyTrustParams = ((1, 'hwnd'), (1, 'pgActionID'), (1, 'pWVTData')) - #def GlobalAlloc(uFlags, dwBytes): # return GlobalAlloc.ctypes_function(uFlags, dwBytes) GlobalAllocPrototype = WINFUNCTYPE(HGLOBAL, UINT, SIZE_T) diff --git a/windows/generated_def/winstructs.py b/windows/generated_def/winstructs.py index a351f80..476e786 100644 --- a/windows/generated_def/winstructs.py +++ b/windows/generated_def/winstructs.py @@ -66,8 +66,6 @@ NTSTATUS = DWORD TDHSTATUS = ULONG DNS_STATUS = ULONG LSTATUS = LONG#Registryfunctionsreturnvalue|typedef_Return_type_success_(return==ERROR_SUCCESS)LONGLSTATUS; -SECURITY_INFORMATION = DWORD -PSECURITY_INFORMATION = POINTER(SECURITY_INFORMATION) PULONG = POINTER(ULONG) PDWORD = POINTER(DWORD) LPDWORD = POINTER(DWORD) @@ -120,8 +118,6 @@ PULONG64 = POINTER(ULONG64) PBYTE = POINTER(BYTE) PUINT = POINTER(UINT) PHKEY = POINTER(HKEY) -ACCESS_MASK = DWORD -REGSAM = ACCESS_MASK PBOOLEAN = POINTER(BOOLEAN) SECURITY_CONTEXT_TRACKING_MODE = BOOLEAN HCRYPTPROV_LEGACY = PULONG @@ -156,7 +152,6 @@ INT64 = LONGLONG UINT8 = BYTE UINT16 = USHORT UINT32 = UINT -UINT64 = ULONGLONG ULONG32 = UINT32 LONG32 = INT32 PHANDLE = POINTER(HANDLE) @@ -182,6 +177,7 @@ SECURITY_DESCRIPTOR_CONTROL = WORD PSECURITY_DESCRIPTOR_CONTROL = POINTER(SECURITY_DESCRIPTOR_CONTROL) ACCESS_MASK = DWORD PACCESS_MASK = POINTER(ACCESS_MASK) +REGSAM = ACCESS_MASK SECURITY_INFORMATION = DWORD PSECURITY_INFORMATION = POINTER(SECURITY_INFORMATION) PSECURITY_ATTRIBUTES_OPAQUE = PVOID @@ -701,16 +697,6 @@ class CS_Resource_s(Structure): CS_RESOURCE = CS_Resource_s PCS_RESOURCE = POINTER(CS_Resource_s) -class DMA_Des_s(Structure): - _fields_ = [ - ("DD_Count", DWORD), - ("DD_Type", DWORD), - ("DD_Flags", DWORD), - ("DD_Alloc_Chan", ULONG), - ] -DMA_DES = DMA_Des_s -PDMA_DES = POINTER(DMA_Des_s) - class DMA_Resource_s(Structure): _fields_ = [ ("DMA_Header", DMA_DES), @@ -719,17 +705,6 @@ class DMA_Resource_s(Structure): DMA_RESOURCE = DMA_Resource_s PDMA_RESOURCE = POINTER(DMA_Resource_s) -class IO_Des_s(Structure): - _fields_ = [ - ("IOD_Count", DWORD), - ("IOD_Type", DWORD), - ("IOD_Alloc_Base", DWORDLONG), - ("IOD_Alloc_End", DWORDLONG), - ("IOD_DesFlags", DWORD), - ] -IO_DES = IO_Des_s -PIO_DES = POINTER(IO_Des_s) - class IO_Resource_s(Structure): _fields_ = [ ("IO_Header", IO_DES), @@ -4605,14 +4580,6 @@ class _SE_OBJECT_TYPE(EnumType): SE_OBJECT_TYPE = _SE_OBJECT_TYPE -ViewShare = EnumValue("_SECTION_INHERIT", "ViewShare", 0x1) -ViewUnmap = EnumValue("_SECTION_INHERIT", "ViewUnmap", 0x2) -class _SECTION_INHERIT(EnumType): - values = [ViewShare, ViewUnmap] - mapper = FlagMapper(*values) -SECTION_INHERIT = _SECTION_INHERIT - - COINIT_APARTMENTTHREADED = EnumValue("tagCOINIT", "COINIT_APARTMENTTHREADED", 0x2) COINIT_MULTITHREADED = EnumValue("tagCOINIT", "COINIT_MULTITHREADED", 0x0) COINIT_DISABLE_OLE1DDE = EnumValue("tagCOINIT", "COINIT_DISABLE_OLE1DDE", 0x4) @@ -6459,15 +6426,6 @@ class _FILE_FS_DRIVER_PATH_INFORMATION(Structure): FILE_FS_DRIVER_PATH_INFORMATION = _FILE_FS_DRIVER_PATH_INFORMATION PFILE_FS_DRIVER_PATH_INFORMATION = POINTER(_FILE_FS_DRIVER_PATH_INFORMATION) -class _FILE_FS_DRIVER_PATH_INFORMATION(Structure): - _fields_ = [ - ("DriverInPath", BOOLEAN), - ("DriverNameLength", ULONG), - ("DriverName", WCHAR * (1)), - ] -FILE_FS_DRIVER_PATH_INFORMATION = _FILE_FS_DRIVER_PATH_INFORMATION -PFILE_FS_DRIVER_PATH_INFORMATION = POINTER(_FILE_FS_DRIVER_PATH_INFORMATION) - class _FILE_FS_VOLUME_INFORMATION(Structure): _fields_ = [ ("VolumeCreationTime", LARGE_INTEGER), @@ -6641,14 +6599,14 @@ class _PORT_MESSAGE32_TMP_UNION(Union): ("ClientViewSize", ULONG), ("CallbackId", ULONG), ] -PORT_MESSAGE_TMP_UNION = _PORT_MESSAGE32_TMP_UNION +PORT_MESSAGE32_TMP_UNION = _PORT_MESSAGE32_TMP_UNION class _PORT_MESSAGE64_TMP_UNION(Union): _fields_ = [ ("ClientViewSize", ULONGLONG), ("CallbackId", ULONG), ] -PORT_MESSAGE_TMP_UNION = _PORT_MESSAGE64_TMP_UNION +PORT_MESSAGE64_TMP_UNION = _PORT_MESSAGE64_TMP_UNION class _PORT_MESSAGE_TMP_SUBSTRUCT_S1(Structure): _fields_ = [ @@ -7476,39 +7434,6 @@ class _CTL_ENTRY(Structure): CTL_ENTRY = _CTL_ENTRY PCTL_ENTRY = POINTER(_CTL_ENTRY) -class _CRYPT_ATTRIBUTE(Structure): - _fields_ = [ - ("pszObjId", LPSTR), - ("cValue", DWORD), - ("rgValue", PCRYPT_ATTR_BLOB), - ] -CRYPT_ATTRIBUTE = _CRYPT_ATTRIBUTE -PCRYPT_ATTRIBUTE = POINTER(_CRYPT_ATTRIBUTE) - -OLD_CRYPT_ATTRIBUTE = _CRYPT_ATTRIBUTE - -class _CRYPT_ATTRIBUTE(_CRYPT_ATTRIBUTE): - @property - def count(self): # __len__ ? - return self.cValue - - @property - def values(self): - return self.rgValue[:self.cValue] - - @property - def objid(self): - # SZOID_MAPPER defined in the generated structures template.py - return SZOID_MAPPER[self.pszObjId] - - def __repr__(self): - # return """<{0} pszObjId={1!r} Values={2}>""".format(type(self).__name__, self.objid, self.cValue) - if not self.pszObjId in SZOID_MAPPER: - return """<{0} pszObjId="{1}" Values={2}>""".format(type(self).__name__, self.pszObjId, self.cValue) - flag = SZOID_MAPPER[self.pszObjId] - return """<{0} pszObjId="{1}" ({2}) Values={3}>""".format(type(self).__name__, flag, flag.name, self.cValue) -CRYPT_ATTRIBUTE = _CRYPT_ATTRIBUTE -PCRYPT_ATTRIBUTE = POINTER(_CRYPT_ATTRIBUTE) class _CRYPT_ATTRIBUTES(Structure): _fields_ = [ ("cAttr", DWORD), @@ -8127,18 +8052,6 @@ class _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO(Structure): CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = POINTER(_CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO) -class _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO(Structure): - _fields_ = [ - ("cbSize", DWORD), - ("KeyEncryptionAlgorithm", CRYPT_ALGORITHM_IDENTIFIER), - ("pvKeyEncryptionAuxInfo", PVOID), - ("hCryptProv", HCRYPTPROV_LEGACY), - ("RecipientPublicKey", CRYPT_BIT_BLOB), - ("RecipientId", CERT_ID), - ] -CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO -PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO = POINTER(_CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO) - class _TMPUNION_CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO(Union): _fields_ = [ ("pEphemeralAlgorithm", PCRYPT_ALGORITHM_IDENTIFIER), @@ -9502,14 +9415,6 @@ class _POLICY_ACCOUNT_DOMAIN_INFO(Structure): POLICY_ACCOUNT_DOMAIN_INFO = _POLICY_ACCOUNT_DOMAIN_INFO PPOLICY_ACCOUNT_DOMAIN_INFO = POINTER(_POLICY_ACCOUNT_DOMAIN_INFO) -class _POLICY_PRIMARY_DOMAIN_INFO(Structure): - _fields_ = [ - ("Name", LSA_UNICODE_STRING), - ("Sid", PSID), - ] -POLICY_PRIMARY_DOMAIN_INFO = _POLICY_PRIMARY_DOMAIN_INFO -PPOLICY_PRIMARY_DOMAIN_INFO = POINTER(_POLICY_PRIMARY_DOMAIN_INFO) - class _LSA_TRANSLATED_SID(Structure): _fields_ = [ ("Use", SID_NAME_USE), @@ -11313,7 +11218,7 @@ class _API_SET_VALUE_ARRAY_V4(Structure): ("Array", API_SET_VALUE_ENTRY_V2 * (ANYSIZE_ARRAY)), ] API_SET_VALUE_ARRAY_V4 = _API_SET_VALUE_ARRAY_V4 -PAPI_SET_VALUE_ARRAY_V2 = POINTER(_API_SET_VALUE_ARRAY_V4) +PAPI_SET_VALUE_ARRAY_V4 = POINTER(_API_SET_VALUE_ARRAY_V4) class _API_SET_NAMESPACE_ARRAY_V4(Structure): _fields_ = [