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

msi: Always set a value for intype in ready_volume. 

Remove a memory leak.
This commit is contained in:
Robert Shearman 2006-02-22 16:30:54 +00:00 committed by Alexandre Julliard
parent 66c9cbbe0f
commit e664435f50
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msi/files.c
View File

@ -345,7 +345,11 @@ static BOOL check_volume(LPCWSTR path, LPCWSTR want_volume, LPWSTR volume,
UINT type; UINT type;
if (!(path[0] && path[1] == ':')) if (!(path[0] && path[1] == ':'))
{
if (intype)
*intype = DRIVE_NO_ROOT_DIR;
return TRUE; return TRUE;
}
drive[0] = path[0]; drive[0] = path[0];
drive[1] = path[1]; drive[1] = path[1];
@ -355,15 +359,15 @@ static BOOL check_volume(LPCWSTR path, LPCWSTR want_volume, LPWSTR volume,
type = GetDriveTypeW(drive); type = GetDriveTypeW(drive);
TRACE("drive is of type %x\n",type); TRACE("drive is of type %x\n",type);
if (intype)
*intype=type;
if (type == DRIVE_UNKNOWN || type == DRIVE_NO_ROOT_DIR || if (type == DRIVE_UNKNOWN || type == DRIVE_NO_ROOT_DIR ||
type == DRIVE_FIXED || type == DRIVE_RAMDISK) type == DRIVE_FIXED || type == DRIVE_RAMDISK)
return TRUE; return TRUE;
GetVolumeInformationW(drive, name, MAX_PATH, NULL, NULL, NULL, NULL, 0); GetVolumeInformationW(drive, name, MAX_PATH, NULL, NULL, NULL, NULL, 0);
TRACE("Drive contains %s\n", debugstr_w(name)); TRACE("Drive contains %s\n", debugstr_w(name));
volume = strdupW(name);
if (*intype)
*intype=type;
return (strcmpiW(want_volume,name)==0); return (strcmpiW(want_volume,name)==0);
} }