forked from Mirrors/wine-wine
Fixed return value of CDROM_GetLabel if CDROM_Open failed (e.g. no
Device entry for drive in wine.conf).oldstable
parent
b7392f5c2e
commit
eb0ab1b1ec
|
@ -1305,6 +1305,8 @@ static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATAA *entry )
|
||||||
DOSFS_ToDosDTAFormat( DRIVE_GetLabel( info->drive ), entry->cFileName );
|
DOSFS_ToDosDTAFormat( DRIVE_GetLabel( info->drive ), entry->cFileName );
|
||||||
strcpy( entry->cAlternateFileName, entry->cFileName );
|
strcpy( entry->cAlternateFileName, entry->cFileName );
|
||||||
info->cur_pos++;
|
info->cur_pos++;
|
||||||
|
TRACE("returning %s (%s) as label\n",
|
||||||
|
entry->cFileName, entry->cAlternateFileName);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -780,6 +780,9 @@ DWORD CDROM_GetLabel(int drive, char *label)
|
||||||
p, label);
|
p, label);
|
||||||
CDROM_Close(&wcda);
|
CDROM_Close(&wcda);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
res = 0;
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue