advapi32: Move token functions to kernelbase.

dlls/advapi32/advapi32.spec

@@ -29,8 +29,8 @@
 @ stdcall AddMandatoryAce(ptr long long long ptr)
 # @ stub AddUsersToEncryptedFile
 # @ stub AddUsersToEncryptedFileEx
-@ stdcall AdjustTokenGroups(long long ptr long ptr ptr)
-@ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr)
+@ 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)
@@ -94,7 +94,7 @@
 @ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str)
 @ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr)
 # @ stub CheckForHiberboot
-@ stdcall CheckTokenMembership(long ptr ptr)
+@ stdcall -import CheckTokenMembership(long ptr ptr)
 @ stdcall ClearEventLogA (long str)
 @ stdcall ClearEventLogW (long wstr)
 # @ stub CloseCodeAuthzLevel
@@ -142,7 +142,7 @@
 @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessAsUserW
 @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr)
 @ stdcall CreateProcessWithTokenW(long long wstr wstr long ptr wstr ptr ptr)
-@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr)
+@ stdcall -import CreateRestrictedToken(long long long ptr long ptr long ptr ptr)
 @ stdcall CreateServiceA(long str str long long long long str str ptr str str str)
 @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr)
 # @ stub CreateTraceInstanceId
@@ -239,8 +239,8 @@
 @ stdcall DeregisterEventSource(long)
 @ stdcall DestroyPrivateObjectSecurity(ptr)
 # @ stub DuplicateEncryptionInfoFile
-@ stdcall DuplicateToken(long long ptr)
-@ stdcall DuplicateTokenEx(long long ptr long long ptr)
+@ stdcall -import DuplicateToken(long long ptr)
+@ stdcall -import DuplicateTokenEx(long long ptr long long ptr)
 # @ stub ElfBackupEventLogFileA
 # @ stub ElfBackupEventLogFileW
 # @ stub ElfChangeNotify
@@ -371,7 +371,7 @@
 @ stub GetSiteSidFromToken
 # @ stub GetStringConditionFromBinary
 # @ stub GetThreadWaitChain
-@ stdcall GetTokenInformation(long long ptr long ptr)
+@ stdcall -import GetTokenInformation(long long ptr long ptr)
 @ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags
 @ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel
 @ stdcall -ret64 GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle
@@ -398,10 +398,10 @@
 # @ stub I_ScSetServiceBitsW
 # @ stub I_ScValidatePnPService
 # @ stub IdentifyCodeAuthzLevelW
-@ stdcall ImpersonateAnonymousToken(long)
-@ stdcall ImpersonateLoggedOnUser(long)
-@ stdcall ImpersonateNamedPipeClient(long)
-@ stdcall ImpersonateSelf(long)
+@ stdcall -import ImpersonateAnonymousToken(long)
+@ stdcall -import ImpersonateLoggedOnUser(long)
+@ stdcall -import ImpersonateNamedPipeClient(long)
+@ stdcall -import ImpersonateSelf(long)
 @ stdcall InitializeAcl(ptr long long)
 @ stdcall InitializeSecurityDescriptor(ptr long)
 @ stdcall -import InitializeSid(ptr ptr long)
@@ -414,7 +414,7 @@
 @ stub InstallApplication
 @ stub IsProcessRestricted
 @ stdcall IsTextUnicode(ptr long ptr)
-@ stdcall IsTokenRestricted(long)
+@ stdcall -import IsTokenRestricted(long)
 # @ stub IsTokenUntrusted
 @ stdcall IsValidAcl(ptr)
 # @ stub IsValidRelativeSecurityDescriptor
@@ -542,12 +542,12 @@
 @ stdcall OpenEncryptedFileRawW(wstr long ptr)
 @ stdcall OpenEventLogA (str str)
 @ stdcall OpenEventLogW (wstr wstr)
-@ stdcall OpenProcessToken(long long ptr)
+@ stdcall -import OpenProcessToken(long long ptr)
 @ stdcall OpenSCManagerA(str str long)
 @ stdcall OpenSCManagerW(wstr wstr long)
 @ stdcall OpenServiceA(long str long)
 @ stdcall OpenServiceW(long wstr long)
-@ stdcall OpenThreadToken(long long long ptr)
+@ stdcall -import OpenThreadToken(long long long ptr)
 # @ stub OpenThreadWaitChainSession
 @ stdcall -ret64 OpenTraceA(ptr)
 @ stdcall -ret64 OpenTraceW(ptr)
@@ -582,7 +582,7 @@
 @ stdcall PerfStartProvider(ptr ptr ptr)
 @ stdcall PerfStartProviderEx(ptr ptr ptr)
 @ stdcall PerfStopProvider(long)
-@ stdcall PrivilegeCheck(ptr ptr ptr)
+@ stdcall -import PrivilegeCheck(ptr ptr ptr)
 @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long)
 @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long)
 # @ stub ProcessIdleTasks
@@ -712,7 +712,7 @@
 # @ stub RemoveUsersFromEncryptedFile
 @ stdcall ReportEventA(long long long long ptr long long ptr ptr)
 @ stdcall ReportEventW(long long long long ptr long long ptr ptr)
-@ stdcall RevertToSelf()
+@ stdcall -import RevertToSelf()
 # @ stub SafeBaseRegGetKeySecurity
 @ stdcall SaferCloseLevel(ptr)
 @ stdcall SaferComputeTokenFromLevel(ptr ptr ptr long ptr)
@@ -763,8 +763,8 @@
 @ stdcall SetServiceBits(long long long long)
 @ stdcall SetServiceObjectSecurity(long long ptr)
 @ stdcall SetServiceStatus(long ptr)
-@ stdcall SetThreadToken (ptr ptr)
-@ stdcall SetTokenInformation (long long ptr long)
+@ stdcall -import SetThreadToken(ptr ptr)
+@ stdcall -import SetTokenInformation(long long ptr long)
 # @ stub SetTraceCallback
 # @ stub SetUserFileEncryptionKey
 # @ stub SetUserFileEncryptionKeyEx

dlls/kernelbase/Makefile.in

 MODULE    = kernelbase.dll
 IMPORTLIB = kernelbase
-IMPORTS   = uuid advapi32 ntdll winecrt0 kernel32
+IMPORTS   = uuid ntdll winecrt0 kernel32
 EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin
 
 C_SRCS = \

dlls/kernelbase/kernelbase.spec

@@ -27,8 +27,8 @@
 # @ stub AddScopedPolicyIDAce
 @ stdcall AddVectoredContinueHandler(long ptr) kernel32.AddVectoredContinueHandler
 @ stdcall AddVectoredExceptionHandler(long ptr) kernel32.AddVectoredExceptionHandler
-@ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups
-@ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges
+@ stdcall AdjustTokenGroups(long long ptr long ptr ptr)
+@ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr)
 @ stdcall AllocConsole() kernel32.AllocConsole
 @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr)
 @ stdcall AllocateLocallyUniqueId(ptr)
@@ -128,7 +128,7 @@
 # @ stub CheckIfStateChangeNotificationExists
 @ stdcall CheckRemoteDebuggerPresent(long ptr) kernel32.CheckRemoteDebuggerPresent
 # @ stub CheckTokenCapability
-@ stdcall CheckTokenMembership(long ptr ptr) advapi32.CheckTokenMembership
+@ stdcall CheckTokenMembership(long ptr ptr)
 # @ stub CheckTokenMembershipEx
 @ stdcall ChrCmpIA(long long)
 @ stdcall ChrCmpIW(long long)
@@ -213,7 +213,7 @@
 @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW
 @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread
 @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx
-@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken
+@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr)
 @ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW
 @ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW
 # @ stub CreateStateAtom
@@ -281,8 +281,8 @@
 # @ stub DsWriteNgcKeyW
 @ stdcall DuplicateHandle(long long long ptr long long long) kernel32.DuplicateHandle
 # @ stub DuplicateStateContainerHandle
-@ stdcall DuplicateToken(long long ptr) advapi32.DuplicateToken
-@ stdcall DuplicateTokenEx(long long ptr long long ptr) advapi32.DuplicateTokenEx
+@ stdcall DuplicateToken(long long ptr)
+@ stdcall DuplicateTokenEx(long long ptr long long ptr)
 # @ stub EmptyWorkingSet
 @ stdcall EncodePointer(ptr) kernel32.EncodePointer
 # @ stub EncodeRemotePointer
