Nikolay Sivov : msi: Change unknown platform enum entry name.
Alexandre Julliard
julliard at winehq.org
Sun Feb 2 12:56:45 CST 2020
Module: wine
Branch: master
Commit: 5aeb9ed82efd4a02d24eac4ffdb64e7badb5f8bd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aeb9ed82efd4a02d24eac4ffdb64e7badb5f8bd
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Jan 31 13:34:15 2020 +0300
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 at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/msipriv.h | 2 +-
dlls/msi/package.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 6b87cfb3d8..572bb08768 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -363,7 +363,7 @@ typedef struct msi_dialog_tag msi_dialog;
enum platform
{
- PLATFORM_UNKNOWN,
+ PLATFORM_UNRECOGNIZED,
PLATFORM_INTEL,
PLATFORM_INTEL64,
PLATFORM_X64,
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 86fee09547..5065558827 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -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 );
More information about the wine-cvs
mailing list