kernel32: Move volume functions to kernelbase.

dlls/kernel32/kernel32.spec

@@ -355,7 +355,7 @@
 @ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer
 @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer
 @ stdcall DefineDosDeviceA(long str str)
-@ stdcall DefineDosDeviceW(long wstr wstr)
+@ stdcall -import DefineDosDeviceW(long wstr wstr)
 @ stdcall -import DelayLoadFailureHook(str str)
 @ stdcall DeleteAtom(long)
 # @ stub DeleteBoundaryDescriptor
@@ -374,7 +374,7 @@
 @ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr)
 @ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr)
 @ stdcall DeleteVolumeMountPointA(str)
-@ stdcall DeleteVolumeMountPointW(wstr)
+@ stdcall -import DeleteVolumeMountPointW(wstr)
 @ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr)
 @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr)
 @ stdcall -import DisableThreadLibraryCalls(long)
@@ -492,7 +492,7 @@
 @ stdcall FindFirstVolumeA(ptr long)
 @ stdcall FindFirstVolumeMountPointA(str ptr long)
 @ stdcall FindFirstVolumeMountPointW(wstr ptr long)
-@ stdcall FindFirstVolumeW(ptr long)
+@ stdcall -import FindFirstVolumeW(ptr long)
 @ stdcall -import FindNextChangeNotification(long)
 @ stdcall -import FindNextFileA(long ptr)
 # @ stub FindNextFileNameW
@@ -501,7 +501,7 @@
 @ stdcall FindNextVolumeA(long ptr long)
 @ stub FindNextVolumeMountPointA
 @ stub FindNextVolumeMountPointW
-@ stdcall FindNextVolumeW(long ptr long)
+@ stdcall -import FindNextVolumeW(long ptr long)
 @ stdcall -import FindNLSString(long long wstr long wstr long ptr)
 @ stdcall -import FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long)
 @ stdcall FindResourceA(long str str)
@@ -509,7 +509,7 @@
 @ stdcall -import FindResourceExW(long wstr wstr long)
 @ stdcall -import FindResourceW(long wstr wstr)
 @ stdcall -import FindStringOrdinal(long wstr long wstr long long)
-@ stdcall FindVolumeClose(ptr)
+@ stdcall -import FindVolumeClose(ptr)
 @ stdcall FindVolumeMountPointClose(ptr)
 @ stdcall -import FlsAlloc(ptr)
 @ stdcall -import FlsFree(long)
@@ -645,14 +645,14 @@
 @ stdcall GetDefaultCommConfigW(wstr ptr ptr)
 @ stub GetDefaultSortkeySize
 @ stdcall GetDevicePowerState(long ptr)
-@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr)
-@ stdcall GetDiskFreeSpaceExA (str ptr ptr ptr)
-@ stdcall GetDiskFreeSpaceExW (wstr ptr ptr ptr)
-@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr)
+@ stdcall -import GetDiskFreeSpaceA(str ptr ptr ptr ptr)
+@ stdcall -import GetDiskFreeSpaceExA (str ptr ptr ptr)
+@ stdcall -import GetDiskFreeSpaceExW (wstr ptr ptr ptr)
+@ stdcall -import GetDiskFreeSpaceW(wstr ptr ptr ptr ptr)
 @ stdcall GetDllDirectoryA(long ptr)
 @ stdcall GetDllDirectoryW(long ptr)
-@ stdcall GetDriveTypeA(str)
-@ stdcall GetDriveTypeW(wstr)
+@ stdcall -import GetDriveTypeA(str)
+@ stdcall -import GetDriveTypeW(wstr)
 # @ stub GetDurationFormat
 # @ stub GetDurationFormatEx
 @ stdcall -import GetDynamicTimeZoneInformation(ptr)
@@ -707,8 +707,8 @@
 @ stdcall -import GetLocaleInfoW(long long ptr long)
 @ stdcall -import GetLocaleInfoEx(wstr long ptr long)
 @ stdcall GetLogicalDriveStringsA(long ptr)
-@ stdcall GetLogicalDriveStringsW(long ptr)
-@ stdcall GetLogicalDrives()
+@ stdcall -import GetLogicalDriveStringsW(long ptr)
+@ stdcall -import GetLogicalDrives()
 @ stdcall -import GetLogicalProcessorInformation(ptr ptr)
 @ stdcall -import GetLogicalProcessorInformationEx(long ptr ptr)
 @ stdcall -import GetLongPathNameA(str ptr long)
@@ -880,15 +880,15 @@
 @ stdcall -import GetVersion()
 @ stdcall -import GetVersionExA(ptr)
 @ stdcall -import GetVersionExW(ptr)
-@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long)
-@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long)
-@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long)
+@ stdcall -import GetVolumeInformationA(str ptr long ptr ptr ptr ptr long)
+@ stdcall -import GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long)
+@ stdcall -import GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long)
 @ stdcall GetVolumeNameForVolumeMountPointA(str ptr long)
-@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long)
+@ stdcall -import GetVolumeNameForVolumeMountPointW(wstr ptr long)
 @ stdcall GetVolumePathNameA(str ptr long)
-@ stdcall GetVolumePathNameW(wstr ptr long)
+@ stdcall -import GetVolumePathNameW(wstr ptr long)
 @ stdcall GetVolumePathNamesForVolumeNameA(str ptr long ptr)
