Fixed return value of CDROM_GetLabel if CDROM_Open failed (e.g. no Device entry for drive in wine.conf).
diff --git a/files/dos_fs.c b/files/dos_fs.c index 95add12..a11dab2 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c
@@ -1305,6 +1305,8 @@ DOSFS_ToDosDTAFormat( DRIVE_GetLabel( info->drive ), entry->cFileName ); strcpy( entry->cAlternateFileName, entry->cFileName ); info->cur_pos++; + TRACE("returning %s (%s) as label\n", + entry->cFileName, entry->cAlternateFileName); return 1; }
diff --git a/misc/cdrom.c b/misc/cdrom.c index 14a2ffe..343a6cc 100644 --- a/misc/cdrom.c +++ b/misc/cdrom.c
@@ -780,6 +780,9 @@ p, label); CDROM_Close(&wcda); } + else + res = 0; + return res; }