@@ -733,7 +733,7 @@
 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW
 @ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation
 @ stdcall GetTimeZoneInformationForYear(long ptr ptr) kernel32.GetTimeZoneInformationForYear
-@ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
+@ stdcall GetTokenInformation(long long ptr long ptr)
 @ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags
 @ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel
 @ stdcall -ret64 GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle
@@ -789,10 +789,10 @@
 @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii
 @ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode
 @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode
-@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
-@ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
-@ stdcall ImpersonateNamedPipeClient(long) advapi32.ImpersonateNamedPipeClient
-@ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
+@ stdcall ImpersonateAnonymousToken(long)
+@ stdcall ImpersonateLoggedOnUser(long)
+@ stdcall ImpersonateNamedPipeClient(long)
+@ stdcall ImpersonateSelf(long)
 # @ stub IncrementPackageStatusVersion
 @ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize
 @ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete
@@ -873,7 +873,7 @@
 @ stdcall IsThreadAFiber() kernel32.IsThreadAFiber
 @ stdcall IsThreadpoolTimerSet(ptr) kernel32.IsThreadpoolTimerSet
 # @ stub IsTimeZoneRedirectionEnabled
-@ stdcall IsTokenRestricted(long) advapi32.IsTokenRestricted
+@ stdcall IsTokenRestricted(long)
 @ stdcall IsValidAcl(ptr) advapi32.IsValidAcl
 @ stdcall IsValidCodePage(long) kernel32.IsValidCodePage
 @ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup
@@ -992,7 +992,7 @@
 # @ stub OpenPackageInfoByFullNameForUser
 # @ stub OpenPrivateNamespaceW
 @ stdcall OpenProcess(long long long) kernel32.OpenProcess
-@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken
+@ stdcall OpenProcessToken(long long ptr)
 @ stub OpenRegKey
 @ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW
 # @ stub OpenState
@@ -1001,7 +1001,7 @@
 # @ stub OpenStateExplicitForUserSid
 # @ stub OpenStateExplicitForUserSidString
 @ stdcall OpenThread(long long long) kernel32.OpenThread
-@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken
+@ stdcall OpenThreadToken(long long long ptr)
 @ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW
 @ stdcall OutputDebugStringA(str) kernel32.OutputDebugStringA
 @ stdcall OutputDebugStringW(wstr) kernel32.OutputDebugStringW
@@ -1163,7 +1163,7 @@
 @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus
 # @ stub PrefetchVirtualMemory
 @ stub PrivCopyFileExW
-@ stdcall PrivilegeCheck(ptr ptr ptr) advapi32.PrivilegeCheck
+@ stdcall PrivilegeCheck(ptr ptr ptr)
 @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) advapi32.PrivilegedServiceAuditAlarmW
 @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId
 # @ stub ProductIdFromPackageFamilyName
@@ -1349,7 +1349,7 @@
 @ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName
 @ stdcall RestoreLastError(long) kernel32.RestoreLastError
 @ stdcall ResumeThread(long) kernel32.ResumeThread
-@ stdcall RevertToSelf() advapi32.RevertToSelf
+@ stdcall RevertToSelf()
 # @ stub RsopLoggingEnabledInternal
 # @ stub SHCoCreateInstance
 @ stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA
@@ -1491,7 +1491,7 @@
 @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost
 # @ stub SetThreadSelectedCpuSets
 @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee
-@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken
+@ stdcall SetThreadToken(ptr ptr)
 @ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage
 @ stub SetThreadpoolStackInformation
 @ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum
@@ -1501,7 +1501,7 @@
 @ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait
 # @ stub SetThreadpoolWaitEx
 @ stdcall SetTimeZoneInformation(ptr) kernel32.SetTimeZoneInformation
-@ stdcall SetTokenInformation(long long ptr long) advapi32.SetTokenInformation
+@ stdcall SetTokenInformation(long long ptr long)
 @ stdcall SetUnhandledExceptionFilter(ptr) kernel32.SetUnhandledExceptionFilter
 @ stdcall SetUserGeoID(long) kernel32.SetUserGeoID
 @ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer