Commit 5aeb9ed8 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msi: Change unknown platform enum entry name.

Public shlwapi.h defines same name, it seems safer to rename internal type. Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent b066205d
...@@ -363,7 +363,7 @@ typedef struct msi_dialog_tag msi_dialog; ...@@ -363,7 +363,7 @@ typedef struct msi_dialog_tag msi_dialog;
enum platform enum platform
{ {
PLATFORM_UNKNOWN, PLATFORM_UNRECOGNIZED,
PLATFORM_INTEL, PLATFORM_INTEL,
PLATFORM_INTEL64, PLATFORM_INTEL64,
PLATFORM_X64, PLATFORM_X64,
......
...@@ -1209,7 +1209,7 @@ static enum platform parse_platform( const WCHAR *str ) ...@@ -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, szX64 ) || !wcscmp( str, szAMD64 )) return PLATFORM_X64;
else if (!wcscmp( str, szARM )) return PLATFORM_ARM; else if (!wcscmp( str, szARM )) return PLATFORM_ARM;
else if (!wcscmp( str, szARM64 )) return PLATFORM_ARM64; else if (!wcscmp( str, szARM64 )) return PLATFORM_ARM64;
return PLATFORM_UNKNOWN; return PLATFORM_UNRECOGNIZED;
} }
static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package ) static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package )
...@@ -1237,13 +1237,13 @@ static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package ) ...@@ -1237,13 +1237,13 @@ static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package )
platform = template; platform = template;
if ((q = wcschr( platform, ',' ))) *q = 0; if ((q = wcschr( platform, ',' ))) *q = 0;
package->platform = parse_platform( platform ); package->platform = parse_platform( platform );
while (package->platform == PLATFORM_UNKNOWN && q) while (package->platform == PLATFORM_UNRECOGNIZED && q)
{ {
platform = q + 1; platform = q + 1;
if ((q = wcschr( platform, ',' ))) *q = 0; if ((q = wcschr( platform, ',' ))) *q = 0;
package->platform = parse_platform( platform ); package->platform = parse_platform( platform );
} }
if (package->platform == PLATFORM_UNKNOWN) if (package->platform == PLATFORM_UNRECOGNIZED)
{ {
WARN("unknown platform %s\n", debugstr_w(template)); WARN("unknown platform %s\n", debugstr_w(template));
msi_free( template ); msi_free( template );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment