marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Change unknown platform enum entry name. 

Public shlwapi.h defines same name, it seems safer to rename internal type.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Nikolay Sivov 2020-01-31 13:34:15 +03:00 committed by Alexandre Julliard
parent b066205dd5
commit 5aeb9ed82e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/msipriv.h
View File

@ -363,7 +363,7 @@ typedef struct msi_dialog_tag msi_dialog;
enum platform
{
PLATFORM_UNKNOWN,
PLATFORM_UNRECOGNIZED,
PLATFORM_INTEL,
PLATFORM_INTEL64,
PLATFORM_X64,

6
dlls/msi/package.c
View File

@ -1209,7 +1209,7 @@ static enum platform parse_platform( const WCHAR *str )
else if (!wcscmp( str, szX64 ) || !wcscmp( str, szAMD64 )) return PLATFORM_X64;
else if (!wcscmp( str, szARM )) return PLATFORM_ARM;
else if (!wcscmp( str, szARM64 )) return PLATFORM_ARM64;
return PLATFORM_UNKNOWN;
return PLATFORM_UNRECOGNIZED;
}
static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package )
@ -1237,13 +1237,13 @@ static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package )
platform = template;
if ((q = wcschr( platform, ',' ))) *q = 0;
package->platform = parse_platform( platform );
while (package->platform == PLATFORM_UNKNOWN && q)
while (package->platform == PLATFORM_UNRECOGNIZED && q)
{
platform = q + 1;
if ((q = wcschr( platform, ',' ))) *q = 0;
package->platform = parse_platform( platform );
}
if (package->platform == PLATFORM_UNKNOWN)
if (package->platform == PLATFORM_UNRECOGNIZED)
{
WARN("unknown platform %s\n", debugstr_w(template));
msi_free( template );