https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=35c5017438dc83d19f85ab0c73ecdc242e9c7511
commit 35c5017438dc83d19f85ab0c73ecdc242e9c7511 Author: Corinna Vinschen <[email protected]> Date: Thu Aug 4 22:13:50 2022 +0200 Cygwin: drop all usages of NTAPI and drop unused prototypes from ntdll.h. Signed-off-by: Corinna Vinschen <[email protected]> Diff: --- winsup/cygwin/ntdll.h | 502 ++++++++++++++++++++-------------------------- winsup/cygwin/security.h | 4 +- winsup/cygwin/strfuncs.cc | 2 +- 3 files changed, 223 insertions(+), 285 deletions(-) diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h index 70d463d81..bdc1c1e40 100644 --- a/winsup/cygwin/ntdll.h +++ b/winsup/cygwin/ntdll.h @@ -1289,7 +1289,7 @@ typedef struct _IO_STATUS_BLOCK ULONG_PTR Information; } IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; -typedef VOID NTAPI (*PIO_APC_ROUTINE)(PVOID, PIO_STATUS_BLOCK, ULONG); +typedef VOID (*PIO_APC_ROUTINE)(PVOID, PIO_STATUS_BLOCK, ULONG); typedef struct _EVENT_BASIC_INFORMATION { @@ -1402,274 +1402,214 @@ static volatile KUSER_SHARED_DATA &SharedUserData extern "C" { #endif - NTSTATUS NTAPI NtAccessCheck (PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, - PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, - PACCESS_MASK, PNTSTATUS); - NTSTATUS NTAPI NtAdjustPrivilegesToken (HANDLE, BOOLEAN, PTOKEN_PRIVILEGES, - ULONG, PTOKEN_PRIVILEGES, PULONG); - NTSTATUS NTAPI NtAllocateLocallyUniqueId (PLUID); - NTSTATUS NTAPI NtAllocateUuids (PLARGE_INTEGER, PULONG, PULONG, PUCHAR); - NTSTATUS NTAPI NtAssignProcessToJobObject (HANDLE, HANDLE); - NTSTATUS NTAPI NtCancelTimer (HANDLE, PBOOLEAN); - NTSTATUS NTAPI NtClose (HANDLE); - NTSTATUS NTAPI NtCommitTransaction (HANDLE, BOOLEAN); - NTSTATUS NTAPI NtContinue (PCONTEXT, BOOLEAN); - NTSTATUS NTAPI NtCreateDirectoryObject (PHANDLE, ACCESS_MASK, - POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtCreateEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - EVENT_TYPE, BOOLEAN); - NTSTATUS NTAPI NtCreateFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - PIO_STATUS_BLOCK, PLARGE_INTEGER, ULONG, ULONG, - ULONG, ULONG, PVOID, ULONG); - NTSTATUS NTAPI NtCreateJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtCreateKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG, - PUNICODE_STRING, ULONG, PULONG); - NTSTATUS NTAPI NtCreateMailslotFile(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, - PLARGE_INTEGER); - NTSTATUS NTAPI NtCreateMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - BOOLEAN); - NTSTATUS NTAPI NtCreateNamedPipeFile (PHANDLE, ACCESS_MASK, - POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, - ULONG, ULONG, ULONG, ULONG, ULONG, - ULONG, ULONG, ULONG, ULONG, - PLARGE_INTEGER); - NTSTATUS NTAPI NtCreateSection (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - PLARGE_INTEGER, ULONG, ULONG, HANDLE); - NTSTATUS NTAPI NtCreateSemaphore (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - LONG, LONG); - NTSTATUS NTAPI NtCreateSymbolicLinkObject (PHANDLE, ACCESS_MASK, - POBJECT_ATTRIBUTES, - PUNICODE_STRING); - NTSTATUS NTAPI NtCreateTimer (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - TIMER_TYPE); - NTSTATUS NTAPI NtCreateToken (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - TOKEN_TYPE, PLUID, PLARGE_INTEGER, PTOKEN_USER, - PTOKEN_GROUPS, PTOKEN_PRIVILEGES, PTOKEN_OWNER, - PTOKEN_PRIMARY_GROUP, PTOKEN_DEFAULT_DACL, - PTOKEN_SOURCE); - NTSTATUS NTAPI NtCreateTransaction (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - LPGUID, HANDLE, ULONG, ULONG, ULONG, - PLARGE_INTEGER, PUNICODE_STRING); - NTSTATUS NTAPI NtDuplicateToken (HANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - BOOLEAN, TOKEN_TYPE, PHANDLE); - NTSTATUS NTAPI NtFsControlFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, - PIO_STATUS_BLOCK, ULONG, PVOID, ULONG, - PVOID, ULONG); - NTSTATUS NTAPI NtFlushBuffersFile (HANDLE, PIO_STATUS_BLOCK); - NTSTATUS NTAPI NtLoadKey (POBJECT_ATTRIBUTES, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtLockFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, - PIO_STATUS_BLOCK, PLARGE_INTEGER, PLARGE_INTEGER, - ULONG, BOOLEAN, BOOLEAN); - NTSTATUS NTAPI NtLockVirtualMemory (HANDLE, PVOID *, PSIZE_T, ULONG); - NTSTATUS NTAPI NtMapViewOfSection (HANDLE, HANDLE, PVOID *, ULONG_PTR, SIZE_T, - PLARGE_INTEGER, PSIZE_T, SECTION_INHERIT, - ULONG, ULONG); - NTSTATUS NTAPI NtMapViewOfSectionEx (HANDLE, HANDLE, PVOID *, PLARGE_INTEGER, - PSIZE_T, ULONG, ULONG, - PMEM_EXTENDED_PARAMETER, ULONG); - NTSTATUS NTAPI NtNotifyChangeDirectoryFile (HANDLE, HANDLE, PIO_APC_ROUTINE, - PVOID, PIO_STATUS_BLOCK, - PFILE_NOTIFY_INFORMATION, ULONG, - ULONG, BOOLEAN); - NTSTATUS NTAPI NtOpenDirectoryObject (PHANDLE, ACCESS_MASK, - POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, - PIO_STATUS_BLOCK, ULONG, ULONG); - NTSTATUS NTAPI NtOpenJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenProcessToken (HANDLE, ACCESS_MASK, PHANDLE); - NTSTATUS NTAPI NtOpenThreadToken (HANDLE, ACCESS_MASK, BOOLEAN, PHANDLE); - NTSTATUS NTAPI NtOpenSection (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenSemaphore (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); - NTSTATUS NTAPI NtOpenSymbolicLinkObject (PHANDLE, ACCESS_MASK, - POBJECT_ATTRIBUTES); + NTSTATUS NtAccessCheck (PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, + PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, + PACCESS_MASK, PNTSTATUS); + NTSTATUS NtAdjustPrivilegesToken (HANDLE, BOOLEAN, PTOKEN_PRIVILEGES, ULONG, + PTOKEN_PRIVILEGES, PULONG); + NTSTATUS NtAllocateLocallyUniqueId (PLUID); + NTSTATUS NtAssignProcessToJobObject (HANDLE, HANDLE); + NTSTATUS NtCancelTimer (HANDLE, PBOOLEAN); + NTSTATUS NtClose (HANDLE); + NTSTATUS NtCommitTransaction (HANDLE, BOOLEAN); + NTSTATUS NtCreateDirectoryObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtCreateEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, EVENT_TYPE, + BOOLEAN); + NTSTATUS NtCreateFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + PIO_STATUS_BLOCK, PLARGE_INTEGER, ULONG, ULONG, ULONG, + ULONG, PVOID, ULONG); + NTSTATUS NtCreateJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtCreateKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG, + PUNICODE_STRING, ULONG, PULONG); + NTSTATUS NtCreateMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, BOOLEAN); + NTSTATUS NtCreateNamedPipeFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, ULONG, + ULONG, ULONG, ULONG, ULONG, ULONG, + PLARGE_INTEGER); + NTSTATUS NtCreateSection (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + PLARGE_INTEGER, ULONG, ULONG, HANDLE); + NTSTATUS NtCreateSemaphore (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, LONG, + LONG); + NTSTATUS NtCreateSymbolicLinkObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + PUNICODE_STRING); + NTSTATUS NtCreateTimer (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, TIMER_TYPE); + NTSTATUS NtCreateTransaction (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + LPGUID, HANDLE, ULONG, ULONG, ULONG, + PLARGE_INTEGER, PUNICODE_STRING); + NTSTATUS NtDuplicateToken (HANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, BOOLEAN, + TOKEN_TYPE, PHANDLE); + NTSTATUS NtFsControlFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, + PIO_STATUS_BLOCK, ULONG, PVOID, ULONG, PVOID, + ULONG); + NTSTATUS NtFlushBuffersFile (HANDLE, PIO_STATUS_BLOCK); + NTSTATUS NtLockFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, + PLARGE_INTEGER, PLARGE_INTEGER, ULONG, BOOLEAN, BOOLEAN); + NTSTATUS NtLockVirtualMemory (HANDLE, PVOID *, PSIZE_T, ULONG); + NTSTATUS NtMapViewOfSection (HANDLE, HANDLE, PVOID *, ULONG_PTR, SIZE_T, + PLARGE_INTEGER, PSIZE_T, SECTION_INHERIT, ULONG, + ULONG); + NTSTATUS NtMapViewOfSectionEx (HANDLE, HANDLE, PVOID *, PLARGE_INTEGER, + PSIZE_T, ULONG, ULONG, PMEM_EXTENDED_PARAMETER, + ULONG); + NTSTATUS NtOpenDirectoryObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, + PIO_STATUS_BLOCK, ULONG, ULONG); + NTSTATUS NtOpenJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenProcessToken (HANDLE, ACCESS_MASK, PHANDLE); + NTSTATUS NtOpenThreadToken (HANDLE, ACCESS_MASK, BOOLEAN, PHANDLE); + NTSTATUS NtOpenSection (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenSemaphore (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); + NTSTATUS NtOpenSymbolicLinkObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); /* WARNING! Don't rely on the timestamp information returned by NtQueryAttributesFile. Only the DOS file attribute info is reliable. */ - NTSTATUS NTAPI NtPrivilegeCheck (HANDLE, PPRIVILEGE_SET, PBOOLEAN); - NTSTATUS NTAPI NtQueryAttributesFile (POBJECT_ATTRIBUTES, - PFILE_BASIC_INFORMATION); - NTSTATUS NTAPI NtQueryDirectoryFile(HANDLE, HANDLE, PVOID, PVOID, - PIO_STATUS_BLOCK, PVOID, ULONG, - FILE_INFORMATION_CLASS, BOOLEAN, - PUNICODE_STRING, BOOLEAN); - NTSTATUS NTAPI NtQueryDirectoryObject (HANDLE, PVOID, ULONG, BOOLEAN, - BOOLEAN, PULONG, PULONG); - NTSTATUS NTAPI NtQueryEaFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, - BOOLEAN, PVOID, ULONG, PULONG, BOOLEAN); - NTSTATUS NTAPI NtQueryEvent (HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, - PULONG); - NTSTATUS NTAPI NtQueryFullAttributesFile (POBJECT_ATTRIBUTES, - PFILE_NETWORK_OPEN_INFORMATION); - NTSTATUS NTAPI NtQueryInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, - ULONG, FILE_INFORMATION_CLASS); - NTSTATUS NTAPI NtQueryInformationJobObject (HANDLE, JOBOBJECTINFOCLASS, - PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtQueryInformationProcess (HANDLE, PROCESSINFOCLASS, - PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtQueryInformationThread (HANDLE, THREADINFOCLASS, PVOID, - ULONG, PULONG); - NTSTATUS NTAPI NtQueryInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, - PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtQueryObject (HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, - PULONG); - NTSTATUS NTAPI NtQueryQuotaInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, - ULONG, BOOLEAN, PVOID, ULONG, - PSID, BOOLEAN); - NTSTATUS NTAPI NtQuerySemaphore (HANDLE, SEMAPHORE_INFORMATION_CLASS, - PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtQuerySystemInformation (SYSTEM_INFORMATION_CLASS, - PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtQuerySystemTime (PLARGE_INTEGER); - NTSTATUS NTAPI NtQuerySecurityObject (HANDLE, SECURITY_INFORMATION, - PSECURITY_DESCRIPTOR, ULONG, PULONG); - NTSTATUS NTAPI NtQuerySymbolicLinkObject (HANDLE, PUNICODE_STRING, PULONG); - NTSTATUS NTAPI NtQueryTimer (HANDLE, TIMER_INFORMATION_CLASS, PVOID, - ULONG, PULONG); - NTSTATUS NTAPI NtQueryTimerResolution (PULONG, PULONG, PULONG); - NTSTATUS NTAPI NtQueryValueKey (HANDLE, PUNICODE_STRING, - KEY_VALUE_INFORMATION_CLASS, PVOID, ULONG, - PULONG); - NTSTATUS NTAPI NtQueryVirtualMemory (HANDLE, PVOID, MEMORY_INFORMATION_CLASS, - PVOID, SIZE_T, PSIZE_T); - NTSTATUS NTAPI NtQueryVolumeInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, - ULONG, FS_INFORMATION_CLASS); - NTSTATUS NTAPI NtReadFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, - PIO_STATUS_BLOCK, PVOID, ULONG, PLARGE_INTEGER, + NTSTATUS NtPrivilegeCheck (HANDLE, PPRIVILEGE_SET, PBOOLEAN); + NTSTATUS NtQueryAttributesFile (POBJECT_ATTRIBUTES, PFILE_BASIC_INFORMATION); + NTSTATUS NtQueryDirectoryFile(HANDLE, HANDLE, PVOID, PVOID, PIO_STATUS_BLOCK, + PVOID, ULONG, FILE_INFORMATION_CLASS, BOOLEAN, + PUNICODE_STRING, BOOLEAN); + NTSTATUS NtQueryDirectoryObject (HANDLE, PVOID, ULONG, BOOLEAN, BOOLEAN, + PULONG, PULONG); + NTSTATUS NtQueryEaFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, BOOLEAN, + PVOID, ULONG, PULONG, BOOLEAN); + NTSTATUS NtQueryEvent (HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG); + NTSTATUS NtQueryInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, + FILE_INFORMATION_CLASS); + NTSTATUS NtQueryInformationJobObject (HANDLE, JOBOBJECTINFOCLASS, PVOID, + ULONG, PULONG); + NTSTATUS NtQueryInformationProcess (HANDLE, PROCESSINFOCLASS, PVOID, ULONG, + PULONG); + NTSTATUS NtQueryInformationThread (HANDLE, THREADINFOCLASS, PVOID, ULONG, + PULONG); + NTSTATUS NtQueryInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, PVOID, + ULONG, PULONG); + NTSTATUS NtQueryObject (HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, + PULONG); + NTSTATUS NtQueryQuotaInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, + BOOLEAN, PVOID, ULONG, PSID, BOOLEAN); + NTSTATUS NtQuerySemaphore (HANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG); - NTSTATUS NTAPI NtRollbackTransaction (HANDLE, BOOLEAN); - NTSTATUS NTAPI NtSetEaFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG); - NTSTATUS NTAPI NtSetEvent (HANDLE, PULONG); - NTSTATUS NTAPI NtSetInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, - FILE_INFORMATION_CLASS); - NTSTATUS NTAPI NtSetInformationJobObject (HANDLE, JOBOBJECTINFOCLASS, PVOID, - ULONG); - NTSTATUS NTAPI NtSetInformationThread (HANDLE, THREADINFOCLASS, PVOID, ULONG); - NTSTATUS NTAPI NtSetInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, PVOID, - ULONG); - NTSTATUS NTAPI NtSetQuotaInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, - ULONG); - NTSTATUS NTAPI NtSetSecurityObject (HANDLE, SECURITY_INFORMATION, - PSECURITY_DESCRIPTOR); - NTSTATUS NTAPI NtSetTimer (HANDLE, PLARGE_INTEGER, PTIMER_APC_ROUTINE, PVOID, - BOOLEAN, LONG, PBOOLEAN); - NTSTATUS NTAPI NtSetTimerResolution (ULONG, BOOLEAN, PULONG); - NTSTATUS NTAPI NtSetValueKey (HANDLE, PUNICODE_STRING, ULONG, ULONG, PVOID, - ULONG); - NTSTATUS NTAPI NtSetVolumeInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, - ULONG, FS_INFORMATION_CLASS); - NTSTATUS NTAPI NtUnlockFile (HANDLE, PIO_STATUS_BLOCK, PLARGE_INTEGER, - PLARGE_INTEGER, ULONG); - NTSTATUS NTAPI NtUnlockVirtualMemory (HANDLE, PVOID *, PSIZE_T, ULONG); - NTSTATUS NTAPI NtUnmapViewOfSection (HANDLE, PVOID); - NTSTATUS NTAPI NtWaitForSingleObject (HANDLE, BOOLEAN, PLARGE_INTEGER); - NTSTATUS NTAPI NtWriteFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, - PIO_STATUS_BLOCK, PVOID, ULONG, PLARGE_INTEGER, - PULONG); - NTSTATUS NTAPI RtlAbsoluteToSelfRelativeSD (PSECURITY_DESCRIPTOR, - PSECURITY_DESCRIPTOR, PULONG); - VOID NTAPI RtlAcquirePebLock (); - NTSTATUS NTAPI RtlAddAccessAllowedAce (PACL, ULONG, ACCESS_MASK, PSID); - NTSTATUS NTAPI RtlAddAccessAllowedAceEx (PACL, ULONG, ULONG, ACCESS_MASK, - PSID); - NTSTATUS NTAPI RtlAddAccessDeniedAce (PACL, ULONG, ACCESS_MASK, PSID); - NTSTATUS NTAPI RtlAddAccessDeniedAceEx (PACL, ULONG, ULONG, ACCESS_MASK, - PSID); - NTSTATUS NTAPI RtlAddAce (PACL, ULONG, ULONG, PVOID, ULONG); - PVOID NTAPI RtlAllocateHeap (PVOID, ULONG, SIZE_T); - NTSTATUS NTAPI RtlAppendUnicodeToString (PUNICODE_STRING, PCWSTR); - NTSTATUS NTAPI RtlAppendUnicodeStringToString (PUNICODE_STRING, - PUNICODE_STRING); - NTSTATUS NTAPI RtlAnsiStringToUnicodeString (PUNICODE_STRING, PANSI_STRING, - BOOLEAN); - NTSTATUS NTAPI RtlCheckRegistryKey (ULONG, PCWSTR); - LONG NTAPI RtlCompareUnicodeString (PUNICODE_STRING, PUNICODE_STRING, - BOOLEAN); - NTSTATUS NTAPI RtlConvertSidToUnicodeString (PUNICODE_STRING, PSID, BOOLEAN); - NTSTATUS NTAPI RtlConvertToAutoInheritSecurityObject (PSECURITY_DESCRIPTOR, - PSECURITY_DESCRIPTOR, - PSECURITY_DESCRIPTOR *, - GUID *, BOOLEAN, - PGENERIC_MAPPING); - NTSTATUS NTAPI RtlCopySid (ULONG, PSID, PSID); - VOID NTAPI RtlCopyUnicodeString (PUNICODE_STRING, PUNICODE_STRING); - NTSTATUS NTAPI RtlCreateAcl (PACL, ULONG, ULONG); - PDEBUG_BUFFER NTAPI RtlCreateQueryDebugBuffer (ULONG, BOOLEAN); - NTSTATUS NTAPI RtlCreateRegistryKey (ULONG, PCWSTR); - NTSTATUS NTAPI RtlCreateSecurityDescriptor (PSECURITY_DESCRIPTOR, ULONG); - BOOLEAN NTAPI RtlCreateUnicodeStringFromAsciiz (PUNICODE_STRING, PCSTR); - NTSTATUS NTAPI RtlDeleteSecurityObject (PSECURITY_DESCRIPTOR *); - NTSTATUS NTAPI RtlDestroyQueryDebugBuffer (PDEBUG_BUFFER); - NTSTATUS NTAPI RtlDowncaseUnicodeString (PUNICODE_STRING, PUNICODE_STRING, - BOOLEAN); - NTSTATUS NTAPI RtlEnterCriticalSection (PRTL_CRITICAL_SECTION); - BOOLEAN NTAPI RtlEqualPrefixSid (PSID, PSID); - BOOLEAN NTAPI RtlEqualSid (PSID, PSID); - BOOLEAN NTAPI RtlEqualUnicodeString (PUNICODE_STRING, PUNICODE_STRING, - BOOLEAN); - VOID NTAPI RtlFreeAnsiString (PANSI_STRING); - BOOLEAN NTAPI RtlFreeHeap (HANDLE, ULONG, PVOID); - VOID NTAPI RtlFreeOemString (POEM_STRING); - VOID NTAPI RtlFreeUnicodeString (PUNICODE_STRING); - BOOLEAN NTAPI RtlFirstFreeAce (PACL, PVOID *); - NTSTATUS NTAPI RtlGetAce (PACL, ULONG, PVOID); - NTSTATUS NTAPI RtlGetControlSecurityDescriptor (PSECURITY_DESCRIPTOR, - PSECURITY_DESCRIPTOR_CONTROL, - PULONG); - HANDLE NTAPI RtlGetCurrentTransaction (); - NTSTATUS NTAPI RtlGetDaclSecurityDescriptor (PSECURITY_DESCRIPTOR, PBOOLEAN, - PACL *, PBOOLEAN); - NTSTATUS NTAPI RtlGetGroupSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID *, - PBOOLEAN); - NTSTATUS NTAPI RtlGetNtVersionNumbers (LPDWORD, LPDWORD, LPDWORD); - NTSTATUS NTAPI RtlGetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID *, - PBOOLEAN); - NTSTATUS NTAPI RtlGetVersion (PRTL_OSVERSIONINFOEXW); - PSID_IDENTIFIER_AUTHORITY NTAPI RtlIdentifierAuthoritySid (PSID); - VOID NTAPI RtlInitAnsiString (PANSI_STRING, PCSTR); - NTSTATUS NTAPI RtlInitializeSid (PSID, PSID_IDENTIFIER_AUTHORITY, UCHAR); - VOID NTAPI RtlInitUnicodeString (PUNICODE_STRING, PCWSTR); - NTSTATUS NTAPI RtlIntegerToUnicodeString (ULONG, ULONG, PUNICODE_STRING); - ULONG NTAPI RtlIsDosDeviceName_U (PCWSTR); - NTSTATUS NTAPI RtlLeaveCriticalSection (PRTL_CRITICAL_SECTION); - ULONG NTAPI RtlLengthSecurityDescriptor (PSECURITY_DESCRIPTOR); - ULONG NTAPI RtlLengthSid (PSID); - ULONG NTAPI RtlNtStatusToDosError (NTSTATUS); - NTSTATUS NTAPI RtlOemStringToUnicodeString (PUNICODE_STRING, POEM_STRING, - BOOLEAN); - BOOLEAN NTAPI RtlPrefixUnicodeString (PUNICODE_STRING, PUNICODE_STRING, - BOOLEAN); - NTSTATUS NTAPI RtlQueryProcessDebugInformation (ULONG, ULONG, PDEBUG_BUFFER); - NTSTATUS NTAPI RtlQueryRegistryValues (ULONG, PCWSTR, - PRTL_QUERY_REGISTRY_TABLE, PVOID, - PVOID); - VOID NTAPI RtlReleasePebLock (); - VOID NTAPI RtlSecondsSince1970ToTime (ULONG, PLARGE_INTEGER); - NTSTATUS NTAPI RtlSetCurrentDirectory_U (PUNICODE_STRING); - BOOLEAN NTAPI RtlSetCurrentTransaction (HANDLE); - NTSTATUS NTAPI RtlSetControlSecurityDescriptor (PSECURITY_DESCRIPTOR, - SECURITY_DESCRIPTOR_CONTROL, - SECURITY_DESCRIPTOR_CONTROL); - NTSTATUS NTAPI RtlSetDaclSecurityDescriptor (PSECURITY_DESCRIPTOR, BOOLEAN, - PACL, BOOLEAN); - NTSTATUS NTAPI RtlSetGroupSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID, - BOOLEAN); - NTSTATUS NTAPI RtlSetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID, - BOOLEAN); - PUCHAR NTAPI RtlSubAuthorityCountSid (PSID); - PULONG NTAPI RtlSubAuthoritySid (PSID, ULONG); - ULONG NTAPI RtlUnicodeStringToAnsiSize (PUNICODE_STRING); - NTSTATUS NTAPI RtlUnicodeStringToAnsiString (PANSI_STRING, PUNICODE_STRING, - BOOLEAN); - NTSTATUS NTAPI RtlUnicodeStringToOemString (PANSI_STRING, PUNICODE_STRING, - BOOLEAN); - WCHAR NTAPI RtlUpcaseUnicodeChar (WCHAR); - NTSTATUS NTAPI RtlUpcaseUnicodeString (PUNICODE_STRING, PUNICODE_STRING, + NTSTATUS NtQuerySystemInformation (SYSTEM_INFORMATION_CLASS, PVOID, ULONG, + PULONG); + NTSTATUS NtQuerySystemTime (PLARGE_INTEGER); + NTSTATUS NtQuerySecurityObject (HANDLE, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR, ULONG, PULONG); + NTSTATUS NtQuerySymbolicLinkObject (HANDLE, PUNICODE_STRING, PULONG); + NTSTATUS NtQueryTimer (HANDLE, TIMER_INFORMATION_CLASS, PVOID, ULONG, PULONG); + NTSTATUS NtQueryTimerResolution (PULONG, PULONG, PULONG); + NTSTATUS NtQueryValueKey (HANDLE, PUNICODE_STRING, + KEY_VALUE_INFORMATION_CLASS, PVOID, ULONG, PULONG); + NTSTATUS NtQueryVirtualMemory (HANDLE, PVOID, MEMORY_INFORMATION_CLASS, PVOID, + SIZE_T, PSIZE_T); + NTSTATUS NtQueryVolumeInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, + FS_INFORMATION_CLASS); + NTSTATUS NtReadFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, PIO_STATUS_BLOCK, + PVOID, ULONG, PLARGE_INTEGER, PULONG); + NTSTATUS NtRollbackTransaction (HANDLE, BOOLEAN); + NTSTATUS NtSetEaFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG); + NTSTATUS NtSetEvent (HANDLE, PULONG); + NTSTATUS NtSetInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, + FILE_INFORMATION_CLASS); + NTSTATUS NtSetInformationJobObject (HANDLE, JOBOBJECTINFOCLASS, PVOID, ULONG); + NTSTATUS NtSetInformationThread (HANDLE, THREADINFOCLASS, PVOID, ULONG); + NTSTATUS NtSetInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, PVOID, + ULONG); + NTSTATUS NtSetQuotaInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG); + NTSTATUS NtSetSecurityObject (HANDLE, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR); + NTSTATUS NtSetTimer (HANDLE, PLARGE_INTEGER, PTIMER_APC_ROUTINE, PVOID, + BOOLEAN, LONG, PBOOLEAN); + NTSTATUS NtSetValueKey (HANDLE, PUNICODE_STRING, ULONG, ULONG, PVOID, ULONG); + NTSTATUS NtSetVolumeInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, + FS_INFORMATION_CLASS); + NTSTATUS NtUnlockFile (HANDLE, PIO_STATUS_BLOCK, PLARGE_INTEGER, + PLARGE_INTEGER, ULONG); + NTSTATUS NtUnlockVirtualMemory (HANDLE, PVOID *, PSIZE_T, ULONG); + NTSTATUS NtUnmapViewOfSection (HANDLE, PVOID); + NTSTATUS NtWaitForSingleObject (HANDLE, BOOLEAN, PLARGE_INTEGER); + NTSTATUS NtWriteFile (HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID, + PIO_STATUS_BLOCK, PVOID, ULONG, PLARGE_INTEGER, PULONG); + NTSTATUS RtlAbsoluteToSelfRelativeSD (PSECURITY_DESCRIPTOR, + PSECURITY_DESCRIPTOR, PULONG); + NTSTATUS RtlAddAccessAllowedAce (PACL, ULONG, ACCESS_MASK, PSID); + NTSTATUS RtlAddAccessAllowedAceEx (PACL, ULONG, ULONG, ACCESS_MASK, PSID); + NTSTATUS RtlAddAccessDeniedAce (PACL, ULONG, ACCESS_MASK, PSID); + NTSTATUS RtlAddAccessDeniedAceEx (PACL, ULONG, ULONG, ACCESS_MASK, PSID); + NTSTATUS RtlAddAce (PACL, ULONG, ULONG, PVOID, ULONG); + PVOID RtlAllocateHeap (PVOID, ULONG, SIZE_T); + NTSTATUS RtlAnsiStringToUnicodeString (PUNICODE_STRING, PANSI_STRING, BOOLEAN); - NTSTATUS NTAPI RtlWriteRegistryValue (ULONG, PCWSTR, PCWSTR, ULONG, PVOID, - ULONG); + NTSTATUS RtlAppendUnicodeToString (PUNICODE_STRING, PCWSTR); + NTSTATUS RtlAppendUnicodeStringToString (PUNICODE_STRING, PUNICODE_STRING); + NTSTATUS RtlCheckRegistryKey (ULONG, PCWSTR); + LONG RtlCompareUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN); + NTSTATUS RtlConvertSidToUnicodeString (PUNICODE_STRING, PSID, BOOLEAN); + NTSTATUS RtlConvertToAutoInheritSecurityObject (PSECURITY_DESCRIPTOR, + PSECURITY_DESCRIPTOR, + PSECURITY_DESCRIPTOR *, + GUID *, BOOLEAN, + PGENERIC_MAPPING); + NTSTATUS RtlCopySid (ULONG, PSID, PSID); + VOID RtlCopyUnicodeString (PUNICODE_STRING, PUNICODE_STRING); + NTSTATUS RtlCreateAcl (PACL, ULONG, ULONG); + PDEBUG_BUFFER RtlCreateQueryDebugBuffer (ULONG, BOOLEAN); + NTSTATUS RtlCreateSecurityDescriptor (PSECURITY_DESCRIPTOR, ULONG); + BOOLEAN RtlCreateUnicodeStringFromAsciiz (PUNICODE_STRING, PCSTR); + NTSTATUS RtlDeleteSecurityObject (PSECURITY_DESCRIPTOR *); + NTSTATUS RtlDestroyQueryDebugBuffer (PDEBUG_BUFFER); + NTSTATUS RtlDowncaseUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN); + NTSTATUS RtlEnterCriticalSection (PRTL_CRITICAL_SECTION); + BOOLEAN RtlEqualPrefixSid (PSID, PSID); + BOOLEAN RtlEqualSid (PSID, PSID); + BOOLEAN RtlEqualUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN); + BOOLEAN RtlFreeHeap (HANDLE, ULONG, PVOID); + VOID RtlFreeUnicodeString (PUNICODE_STRING); + BOOLEAN RtlFirstFreeAce (PACL, PVOID *); + NTSTATUS RtlGetAce (PACL, ULONG, PVOID); + NTSTATUS RtlGetControlSecurityDescriptor (PSECURITY_DESCRIPTOR, + PSECURITY_DESCRIPTOR_CONTROL, + PULONG); + HANDLE RtlGetCurrentTransaction (); + NTSTATUS RtlGetDaclSecurityDescriptor (PSECURITY_DESCRIPTOR, PBOOLEAN, PACL *, + PBOOLEAN); + NTSTATUS RtlGetGroupSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID *, + PBOOLEAN); + NTSTATUS RtlGetNtVersionNumbers (LPDWORD, LPDWORD, LPDWORD); + NTSTATUS RtlGetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID *, + PBOOLEAN); + NTSTATUS RtlGetVersion (PRTL_OSVERSIONINFOEXW); + PSID_IDENTIFIER_AUTHORITY RtlIdentifierAuthoritySid (PSID); + VOID RtlInitAnsiString (PANSI_STRING, PCSTR); + NTSTATUS RtlInitializeSid (PSID, PSID_IDENTIFIER_AUTHORITY, UCHAR); + VOID RtlInitUnicodeString (PUNICODE_STRING, PCWSTR); + NTSTATUS RtlLeaveCriticalSection (PRTL_CRITICAL_SECTION); + ULONG RtlLengthSecurityDescriptor (PSECURITY_DESCRIPTOR); + ULONG RtlLengthSid (PSID); + ULONG RtlNtStatusToDosError (NTSTATUS); + BOOLEAN RtlPrefixUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN); + NTSTATUS RtlQueryProcessDebugInformation (ULONG, ULONG, PDEBUG_BUFFER); + NTSTATUS RtlQueryRegistryValues (ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, + PVOID, PVOID); + VOID RtlReleasePebLock (); + NTSTATUS RtlSetCurrentDirectory_U (PUNICODE_STRING); + BOOLEAN RtlSetCurrentTransaction (HANDLE); + NTSTATUS RtlSetControlSecurityDescriptor (PSECURITY_DESCRIPTOR, + SECURITY_DESCRIPTOR_CONTROL, + SECURITY_DESCRIPTOR_CONTROL); + NTSTATUS RtlSetDaclSecurityDescriptor (PSECURITY_DESCRIPTOR, BOOLEAN, PACL, + BOOLEAN); + NTSTATUS RtlSetGroupSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID, BOOLEAN); + NTSTATUS RtlSetOwnerSecurityDescriptor (PSECURITY_DESCRIPTOR, PSID, BOOLEAN); + PUCHAR RtlSubAuthorityCountSid (PSID); + PULONG RtlSubAuthoritySid (PSID, ULONG); + ULONG RtlUnicodeStringToAnsiSize (PUNICODE_STRING); + NTSTATUS RtlUnicodeStringToAnsiString (PANSI_STRING, PUNICODE_STRING, + BOOLEAN); + WCHAR RtlUpcaseUnicodeChar (WCHAR); + NTSTATUS RtlUpcaseUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN); + NTSTATUS RtlWriteRegistryValue (ULONG, PCWSTR, PCWSTR, ULONG, PVOID, ULONG); #ifdef __cplusplus /* A few Rtl functions are either actually macros, or they just don't @@ -1680,8 +1620,7 @@ extern "C" is missing entirely in w32api. */ inline - VOID NTAPI RtlInitEmptyUnicodeString(PUNICODE_STRING dest, PWSTR buf, - USHORT len) + VOID RtlInitEmptyUnicodeString(PUNICODE_STRING dest, PWSTR buf, USHORT len) { dest->Length = 0; dest->MaximumLength = len; @@ -1693,8 +1632,8 @@ extern "C" is known, but you can't rely on the string being 0-terminated. If you know it's 0-terminated, just use RtlInitUnicodeString(). */ inline - VOID NTAPI RtlInitCountedUnicodeString (PUNICODE_STRING dest, PCWSTR buf, - USHORT len) + VOID RtlInitCountedUnicodeString (PUNICODE_STRING dest, PCWSTR buf, + USHORT len) { dest->Length = dest->MaximumLength = len; dest->Buffer = (PWSTR) buf; @@ -1708,8 +1647,8 @@ extern "C" backslash. If you don't need it, just subtract sizeof(WCHAR) from dirname.Length. */ inline - VOID NTAPI RtlSplitUnicodePath (PUNICODE_STRING path, PUNICODE_STRING dirname, - PUNICODE_STRING basename) + VOID RtlSplitUnicodePath (PUNICODE_STRING path, PUNICODE_STRING dirname, + PUNICODE_STRING basename) { USHORT len = path->Length / sizeof (WCHAR); while (len > 0 && path->Buffer[--len] != L'\\') @@ -1723,9 +1662,9 @@ extern "C" } /* Check if prefix is a prefix of path. */ inline - BOOLEAN NTAPI RtlEqualUnicodePathPrefix (PUNICODE_STRING path, - PUNICODE_STRING prefix, - BOOLEAN caseinsensitive) + BOOLEAN RtlEqualUnicodePathPrefix (PUNICODE_STRING path, + PUNICODE_STRING prefix, + BOOLEAN caseinsensitive) { UNICODE_STRING p; @@ -1736,9 +1675,9 @@ extern "C" } /* Check if suffix is a suffix of path. */ inline - BOOL NTAPI RtlEqualUnicodePathSuffix (PUNICODE_STRING path, - PUNICODE_STRING suffix, - BOOLEAN caseinsensitive) + BOOL RtlEqualUnicodePathSuffix (PUNICODE_STRING path, + PUNICODE_STRING suffix, + BOOLEAN caseinsensitive) { UNICODE_STRING p; @@ -1755,12 +1694,11 @@ extern "C" otherwise overwrite dest. Returns either STATUS_SUCCESS, or STATUS_BUFFER_OVERFLOW, if the unicode buffer is too small (hasn't room for 16 WCHARs). */ - NTSTATUS NTAPI RtlInt64ToHexUnicodeString (ULONGLONG value, - PUNICODE_STRING dest, - BOOLEAN append); + NTSTATUS RtlInt64ToHexUnicodeString (ULONGLONG value, PUNICODE_STRING dest, + BOOLEAN append); /* Set file attributes. Don't change file times. */ inline - NTSTATUS NTAPI NtSetAttributesFile (HANDLE h, ULONG attr) + NTSTATUS NtSetAttributesFile (HANDLE h, ULONG attr) { IO_STATUS_BLOCK io; FILE_BASIC_INFORMATION fbi; @@ -1773,7 +1711,7 @@ extern "C" /* This test for a signalled event is twice as fast as calling WaitForSingleObject (event, 0). */ inline - BOOL NTAPI IsEventSignalled (HANDLE event) + BOOL IsEventSignalled (HANDLE event) { EVENT_BASIC_INFORMATION ebi; return NT_SUCCESS (NtQueryEvent (event, EventBasicInformation, diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h index c40adf1e3..41b4e275f 100644 --- a/winsup/cygwin/security.h +++ b/winsup/cygwin/security.h @@ -131,8 +131,8 @@ extern "C" #endif /* We need these declarations, otherwise g++ complains that the below inline methods use an undefined function, if ntdll.h isn't included. */ - BOOLEAN NTAPI RtlEqualSid (PSID, PSID); - NTSTATUS NTAPI RtlCopySid (ULONG, PSID, PSID); + BOOLEAN RtlEqualSid (PSID, PSID); + NTSTATUS RtlCopySid (ULONG, PSID, PSID); #ifdef __cplusplus } #endif diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc index 22a79b614..0ab229053 100644 --- a/winsup/cygwin/strfuncs.cc +++ b/winsup/cygwin/strfuncs.cc @@ -882,7 +882,7 @@ slashify (const char *src, char *dst, bool trailing_slash_p) static WCHAR hex_wchars[] = L"0123456789abcdef"; -NTSTATUS NTAPI +NTSTATUS RtlInt64ToHexUnicodeString (ULONGLONG value, PUNICODE_STRING dest, BOOLEAN append) {
