From f8d321c2d637fd93744a60236f8e9a84458aa711 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 13 Jun 2002 21:46:02 +0000 Subject: [PATCH] Don't try to open CDROM device if none was specified. --- dlls/ntdll/cdrom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 54c4b816704..cca195a7f27 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -302,11 +302,13 @@ static int CDROM_Open(HANDLE hDevice, DWORD clientID) if (!cdrom_cache[dev].count) { char root[4]; + const char *device; strcpy(root, "A:\\"); root[0] += dev; if (GetDriveTypeA(root) != DRIVE_CDROM) return -1; - cdrom_cache[dev].fd = open(DRIVE_GetDevice(dev), O_RDONLY|O_NONBLOCK); + if (!(device = DRIVE_GetDevice(dev))) return -1; + cdrom_cache[dev].fd = open(device, O_RDONLY|O_NONBLOCK); if (cdrom_cache[dev].fd == -1) { FIXME("Can't open configured CD-ROM drive at %s (device %s): %s\n", root, DRIVE_GetDevice(dev), strerror(errno));