system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 18:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

winecfg: Allow and prefer using A: and B: for floppies.

Browse source 
Pass drive type to allocate_letter().  Start search from 'A' for
floppies.
Fix missing parentheses in the DRIVE_MASK_BIT definition.  It's a bug
that is triggered by non-sequential drive allocation.
This commit is contained in:
Pavel Roskin 2006-06-09 22:33:42 -04:00 committed by Alexandre Julliard
parent 42dd4653e3
commit 34d9d5a346
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
programs/winecfg/drivedetect.c
View file

@ -113,11 +113,16 @@ static BOOL is_drive_defined(char *path)
}
/* returns Z + 1 if there are no more available letters */
static char allocate_letter(void)
static char allocate_letter(int type)
{
char letter;
char letter, start;
for (letter = 'C'; letter <= 'Z'; letter++)
if (type == DRIVE_REMOVABLE)
start = 'A';
else
start = 'C';
for (letter = start; letter <= 'Z'; letter++)
if ((DRIVE_MASK_BIT(letter) & working_mask) != 0) break;
return letter;
@ -303,8 +308,17 @@ int autodetect_drives()
if (should_ignore_mnt_dir(ent->mnt_dir)) continue;
if (is_drive_defined(ent->mnt_dir)) continue;
if (!strcmp(ent->mnt_type, "nfs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "nfs4")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "smbfs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "cifs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "coda")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "iso9660")) type = DRIVE_CDROM;
else if (!strcmp(ent->mnt_type, "ramfs")) type = DRIVE_RAMDISK;
else type = try_dev_node(ent->mnt_fsname);
/* allocate a drive for it */
letter = allocate_letter();
letter = allocate_letter(type);
if (letter == ']')
{
report_error(NO_MORE_LETTERS);
@ -317,15 +331,6 @@ int autodetect_drives()
WINE_TRACE("adding drive %c for %s, type %s with label %s\n", letter, ent->mnt_dir, ent->mnt_type,label);
if (!strcmp(ent->mnt_type, "nfs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "nfs4")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "smbfs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "cifs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "coda")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "iso9660")) type = DRIVE_CDROM;
else if (!strcmp(ent->mnt_type, "ramfs")) type = DRIVE_RAMDISK;
else type = try_dev_node(ent->mnt_fsname);
add_drive(letter, ent->mnt_dir, label, "0", type);
/* working_mask is a map of the drive letters still available. */

2
programs/winecfg/winecfg.h
View file

@ -95,7 +95,7 @@ struct drive
BOOL in_use;
};
#define DRIVE_MASK_BIT(B) 1 << (toupper(B) - 'A')
#define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A'))
long drive_available_mask(char letter);
BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type);