Alex Henrie : ntdll: Return an error from CDROM_Open if fstat fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fab5ee65b6354944bdb45001839b0cd0ba1115be
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fab5ee65b6354944bdb4500183...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Tue Dec 29 22:37:59 2015 -0700

ntdll: Return an error from CDROM_Open if fstat fails.

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/cdrom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index ee2a743..ee36045 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -667,7 +667,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev)
     NTSTATUS ret = STATUS_SUCCESS;
     int         empty = -1;
 
-    fstat(fd, &st);
+    if (fstat(fd, &st) == -1) return FILE_GetNtStatus();
 
     RtlEnterCriticalSection( &cache_section );
     for (*dev = 0; *dev < MAX_CACHE_ENTRIES; (*dev)++)
@@ -2834,7 +2834,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice,
 {
     DWORD       sz = 0;
     NTSTATUS    status = STATUS_SUCCESS;
-    int fd, needs_close, dev;
+    int fd, needs_close, dev = 0;
 
     TRACE("%p %s %p %d %p %d %p\n",
           hDevice, iocodex(dwIoControlCode), lpInBuffer, nInBufferSize,