msi: Don't check for the media or cabinet if the cabinet is internal.

This commit is contained in:
James Hawkins 2007-11-28 14:56:53 -06:00 committed by Alexandre Julliard
parent 32d3ffc5c5
commit 33a4fe19de
1 changed files with 4 additions and 1 deletions

View File

@ -617,6 +617,10 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m
return ERROR_FUNCTION_FAILED; return ERROR_FUNCTION_FAILED;
} }
/* cabinet is internal, no checks needed */
if (!mi->cabinet || mi->cabinet[0] == '#')
return ERROR_SUCCESS;
/* package should be downloaded */ /* package should be downloaded */
if (file->IsCompressed && if (file->IsCompressed &&
GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES &&
@ -647,7 +651,6 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m
} }
if (file->IsCompressed && if (file->IsCompressed &&
mi->cabinet && mi->cabinet[0] != '#' &&
GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES)
{ {
ERR("Cabinet not found: %s\n", debugstr_w(mi->source)); ERR("Cabinet not found: %s\n", debugstr_w(mi->source));