advapi32: Move access control functions to kernelbase.

dlls/advapi32/advapi32.spec

@@ -4,10 +4,10 @@
 @ stdcall A_SHAUpdate(ptr ptr long) ntdll.A_SHAUpdate
 @ stdcall AbortSystemShutdownA(ptr)
 @ stdcall AbortSystemShutdownW(ptr)
-@ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr)
+@ stdcall -import AccessCheck(ptr long long ptr ptr ptr ptr ptr)
 @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr)
-@ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr)
-@ stdcall AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr)
+@ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr)
+@ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr)
 # @ stub AccessCheckByTypeAndAuditAlarmA
 # @ stub AccessCheckByTypeAndAuditAlarmW
 # @ stub AccessCheckByTypeResultList
@@ -15,26 +15,26 @@
 # @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleA
 # @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW
 # @ stub AccessCheckByTypeResultListAndAuditAlarmW
-@ stdcall AddAccessAllowedAce (ptr long long ptr)
-@ stdcall AddAccessAllowedAceEx (ptr long long long ptr)
-@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr)
-@ stdcall AddAccessDeniedAce(ptr long long ptr)
-@ stdcall AddAccessDeniedAceEx(ptr long long long ptr)
-@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr)
-@ stdcall AddAce(ptr long long ptr long)
-@ stdcall AddAuditAccessAce(ptr long long ptr long long)
-@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long)
-@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long)
+@ stdcall -import AddAccessAllowedAce (ptr long long ptr)
+@ stdcall -import AddAccessAllowedAceEx (ptr long long long ptr)
+@ stdcall -import AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr)
+@ stdcall -import AddAccessDeniedAce(ptr long long ptr)
+@ stdcall -import AddAccessDeniedAceEx(ptr long long long ptr)
+@ stdcall -import AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr)
+@ stdcall -import AddAce(ptr long long ptr long)
+@ stdcall -import AddAuditAccessAce(ptr long long ptr long long)
+@ stdcall -import AddAuditAccessAceEx(ptr long long long ptr long long)
+@ stdcall -import AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long)
 # @ stub AddConditionalAce
-@ stdcall AddMandatoryAce(ptr long long long ptr)
+@ stdcall -import AddMandatoryAce(ptr long long long ptr)
 # @ stub AddUsersToEncryptedFile
 # @ stub AddUsersToEncryptedFileEx
 @ stdcall -import AdjustTokenGroups(long long ptr long ptr ptr)
 @ stdcall -import AdjustTokenPrivileges(long long ptr long ptr ptr)
 @ stdcall -import AllocateAndInitializeSid(ptr long long long long long long long long long ptr)
 @ stdcall -import AllocateLocallyUniqueId(ptr)
-@ stdcall AreAllAccessesGranted(long long)
-@ stdcall AreAnyAccessesGranted(long long)
+@ stdcall -import AreAllAccessesGranted(long long)
+@ stdcall -import AreAnyAccessesGranted(long long)
 # @ stub AuditComputeEffectivePolicyBySid
 # @ stub AuditComputeEffectivePolicyByToken
 # @ stub AuditEnumerateCategories
@@ -234,7 +234,7 @@
 # @ stub CveEventWrite
 @ stdcall DecryptFileA(str long)
 @ stdcall DecryptFileW(wstr long)
-@ stdcall DeleteAce(ptr long)
+@ stdcall -import DeleteAce(ptr long)
 @ stdcall DeleteService(long)
 @ stdcall DeregisterEventSource(long)
 @ stdcall -import DestroyPrivateObjectSecurity(ptr)
@@ -301,7 +301,7 @@
 @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer
 @ stdcall FileEncryptionStatusA(str ptr)
 @ stdcall FileEncryptionStatusW(wstr ptr)
-@ stdcall FindFirstFreeAce(ptr ptr)
+@ stdcall -import FindFirstFreeAce(ptr ptr)
 # @ stub FlushEfsCache
 @ stdcall FlushTraceA(int64 str ptr)
 @ stdcall FlushTraceW(int64 wstr ptr)
@@ -312,8 +312,8 @@
 @ stdcall -import FreeSid(ptr)
 # @ stub GetAccessPermissionsForObjectA
 # @ stub GetAccessPermissionsForObjectW
-@ stdcall GetAce(ptr long ptr)
-@ stdcall GetAclInformation(ptr ptr long long)
+@ stdcall -import GetAce(ptr long ptr)
+@ stdcall -import GetAclInformation(ptr ptr long long)
 @ stdcall GetAuditedPermissionsFromAclA(ptr ptr ptr ptr)
 @ stdcall GetAuditedPermissionsFromAclW(ptr ptr ptr ptr)
 @ stdcall GetCurrentHwProfileA(ptr)
@@ -402,7 +402,7 @@
 @ stdcall -import ImpersonateLoggedOnUser(long)
 @ stdcall -import ImpersonateNamedPipeClient(long)
 @ stdcall -import ImpersonateSelf(long)
