James Hawkins : msi: Don' t check for the media or cabinet if the cabinet is internal.
Module: wine Branch: master Commit: 33a4fe19de185b273fc85cc316e7d55de280a0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a4fe19de185b273fc85cc316... Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 28 14:56:53 2007 -0600 msi: Don't check for the media or cabinet if the cabinet is internal. --- dlls/msi/files.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 229525e..8d5321c 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -617,6 +617,10 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } + /* cabinet is internal, no checks needed */ + if (!mi->cabinet || mi->cabinet[0] == '#') + return ERROR_SUCCESS; + /* package should be downloaded */ if (file->IsCompressed && 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 && - mi->cabinet && mi->cabinet[0] != '#' && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { ERR("Cabinet not found: %s\n", debugstr_w(mi->source));
participants (1)
-
Alexandre Julliard