Skip to content

W
wine-cw
Commit 5ef127a0 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Fix a couple of bugs in CDROM_GetSerial:

- it would fail if DeviceIoControl succeeded. - it would leak handles in some cases.
parent ec0d4252
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 6 deletions
files/drive.c
View file @ 5ef127a0
......@@ -861,12 +861,18 @@ failure:
*/
static DWORD CDROM_GetLabel(int drive, WCHAR *label)
{
HANDLE h = CDROM_Open(drive);
HANDLE h;
CDROM_DISK_DATA cdd;
DWORD br;
DWORD ret = 1;
DWORD br, ret = 1;
BOOL r;
if (!h || !DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 0, &cdd, sizeof(cdd), &br, 0))
h = CDROM_Open(drive);
if( !h )
return 0;
r = DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL,
0, &cdd, sizeof(cdd), &br, 0);
CloseHandle( h );
if( !r )
return 0;
switch (cdd.DiskData & 0x03)
......@@ -1032,12 +1038,23 @@ static DWORD CDROM_Data_GetSerial(int drive)
static DWORD CDROM_GetSerial(int drive)
{
DWORD serial = 0;
HANDLE h = CDROM_Open(drive);
HANDLE h;
CDROM_DISK_DATA cdd;
DWORD br;
BOOL r;
TRACE("%d\n", drive);
if (!h || ! !DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 0, &cdd, sizeof(cdd), &br, 0))
h = CDROM_Open(drive);
if( !h )
return 0;
r = DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL,
0, &cdd, sizeof(cdd), &br, 0);
if (!r)
{
CloseHandle(h);
return 0;
}
switch (cdd.DiskData & 0x03)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment