Reimplemented GetVolumeInformation and SetVolumeLabel; volume label

dlls/kernel/Makefile.in

@@ -75,6 +75,7 @@ C_SRCS = \
 	utthunk.c \
 	version.c \
 	virtual.c \
+	volume.c \
 	vxd.c \
 	win87em.c \
 	windebug.c \

dlls/ntdll/file.c

@@ -227,7 +227,7 @@ static DWORD FILE_GetNtStatus(void)
     case EINVAL:
     case ENOTEMPTY:    nt = STATUS_DIRECTORY_NOT_EMPTY;     break;
     case EPIPE:        nt = STATUS_PIPE_BROKEN;             break;
-    case EIO:          nt = STATUS_DISK_CORRUPT_ERROR;      break;
+    case EIO:          nt = STATUS_DEVICE_NOT_READY;        break;
     case ENOEXEC:      /* ?? */
     case ESPIPE:       /* ?? */
     case EEXIST:       /* ?? */

documentation/samples/config

@@ -11,8 +11,6 @@ WINE REGISTRY Version 2
 ;; [Drive X]
 ;; "Path"="xxx"       (Unix path for drive root)
 ;; "Type"="xxx"       (supported types are 'floppy', 'hd', 'cdrom' and 'network')
-;; "Label"="xxx"      (drive label, at most 11 characters)
-;; "Serial"="xxx"     (serial number, 8 characters hexadecimal number)
 ;; "Filesystem"="xxx" (supported types are 'msdos'/'dos'/'fat', 'win95'/'vfat', 'unix')
 ;;   This is the FS Wine is supposed to emulate on a certain
 ;;   directory structure.
@@ -25,21 +23,17 @@ WINE REGISTRY Version 2
 [Drive A]
 "Path" = "/mnt/fd0"
 "Type" = "floppy"
-"Label" = "Floppy"
 "Filesystem" = "win95"
-"Serial" = "87654321"
 "Device" = "/dev/fd0"
 
 [Drive C]
 "Path" = "/c"
 "Type" = "hd"
-"Label" = "MS-DOS"
 "Filesystem" = "win95"
 
 [Drive D]
 "Path" = "/cdrom"
 "Type" = "cdrom"
-"Label" = "CD-Rom"
 "Filesystem" = "win95"
 ; make sure that device is correct and has proper permissions !
 "Device" = "/dev/cdrom"
@@ -47,19 +41,16 @@ WINE REGISTRY Version 2
 [Drive E]
 "Path" = "/tmp"
 "Type" = "hd"
-"Label" = "Tmp Drive"
 "Filesystem" = "win95"
 
 [Drive F]
 "Path" = "%HOME%"
 "Type" = "network"
-"Label" = "Home"
 "Filesystem" = "win95"
 
 [Drive Z]
 "Path" = "/"
 "Type" = "hd"
-"Label" = "Root"
 "Filesystem" = "win95"
 
 [wine]

documentation/wine.conf.man

@@ -60,19 +60,6 @@ Used to specify the drive type this drive appears as in Windows
 or DOS programs; supported types are "floppy", "hd", "cdrom"
 and "network".
 .PP
-.I format: """Label""=""<label>"""
-.br
-default: "Drive X"
-.br
-Used to specify the drive label; limited to 11 characters.
-.PP
-.I format: """Serial""=""<serial>"""
-.br
-default: "12345678"
-.br
-Used to specify the drive serial number, as an 8-character hexadecimal
-number.
-.PP
 .I format: """Filesystem""=""<fstype>"""
 .br
 default: "win95"

include/drive.h

@@ -32,7 +32,6 @@
 #define DRIVE_CASE_SENSITIVE  0x0004  /* Drive fs is case sensitive */
 #define DRIVE_CASE_PRESERVING 0x0008  /* Drive fs is case preserving */
 #define DRIVE_FAIL_READ_ONLY  0x0010  /* Fail opening read-only files for writing */
-#define DRIVE_READ_VOL_INFO   0x0020  /* Try to read volume info from the device? */
 
 extern int DRIVE_Init(void);
 extern int DRIVE_IsValid( int drive );
@@ -44,13 +43,8 @@ extern const char * DRIVE_GetRoot( int drive );
 extern LPCWSTR DRIVE_GetDosCwd( int drive );
 extern const char * DRIVE_GetUnixCwd( int drive );
 extern const char * DRIVE_GetDevice( int drive );
-extern LPCWSTR DRIVE_GetLabel( int drive );
-extern DWORD DRIVE_GetSerialNumber( int drive );
-extern int DRIVE_SetSerialNumber( int drive, DWORD serial );
 extern UINT DRIVE_GetFlags( int drive );
 extern int DRIVE_Chdir( int drive, LPCWSTR path );
-extern int DRIVE_Disable( int drive  );
-extern int DRIVE_Enable( int drive  );
 extern WCHAR *DRIVE_BuildEnv(void);
 
 #endif  /* __WINE_DRIVE_H */

include/winnt.h

@@ -3305,6 +3305,10 @@ typedef enum tagSID_NAME_USE {
 #define FILE_PERSISTENT_ACLS            0x00000008
 #define FILE_FILE_COMPRESSION           0x00000010
 #define FILE_VOLUME_IS_COMPRESSED       0x00008000
+#define FILE_SUPPORTS_OBJECT_IDS        0x00010000
+#define FILE_SUPPORTS_ENCRYPTION        0x00020000
+#define FILE_NAMED_STREAMS              0x00040000
+#define FILE_READ_ONLY_VOLUME           0x00080000
 
 /* File alignments (NT) */
 #define	FILE_BYTE_ALIGNMENT		0x00000000