advapi32: Move sid functions to kernelbase.

dlls/advapi32/advapi32.spec

@@ -31,8 +31,8 @@
 # @ stub AddUsersToEncryptedFileEx
 @ stdcall AdjustTokenGroups(long long ptr long ptr ptr)
 @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr)
-@ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr)
-@ stdcall AllocateLocallyUniqueId(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)
 # @ stub AuditComputeEffectivePolicyBySid
@@ -132,7 +132,7 @@
 @ stdcall ConvertStringSidToSidA(ptr ptr)
 @ stdcall ConvertStringSidToSidW(ptr ptr)
 @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr)
-@ stdcall CopySid(long ptr ptr)
+@ stdcall -import CopySid(long ptr ptr)
 # @ stub CreateCodeAuthzLevel
 @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr)
 @ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr)
@@ -146,7 +146,7 @@
 @ 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
-@ stdcall CreateWellKnownSid(long ptr ptr ptr)
+@ stdcall -import CreateWellKnownSid(long ptr ptr ptr)
 # @ stub CredBackupCredentials
 @ stdcall CredDeleteA(str long long)
 @ stdcall CredDeleteW(wstr long long)
@@ -282,8 +282,8 @@
 @ stdcall EnumerateTraceGuids(ptr long ptr)
 # @ stub EnumerateTraceGuidsEx
 # @ stub EqualDomainSid
-@ stdcall EqualPrefixSid(ptr ptr)
-@ stdcall EqualSid(ptr ptr)
+@ stdcall -import EqualPrefixSid(ptr ptr)
+@ stdcall -import EqualSid(ptr ptr)
 # @ stub EventAccessControl
 # @ stub EventAccessQuery
 # @ stub EventAccessRemove
@@ -309,7 +309,7 @@
 # @ stub FreeEncryptedFileMetadata
 # @ stub FreeEncryptionCertificateHashList
 # @ stub FreeInheritedFromArray
-@ stdcall FreeSid(ptr)
+@ stdcall -import FreeSid(ptr)
 # @ stub GetAccessPermissionsForObjectA
 # @ stub GetAccessPermissionsForObjectW
 @ stdcall GetAce(ptr long ptr)
@@ -332,7 +332,7 @@
 # @ stub GetInheritanceSourceA
 # @ stub GetInheritanceSourceW
 @ stdcall GetKernelObjectSecurity(long long ptr long ptr)
-@ stdcall GetLengthSid(ptr)
+@ stdcall -import GetLengthSid(ptr)
 # @ stub GetLocalManagedApplicationData
 # @ stub GetLocalManagedApplications
 # @ stub GetManagedApplicationCategories
@@ -364,10 +364,10 @@
 @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr)
 @ stdcall GetServiceKeyNameA(long str ptr ptr)
 @ stdcall GetServiceKeyNameW(long wstr ptr ptr)
-@ stdcall GetSidIdentifierAuthority(ptr)
-@ stdcall GetSidLengthRequired(long)
-@ stdcall GetSidSubAuthority(ptr long)
-@ stdcall GetSidSubAuthorityCount(ptr)
+@ stdcall -import GetSidIdentifierAuthority(ptr)
+@ stdcall -import GetSidLengthRequired(long)
+@ stdcall -import GetSidSubAuthority(ptr long)
+@ stdcall -import GetSidSubAuthorityCount(ptr)
 @ stub GetSiteSidFromToken
 # @ stub GetStringConditionFromBinary
 # @ stub GetThreadWaitChain
@@ -383,7 +383,7 @@
 @ stdcall GetTrusteeTypeW(ptr)
 @ stdcall GetUserNameA(ptr ptr)
 @ stdcall GetUserNameW(ptr ptr)
-@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr)
+@ stdcall -import GetWindowsAccountDomainSid(ptr ptr ptr)
 # @ stub I_QueryTagInformation
 # @ stub I_ScGetCurrentGroupStateW
 # @ stub I_ScIsSecurityProcess
@@ -404,7 +404,7 @@
 @ stdcall ImpersonateSelf(long)
 @ stdcall InitializeAcl(ptr long long)
 @ stdcall InitializeSecurityDescriptor(ptr long)
-@ stdcall InitializeSid(ptr ptr long)
+@ stdcall -import InitializeSid(ptr ptr long)
 @ stdcall InitiateShutdownA(str str long long long)
 @ stdcall InitiateShutdownW(wstr wstr long long long)
 @ stdcall InitiateSystemShutdownA(str str long long long)
@@ -419,8 +419,8 @@
 @ stdcall IsValidAcl(ptr)
 # @ stub IsValidRelativeSecurityDescriptor
 @ stdcall IsValidSecurityDescriptor(ptr)
-@ stdcall IsValidSid(ptr)
-@ stdcall IsWellKnownSid(ptr long)
+@ stdcall -import IsValidSid(ptr)
+@ stdcall -import IsWellKnownSid(ptr long)
 @ stdcall LockServiceDatabase(ptr)
 @ stdcall LogonUserA(str str str long long ptr)
 # @ stub LogonUserExA

dlls/kernelbase/Makefile.in

@@ -7,5 +7,6 @@ C_SRCS = \
 	main.c \
 	path.c \
 	registry.c \
+	security.c \
 	string.c \
 	version.c

dlls/kernelbase/kernelbase.spec

@@ -30,8 +30,8 @@
 @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups
 @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges
 @ stdcall AllocConsole() kernel32.AllocConsole
-@ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid
-@ stdcall AllocateLocallyUniqueId(ptr) advapi32.AllocateLocallyUniqueId
+@ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr)
+@ stdcall AllocateLocallyUniqueId(ptr)
 @ stdcall AllocateUserPhysicalPages(long ptr ptr) kernel32.AllocateUserPhysicalPages
 # @ stub AllocateUserPhysicalPagesNuma
 # @ stub AppContainerDeriveSidFromMoniker
@@ -169,7 +169,7 @@
 @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW
 @ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW
 # @ stub -arch=x86_64 CopyMemoryNonTemporal
-@ stdcall CopySid(long ptr ptr) advapi32.CopySid
+@ stdcall CopySid(long ptr ptr)
 # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage
 @ stdcall CreateActCtxW(ptr) kernel32.CreateActCtxW
 # @ stub CreateAppContainerToken
@@ -233,7 +233,7 @@
 @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) kernel32.CreateTimerQueueTimer
 @ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW
 @ stdcall CreateWaitableTimerW(ptr long wstr) kernel32.CreateWaitableTimerW
-@ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid
+@ stdcall CreateWellKnownSid(long ptr ptr ptr)
 # @ stub CtrlRoutine
 # @ stub CveEventWrite
 @ stdcall DeactivateActCtx(long long) kernel32.DeactivateActCtx
@@ -324,8 +324,8 @@
 # @ stub EnumerateStateAtomValues
 # @ stub EnumerateStateContainerItems
 @ stub EqualDomainSid
-@ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid
-@ stdcall EqualSid(ptr ptr) advapi32.EqualSid
+@ stdcall EqualPrefixSid(ptr ptr)
+@ stdcall EqualSid(ptr ptr)
 @ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction
 @ stdcall EventActivityIdControl(long ptr) ntdll.EtwEventActivityIdControl
 @ stdcall EventEnabled(int64 ptr) ntdll.EtwEventEnabled
@@ -398,7 +398,7 @@
 @ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread
 @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) kernel32.FreeLibraryWhenCallbackReturns
 @ stdcall FreeResource(long) kernel32.FreeResource
-@ stdcall FreeSid(ptr) advapi32.FreeSid
+@ stdcall FreeSid(ptr)
 @ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages
 @ stdcall GenerateConsoleCtrlEvent(long long) kernel32.GenerateConsoleCtrlEvent
 # @ stub GenerateGPNotificationInternal
@@ -539,7 +539,7 @@
 @ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum
 @ stdcall GetLargestConsoleWindowSize(long) kernel32.GetLargestConsoleWindowSize
 @ stdcall GetLastError() kernel32.GetLastError
-@ stdcall GetLengthSid(ptr) advapi32.GetLengthSid
+@ stdcall GetLengthSid(ptr)
 @ stdcall GetLocalTime(ptr) kernel32.GetLocalTime
 @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA
 @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx
@@ -659,10 +659,10 @@
 # @ stub GetSerializedAtomBytes
 # @ stub GetSharedLocalFolder
 @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW
-@ stdcall GetSidIdentifierAuthority(ptr) advapi32.GetSidIdentifierAuthority
-@ stdcall GetSidLengthRequired(long) advapi32.GetSidLengthRequired
-@ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority
-@ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
+@ stdcall GetSidIdentifierAuthority(ptr)
+@ stdcall GetSidLengthRequired(long)
+@ stdcall GetSidSubAuthority(ptr long)
+@ stdcall GetSidSubAuthorityCount(ptr)
 # @ stub GetStagedPackageOrigin
 # @ stub GetStagedPackagePathByFullName
 @ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW
@@ -759,7 +759,7 @@
 @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW
 @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW
 @ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) kernel32.GetVolumePathNamesForVolumeNameW
-@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid
+@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr)
 @ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA
 @ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW
 @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch
@@ -810,7 +810,7 @@
 @ stdcall InitializeSListHead(ptr) kernel32.InitializeSListHead
 @ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock
 @ stdcall InitializeSecurityDescriptor(ptr long) advapi32.InitializeSecurityDescriptor
-@ stdcall InitializeSid(ptr ptr long) advapi32.InitializeSid
+@ stdcall InitializeSid(ptr ptr long)
 # @ stub InitializeSynchronizationBarrier
 # @ stub InstallELAMCertificateInfo
 @ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange
@@ -882,8 +882,8 @@
 # @ stub IsValidNLSVersion
 @ stub IsValidRelativeSecurityDescriptor
 @ stdcall IsValidSecurityDescriptor(ptr) advapi32.IsValidSecurityDescriptor
-@ stdcall IsValidSid(ptr) advapi32.IsValidSid
-@ stdcall IsWellKnownSid(ptr long) advapi32.IsWellKnownSid
+@ stdcall IsValidSid(ptr)
+@ stdcall IsWellKnownSid(ptr long)
 @ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process
 # @ stub IsWow64Process2
 @ stdcall K32EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet