Revert previous patch.

	* autoload.cc (GetVolumePathNamesForVolumeNameA): Remove.
	* autoload.cc (GetVolumeNameForVolumeMountPointA): Add.
	* syscalls.cc (sync): Rewrite guid case to skip floppies also on
	Windows 2000.

1 files changed, 12 insertions, 12 deletions

diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index bec5278b2..9a790b087 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -57,7 +57,7 @@ static NO_COPY wincaps wincap_unknown = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_95 = {
@@ -106,7 +106,7 @@ static NO_COPY wincaps wincap_95 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_95osr2 = {
@@ -155,7 +155,7 @@ static NO_COPY wincaps wincap_95osr2 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_98 = {
@@ -204,7 +204,7 @@ static NO_COPY wincaps wincap_98 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_98se = {
@@ -253,7 +253,7 @@ static NO_COPY wincaps wincap_98se = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_me = {
@@ -302,7 +302,7 @@ static NO_COPY wincaps wincap_me = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_nt3 = {
@@ -351,7 +351,7 @@ static NO_COPY wincaps wincap_nt3 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_nt4 = {
@@ -400,7 +400,7 @@ static NO_COPY wincaps wincap_nt4 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_nt4sp4 = {
@@ -449,7 +449,7 @@ static NO_COPY wincaps wincap_nt4sp4 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_get_volume_pathnames:false
+  has_guid_volumes:false
 };
 
 static NO_COPY wincaps wincap_2000 = {
@@ -498,7 +498,7 @@ static NO_COPY wincaps wincap_2000 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_get_volume_pathnames:false
+  has_guid_volumes:true
 };
 
 static NO_COPY wincaps wincap_xp = {
@@ -547,7 +547,7 @@ static NO_COPY wincaps wincap_xp = {
   has_ioctl_storage_get_media_types_ex:true,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_get_volume_pathnames:true
+  has_guid_volumes:true
 };
 
 static NO_COPY wincaps wincap_2003 = {
@@ -596,7 +596,7 @@ static NO_COPY wincaps wincap_2003 = {
   has_ioctl_storage_get_media_types_ex:true,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_get_volume_pathnames:true
+  has_guid_volumes:true
 };
 
 wincapc wincap;