mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 00:13:37 +00:00
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:
parent
ec0d425278
commit
5ef127a000
|
@ -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;
|
||||
|
||||
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;
|
||||
r = DeviceIoControl(h, IOCTL_CDROM_DISK_TYPE, NULL,
|
||||
0, &cdd, sizeof(cdd), &br, 0);
|
||||
if (!r)
|
||||
{
|
||||
CloseHandle(h);
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (cdd.DiskData & 0x03)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue