ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a couple of bugs in CDROM_GetSerial: 

- it would fail if DeviceIoControl succeeded.
 - it would leak handles in some cases.
This commit is contained in:
Mike McCormack 2003-07-21 20:02:23 +00:00 committed by Alexandre Julliard
parent ec0d425278
commit 5ef127a000
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
files/drive.c
View File

@ -861,12 +861,18 @@ failure:
*/ */
static DWORD CDROM_GetLabel(int drive, WCHAR *label) static DWORD CDROM_GetLabel(int drive, WCHAR *label)
{ {
HANDLE h = CDROM_Open(drive); HANDLE h;
CDROM_DISK_DATA cdd; CDROM_DISK_DATA cdd;
DWORD br; DWORD br, ret = 1;
DWORD 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; return 0;
switch (cdd.DiskData & 0x03) switch (cdd.DiskData & 0x03)
@ -1032,12 +1038,23 @@ static DWORD CDROM_Data_GetSerial(int drive)
static DWORD CDROM_GetSerial(int drive) static DWORD CDROM_GetSerial(int drive)
{ {
DWORD serial = 0; DWORD serial = 0;
HANDLE h = CDROM_Open(drive); HANDLE h;
CDROM_DISK_DATA cdd; CDROM_DISK_DATA cdd;
DWORD br; DWORD br;
BOOL r;
if (!h || ! !DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL, 0, &cdd, sizeof(cdd), &br, 0)) TRACE("%d\n", drive);
h = CDROM_Open(drive);
if( !h )
return 0; 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) switch (cdd.DiskData & 0x03)
{ {