[PATCH] msi: Recognize remote package URLs when BaseURL is NULL

Anton Romanov theli.ua at gmail.com
Mon Apr 16 11:05:05 CDT 2018


On Mon, Apr 16, 2018 at 1:53 AM, Hans Leidekker <hans at codeweavers.com> wrote:
> On Sun, 2018-04-15 at 18:11 -0700, Anton Romanov wrote:
>> Signed-off-by: Anton Romanov <theli.ua at gmail.com>
>> ---
>>  dlls/msi/media.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/dlls/msi/media.c b/dlls/msi/media.c
>> index 0bb883b34a..f72a411410 100644
>> --- a/dlls/msi/media.c
>> +++ b/dlls/msi/media.c
>> @@ -858,7 +858,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi )
>>
>>          /* package should be downloaded */
>>          if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES &&
>> -            package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL ))
>> +            ((package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) ||
>> +             UrlIsW( cabinet_file, URLIS_URL )))
>>          {
>>              WCHAR temppath[MAX_PATH], *p;
>
> cabinet_file shouldn't be a URL. Where do you see this?
>
Happens with Magic The Gathering Arena installer. Here, I've created a
bug report: https://bugs.winehq.org/show_bug.cgi?id=44993.

0052:trace:msi:msi_get_property returning
L"http://mtga-client.dl.wizards.com/Installers/Windows32/0.1.619.0/Alpha/"
for property L"SourceDir"
0052:trace:msi:msi_load_media_info sequence 1 -> cabinet
L"MainFeature.cab" disk id 1
0052:trace:msi:MsiSourceListGetInfoW
L"{A3986629-136A-4D05-B351-44A5C081C110}" L"LastUsedType"
0052:trace:msi:MSIREG_OpenProductKey
L"{A3986629-136A-4D05-B351-44A5C081C110}" squashed
L"9266893AA63150D43B15445A0C181C01"
0052:err:msi:ready_media cabinet not found:
L"http://mtga-client.dl.wizards.com/Installers/Windows32/0.1.619.0/Alpha/\\MainFeature.cab"
0052:err:msi:ACTION_InstallFiles Failed to ready media for L"README.txt"

With patch above it installs successfully.
If above is wrong where should I look then?


Anton.



More information about the wine-devel mailing list