2003-04-26 Danny Smith <dannysmith@users.sourceforge.net>

	* include/winioctl.h: Clean up formatting.
	(RETRIEVAL_POINTERS_BUFFER): Add fields to Extents[1] struct.
	(CREATE_DISK): Add _ANONYMOUS_UNION macro.
	(DISK_CACHE_INFORMATION): Likewise.
	(DISK_DETECTION_INFO): Likewise.
	(DISK_PARTITION_INFO): Likewise.
	(PARTITION_INFORMATION_EX): Likewise.
	(DRIVE_LAYOUT_INFORMATION_EX): Likewise.

2003-04-26  Casper S. Hornstrup  <chorns@users.sourceforge.net>

	* include/winbase.h (DeleteVolumeMountPoint[AW],
	FindFirstVolumeMountPoint[AW], FindNextVolumeMountPoint[AW],
	FindVolumeMountPointClose, GetVolumeNameForVolumeMountPoint[AW],
	GetVolumePathName[AW], GetVolumePathNamesForVolumeName[AW],
	SetVolumeMountPoint[AW]): Add prototypes.
	* include/winioctl.h (IOCTL_DISK_GET_PARTITION_INFO_EX,
	IOCTL_DISK_SET_PARTITION_INFO_EX,
	IOCTL_DISK_GET_DRIVE_LAYOUT_EX,
	IOCTL_DISK_SET_DRIVE_LAYOUT_EX, IOCTL_DISK_CREATE_DISK,
	IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_PERFORMANCE_OFF,
	IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GROW_PARTITION,
	IOCTL_DISK_GET_CACHE_INFORMATION,
	IOCTL_DISK_SET_CACHE_INFORMATION,
	IOCTL_DISK_DELETE_DRIVE_LAYOUT, IOCTL_DISK_UPDATE_PROPERTIES,
	FSCTL_GET_VOLUME_BITMAP, FSCTL_GET_RETRIEVAL_POINTERS,
	FSCTL_MOVE_FILE): Define.
	(CREATE_DISK_GPT, CREATE_DISK_MBR, CREATE_DISK,
	DISK_CACHE_INFORMATION,
	DETECTION_TYPE, DISK_INT13_INFO, DISK_EX_INT13_INFO,
	DISK_DETECTION_INFO, DISK_GEOMETRY_EX, DISK_GROW_PARTITION,
	DISK_PARTITION_INFO, DISKQUOTA_USER_INFORMATION,
	GET_LENGTH_INFORMATION, DISK_EXTENT, VOLUME_DISK_EXTENTS,
	DRIVE_LAYOUT_INFORMATION_GPT, DRIVE_LAYOUT_INFORMATION_MBR,
	PARTITION_INFORMATION_MBR, PARTITION_INFORMATION_GPT,
	PARTITION_INFORMATION_EX, DRIVE_LAYOUT_INFORMATION_EX,
	MOVE_FILE_DATA,
	RETRIEVAL_POINTERS_BUFFER, STARTING_LCN_INPUT_BUFFER,
	STARTING_VCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER): Add structs
	(PARTITION_STYLE, DISK_CACHE_RETENTION_PRIORITY): Add enums.
	(MEDIA_TYPE): Add F3_120M_512, F3_640_512, F5_640_512,
	F5_720_512,
	F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, F3_128Mb_512,
	F3_230Mb_512,
	F8_256_128, F3_200Mb_512, F3_240M_512, and F3_32M_512.
	* lib/kernel32.def (GetVolumePathNamesForVolumeName[AW]): Add
	stubs.

1 files changed, 39 insertions, 0 deletions

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 483800f35..141c8f1b8 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1070,6 +1070,10 @@ void WINAPI DeleteCriticalSection(PCRITICAL_SECTION);
 void WINAPI DeleteFiber(PVOID);
 BOOL WINAPI DeleteFileA(LPCSTR);
 BOOL WINAPI DeleteFileW(LPCWSTR);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI DeleteVolumeMountPointA(LPCSTR);
+BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR);
+#endif
 BOOL WINAPI DeregisterEventSource(HANDLE);
 BOOL WINAPI DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR*);
 BOOL WINAPI DeviceIoControl(HANDLE,DWORD,PVOID,DWORD,PVOID,DWORD,PDWORD,POVERLAPPED);
@@ -1120,6 +1124,8 @@ BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
 #if (_WIN32_WINNT >= 0x0500)
 HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
 HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
+HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
+HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
 #endif
 BOOL WINAPI FindNextChangeNotification(HANDLE);
 BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
@@ -1127,7 +1133,10 @@ BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
 #if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
 BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
+BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
+BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
 BOOL WINAPI FindVolumeClose(HANDLE);
+BOOL WINAPI FindVolumeMountPointClose(HANDLE);
 #endif
 HRSRC WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR);
 HRSRC WINAPI FindResourceW(HINSTANCE,LPCWSTR,LPCWSTR);
@@ -1300,6 +1309,14 @@ BOOL WINAPI GetVersionExA(LPOSVERSIONINFOA);
 BOOL WINAPI GetVersionExW(LPOSVERSIONINFOW);
 BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,PDWORD,PDWORD,PDWORD,LPSTR,DWORD);
 BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD);
+BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD);
+BOOL WINAPI GetVolumePathNameA(LPCSTR,LPSTR,DWORD);
+BOOL WINAPI GetVolumePathNameW(LPCWSTR,LPWSTR,DWORD);
+BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR,LPSTR,DWORD,PDWORD);
+BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD);
+#endif
 UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT);
 UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT);
 DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD);
@@ -1568,6 +1585,10 @@ LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCE
 BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD);
 BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR);
 BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR);
+BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR);
+#endif
 BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,PVOID,BOOL);
 BOOL WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL);
 DWORD WINAPI SizeofResource(HINSTANCE,HRSRC);
@@ -1684,6 +1705,9 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateWaitableTimer CreateWaitableTimerW
 #define DefineDosDevice DefineDosDeviceW
 #define DeleteFile DeleteFileW
+#if (_WIN32_WINNT >= 0x0500)
+#define DeleteVolumeMountPoint DeleteVolumeMountPointW
+#endif
 #define EncryptFile EncryptFileW
 #define EndUpdateResource EndUpdateResourceW
 #define EnumResourceLanguages EnumResourceLanguagesW
@@ -1698,10 +1722,12 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define FindFirstFileEx FindFirstFileExW
 #if (_WIN32_WINNT >= 0x0500)
 #define FindFirstVolume FindFirstVolumeW
+#define FindFirstVolumeMountPoint FindFirstVolumeMountPointW
 #endif
 #define FindNextFile FindNextFileW
 #if (_WIN32_WINNT >= 0x0500)
 #define FindNextVolume FindNextVolumeW
+#define FindNextVolumeMountPoint  FindNextVolumeMountPointW
 #endif
 #define FindResource FindResourceW
 #define FindResourceEx FindResourceExW
@@ -1744,6 +1770,9 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define GetUserName GetUserNameW
 #define GetVersionEx GetVersionExW
 #define GetVolumeInformation GetVolumeInformationW
+#define GetVolumeNameForVolumeMountPoint GetVolumeNameForVolumeMountPointW
+#define GetVolumePathName GetVolumePathNameW
+#define GetVolumePathNamesForVolumeName GetVolumePathNamesForVolumeNameW
 #define GetWindowsDirectory GetWindowsDirectoryW
 #define GlobalAddAtom GlobalAddAtomW
 #define GlobalFindAtom GlobalFindAtomW
@@ -1790,6 +1819,7 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define SetFileAttributes SetFileAttributesW
 #define SetFileSecurity SetFileSecurityW
 #define SetVolumeLabel SetVolumeLabelW
+#define SetVolumeMountPoint SetVolumeMountPointW
 #define UpdateResource UpdateResourceW
 #define VerifyVersionInfo VerifyVersionInfoW
 #define WaitNamedPipe WaitNamedPipeW
@@ -1831,6 +1861,9 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define CreateWaitableTimer CreateWaitableTimerA
 #define DefineDosDevice DefineDosDeviceA
 #define DeleteFile DeleteFileA
+#if (_WIN32_WINNT >= 0x0500)
+#define DeleteVolumeMountPoint DeleteVolumeMountPointA
+#endif
 #define EncryptFile EncryptFileA
 #define EndUpdateResource EndUpdateResourceA
 #define EnumResourceLanguages EnumResourceLanguagesA
@@ -1845,10 +1878,12 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define FindFirstFileEx FindFirstFileExA
 #if (_WIN32_WINNT >= 0x0500)
 #define FindFirstVolume FindFirstVolumeA
+#define FindFirstVolumeMountPoint FindFirstVolumeMountPointA
 #endif
 #define FindNextFile FindNextFileA
 #if (_WIN32_WINNT >= 0x0500)
 #define FindNextVolume FindNextVolumeA
+#define FindNextVolumeMountPoint FindNextVolumeMountPointA
 #endif
 #define FindResource FindResourceA
 #define FindResourceEx FindResourceExA
@@ -1890,6 +1925,9 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define GetUserName GetUserNameA
 #define GetVersionEx GetVersionExA
 #define GetVolumeInformation GetVolumeInformationA
+#define GetVolumeNameForVolumeMountPoint GetVolumeNameForVolumeMountPointA
+#define GetVolumePathName GetVolumePathNameA
+#define GetVolumePathNamesForVolumeName GetVolumePathNamesForVolumeNameA
 #define GetWindowsDirectory GetWindowsDirectoryA
 #define GlobalAddAtom GlobalAddAtomA
 #define GlobalFindAtom GlobalFindAtomA
@@ -1936,6 +1974,7 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
 #define SetFileAttributes SetFileAttributesA
 #define SetFileSecurity SetFileSecurityA
 #define SetVolumeLabel SetVolumeLabelA
+#define SetVolumeMountPoint SetVolumeMountPointA
 #define UpdateResource UpdateResourceA
 #define VerifyVersionInfo VerifyVersionInfoA
 #define WaitNamedPipe WaitNamedPipeA