-@ stdcall InitializeAcl(ptr long long)
+@ stdcall -import InitializeAcl(ptr long long)
 @ stdcall -import InitializeSecurityDescriptor(ptr long)
 @ stdcall -import InitializeSid(ptr ptr long)
 @ stdcall InitiateShutdownA(str str long long long)
@@ -416,7 +416,7 @@
 @ stdcall IsTextUnicode(ptr long ptr)
 @ stdcall -import IsTokenRestricted(long)
 # @ stub IsTokenUntrusted
-@ stdcall IsValidAcl(ptr)
+@ stdcall -import IsValidAcl(ptr)
 # @ stub IsValidRelativeSecurityDescriptor
 @ stdcall -import IsValidSecurityDescriptor(ptr)
 @ stdcall -import IsValidSid(ptr)
@@ -521,7 +521,7 @@
 @ stdcall -import MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
 # @ stub MakeAbsoluteSD2
 @ stdcall -import MakeSelfRelativeSD(ptr ptr ptr)
-@ stdcall MapGenericMask(ptr ptr)
+@ stdcall -import MapGenericMask(ptr ptr)
 @ stdcall NotifyBootConfigStatus(long)
 @ stdcall NotifyChangeEventLog (long long)
 # @ stub NotifyServiceStatusChange
@@ -529,13 +529,13 @@
 @ stdcall NotifyServiceStatusChangeW(ptr long ptr)
 # @ stub NpGetUserName
 @ stdcall ObjectCloseAuditAlarmA(str ptr long)
-@ stdcall ObjectCloseAuditAlarmW(wstr ptr long)
+@ stdcall -import ObjectCloseAuditAlarmW(wstr ptr long)
 # @ stub ObjectDeleteAuditAlarmA
-@ stdcall ObjectDeleteAuditAlarmW(wstr ptr long)
+@ stdcall -import ObjectDeleteAuditAlarmW(wstr ptr long)
 @ stdcall ObjectOpenAuditAlarmA(str ptr str str ptr long long long ptr long long ptr)
-@ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr)
+@ stdcall -import ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr)
 @ stdcall ObjectPrivilegeAuditAlarmA(str ptr long long ptr long)
-@ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long)
+@ stdcall -import ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long)
 @ stdcall OpenBackupEventLogA (str str)
 @ stdcall OpenBackupEventLogW (wstr wstr)
 @ stdcall OpenEncryptedFileRawA(str long ptr)
@@ -584,7 +584,7 @@
 @ stdcall PerfStopProvider(long)
 @ stdcall -import PrivilegeCheck(ptr ptr ptr)
 @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long)
-@ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long)
+@ stdcall -import PrivilegedServiceAuditAlarmW(wstr wstr long ptr long)
 # @ stub ProcessIdleTasks
 # @ stub ProcessIdleTasksW
 @ stdcall ProcessTrace(ptr long ptr ptr)
@@ -731,7 +731,7 @@
 # @ stub SaferiRecordEventLogEntry
 # @ stub SaferiReplaceProcessThreadTokens
 # @ stub SaferiSearchMatchingHashRules
-@ stdcall SetAclInformation(ptr ptr long long)
+@ stdcall -import SetAclInformation(ptr ptr long long)
 # @ stub SetEncryptedFileMetadata
 # @ stub SetEntriesInAccessListA
 # @ stub SetEntriesInAccessListW

dlls/kernelbase/kernelbase.spec

-@ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) advapi32.AccessCheck
-@ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) advapi32.AccessCheckAndAuditAlarmW
-@ stdcall AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) advapi32.AccessCheckByType
+@ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr)
+@ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr)
+@ stdcall AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr)
 @ stub AccessCheckByTypeAndAuditAlarmW
 @ stub AccessCheckByTypeResultList
 @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW
@@ -9,18 +9,18 @@
 @ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared
 # @ stub AcquireStateLock
 @ stdcall ActivateActCtx(ptr ptr) kernel32.ActivateActCtx
-@ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce
-@ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx
-@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce
-@ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce
-@ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx
-@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce
-@ stdcall AddAce(ptr long long ptr long) advapi32.AddAce
-@ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce
-@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx
-@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce
+@ stdcall AddAccessAllowedAce(ptr long long ptr)
+@ stdcall AddAccessAllowedAceEx(ptr long long long ptr)
+@ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr)
+@ stdcall AddAccessDeniedAce(ptr long long ptr)
+@ stdcall AddAccessDeniedAceEx(ptr long long long ptr)
+@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr)
+@ stdcall AddAce(ptr long long ptr long)
+@ stdcall AddAuditAccessAce(ptr long long ptr long long)
+@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long)
+@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long)
 @ stdcall AddDllDirectory(wstr) kernel32.AddDllDirectory
-@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce
+@ stdcall AddMandatoryAce(ptr long long long ptr)
 @ stdcall AddRefActCtx(ptr) kernel32.AddRefActCtx
 # @ stub AddResourceAttributeAce
 # @ stub AddSIDToBoundaryDescriptor
@@ -62,8 +62,8 @@
 # @ stub AppXReleaseAppXContext
 # @ stub AppXUpdatePackageCapabilities
 # @ stub ApplicationUserModelIdFromProductId
-@ stdcall AreAllAccessesGranted(long long) advapi32.AreAllAccessesGranted
-@ stdcall AreAnyAccessesGranted(long long) advapi32.AreAnyAccessesGranted
+@ stdcall AreAllAccessesGranted(long long)
+@ stdcall AreAnyAccessesGranted(long long)
 @ stdcall AreFileApisANSI() kernel32.AreFileApisANSI
 # @ stub AreThereVisibleLogoffScriptsInternal
 # @ stub AreThereVisibleShutdownScriptsInternal
@@ -246,7 +246,7 @@
 @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW
 @ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook
 # @ stub DelayLoadFailureHookLookup
-@ stdcall DeleteAce(ptr long) advapi32.DeleteAce
+@ stdcall DeleteAce(ptr long)
 # @ stub DeleteBoundaryDescriptor
 @ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection
 @ stdcall DeleteFiber(ptr) kernel32.DeleteFiber
@@ -359,7 +359,7 @@
 @ stdcall FindFirstFileExW(wstr long ptr long ptr long) kernel32.FindFirstFileExW
 # @ stub FindFirstFileNameW
 @ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW
-@ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce
+@ stdcall FindFirstFreeAce(ptr ptr)
 @ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW
 @ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW
 @ stub FindNLSString
@@ -405,8 +405,8 @@
 @ stdcall GetACP() kernel32.GetACP
 @ stdcall GetAcceptLanguagesA(ptr ptr)
 @ stdcall GetAcceptLanguagesW(ptr ptr)
-@ stdcall GetAce(ptr long ptr) advapi32.GetAce
-@ stdcall GetAclInformation(ptr ptr long long) advapi32.GetAclInformation
+@ stdcall GetAce(ptr long ptr)
+@ stdcall GetAclInformation(ptr ptr long long)
 # @ stub GetAdjustObjectAttributesForPrivateNamespaceRoutine
 # @ stub GetAlternatePackageRoots
 # @ stub GetAppContainerAce
@@ -798,7 +798,7 @@
 @ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete
 @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce
 @ stdcall InitOnceInitialize(ptr) kernel32.InitOnceInitialize
-@ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl
+@ stdcall InitializeAcl(ptr long long)
 @ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable
 # @ stub InitializeContext
 @ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection
@@ -874,7 +874,7 @@
 @ stdcall IsThreadpoolTimerSet(ptr) kernel32.IsThreadpoolTimerSet
 # @ stub IsTimeZoneRedirectionEnabled
 @ stdcall IsTokenRestricted(long)
-@ stdcall IsValidAcl(ptr) advapi32.IsValidAcl
+@ stdcall IsValidAcl(ptr)
 @ stdcall IsValidCodePage(long) kernel32.IsValidCodePage
 @ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup
 @ stdcall IsValidLocale(long long) kernel32.IsValidLocale
@@ -947,7 +947,7 @@
 @ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
 @ stub MakeAbsoluteSD2
 @ stdcall MakeSelfRelativeSD(ptr ptr ptr)
-@ stdcall MapGenericMask(ptr ptr) advapi32.MapGenericMask
+@ stdcall MapGenericMask(ptr ptr)
 # @ stub MapPredefinedHandleInternal
 @ stdcall MapUserPhysicalPages(ptr long ptr) kernel32.MapUserPhysicalPages
 @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile
@@ -976,10 +976,10 @@
 @ stdcall NormalizeString(long wstr long ptr long) kernel32.NormalizeString
 @ stub NotifyMountMgr
 @ stub NotifyRedirectedStringChange
-@ stdcall ObjectCloseAuditAlarmW(wstr ptr long) advapi32.ObjectCloseAuditAlarmW
-@ stdcall ObjectDeleteAuditAlarmW(wstr ptr long) advapi32.ObjectDeleteAuditAlarmW
-@ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr) advapi32.ObjectOpenAuditAlarmW
-@ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long) advapi32.ObjectPrivilegeAuditAlarmW
+@ stdcall ObjectCloseAuditAlarmW(wstr ptr long)
+@ stdcall ObjectDeleteAuditAlarmW(wstr ptr long)
+@ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr)
+@ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long)
 # @ stub OfferVirtualMemory
 @ stdcall OpenEventA(long long str) kernel32.OpenEventA
 @ stdcall OpenEventW(long long wstr) kernel32.OpenEventW
@@ -1164,7 +1164,7 @@
 # @ stub PrefetchVirtualMemory
 @ stub PrivCopyFileExW
 @ stdcall PrivilegeCheck(ptr ptr ptr)
-@ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) advapi32.PrivilegedServiceAuditAlarmW
+@ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long)
 @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId
 # @ stub ProductIdFromPackageFamilyName
 # @ stub PsmCreateKey
@@ -1388,7 +1388,7 @@
 @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) kernel32.ScrollConsoleScreenBufferW
 @ stdcall SearchPathA(str str str long ptr ptr) kernel32.SearchPathA
 @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW
-@ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation
+@ stdcall SetAclInformation(ptr ptr long long)
 # @ stub SetCachedSigningLevel
 @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW
 # @ stub SetClientDynamicTimeZoneInformation