-@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr)
+@ stdcall -import GetVolumePathNamesForVolumeNameW(wstr ptr long ptr)
 @ stdcall -import GetWindowsDirectoryA(ptr long)
 @ stdcall -import GetWindowsDirectoryW(ptr long)
 @ stdcall -import GetWriteWatch(long ptr long ptr ptr ptr)
@@ -1164,7 +1164,7 @@
 @ stdcall -import QueryActCtxW(long ptr ptr long ptr long ptr)
 @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList
 @ stdcall QueryDosDeviceA(str ptr long)
-@ stdcall QueryDosDeviceW(wstr ptr long)
+@ stdcall -import QueryDosDeviceW(wstr ptr long)
 @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr)
 @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr)
 # @ stub QueryIdleProcessorCycleTime

dlls/kernelbase/Makefile.in

@@ -20,6 +20,7 @@ C_SRCS = \
 	string.c \
 	sync.c \
 	thread.c \
-	version.c
+	version.c \
+	volume.c
 
 RC_SRCS = kernelbase.rc

dlls/kernelbase/kernelbase.spec

@@ -243,7 +243,7 @@
 @ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer
 # @ stub DecodeRemotePointer
 @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer
-@ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW
+@ stdcall DefineDosDeviceW(long wstr wstr)
 @ stdcall DelayLoadFailureHook(str str)
 # @ stub DelayLoadFailureHookLookup
 @ stdcall DeleteAce(ptr long)
@@ -259,7 +259,7 @@
 # @ stub DeleteSynchronizationBarrier
 @ stdcall DeleteTimerQueueEx(long long)
 @ stdcall DeleteTimerQueueTimer(long long long)
-@ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW
+@ stdcall DeleteVolumeMountPointW(wstr)
 @ stdcall DestroyPrivateObjectSecurity(ptr)
 @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr)
 @ stdcall DisablePredefinedHandleTableInternal(long)
@@ -361,7 +361,7 @@
 @ stdcall FindFirstFileW(wstr ptr)
 @ stdcall FindFirstFreeAce(ptr ptr)
 @ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW
-@ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW
+@ stdcall FindFirstVolumeW(ptr long)
 @ stdcall FindNLSString(long long wstr long wstr long ptr)
 @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long)
 @ stdcall FindNextChangeNotification(long)
@@ -369,12 +369,12 @@
 # @ stub FindNextFileNameW
 @ stdcall FindNextFileW(long ptr)
 @ stdcall FindNextStreamW(long ptr) kernel32.FindNextStreamW
-@ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW
+@ stdcall FindNextVolumeW(long ptr long)
 # @ stub FindPackagesByPackageFamily
 @ stdcall FindResourceExW(long wstr wstr long)
 @ stdcall FindResourceW(long wstr wstr)
 @ stdcall FindStringOrdinal(long wstr long wstr long long)
-@ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose
+@ stdcall FindVolumeClose(ptr)
 @ stdcall FlsAlloc(ptr)
 @ stdcall FlsFree(long)
 @ stdcall FlsGetValue(long)
@@ -479,12 +479,12 @@
 # @ stub GetDeviceDriverBaseNameW
 # @ stub GetDeviceDriverFileNameA
 # @ stub GetDeviceDriverFileNameW
-@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceA
-@ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA
-@ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW
-@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceW
-@ stdcall GetDriveTypeA(str) kernel32.GetDriveTypeA
-@ stdcall GetDriveTypeW(wstr) kernel32.GetDriveTypeW
+@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr)
+@ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr)
+@ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr)
+@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr)
+@ stdcall GetDriveTypeA(str)
+@ stdcall GetDriveTypeW(wstr)
 # @ stub GetDurationFormatEx
 @ stdcall GetDynamicTimeZoneInformation(ptr)
 @ stdcall GetDynamicTimeZoneInformationEffectiveYears(ptr ptr ptr)
@@ -545,8 +545,8 @@
 @ stdcall GetLocaleInfoEx(wstr long ptr long)
 @ stub GetLocaleInfoHelper
 @ stdcall GetLocaleInfoW(long long ptr long)
-@ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW
-@ stdcall GetLogicalDrives() kernel32.GetLogicalDrives
+@ stdcall GetLogicalDriveStringsW(long ptr)
+@ stdcall GetLogicalDrives()
 @ stdcall GetLogicalProcessorInformation(ptr ptr)
 @ stdcall GetLogicalProcessorInformationEx(long ptr ptr)
 @ stdcall GetLongPathNameA(str ptr long)
@@ -752,12 +752,12 @@
 @ stdcall GetVersion()
 @ stdcall GetVersionExA(ptr)
 @ stdcall GetVersionExW(ptr)
-@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA
-@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW
-@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW
-@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW
-@ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW
-@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) kernel32.GetVolumePathNamesForVolumeNameW
+@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long)
+@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long)
+@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long)
+@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long)
+@ stdcall GetVolumePathNameW(wstr ptr long)
+@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr)
 @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr)
 @ stdcall GetWindowsDirectoryA(ptr long)
 @ stdcall GetWindowsDirectoryW(ptr long)
@@ -1194,7 +1194,7 @@
 @ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr)
 @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr)
 @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList
-@ stdcall QueryDosDeviceW(wstr ptr long) kernel32.QueryDosDeviceW
+@ stdcall QueryDosDeviceW(wstr ptr long)
 @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA
 @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) kernel32.QueryFullProcessImageNameW
 # @ stub QueryIdleProcessorCycleTime