Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] msi: Avoid duplicate product codes in FindRelatedProducts.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b33b8cab0dbef9571553a814c7bff501ae0a5b48 by Hans Leidekker <hans@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 00:08:20 +01:00 committed by Mark Jansen
parent 14478462cc
commit d30e40fc22
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 43 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
dll/win32/msi/upgrade.c
View file

@ -55,45 +55,59 @@ static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes)
return (lang1 == langdword);
}
static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property,
LPCWSTR productid)
static BOOL find_product( const WCHAR *list, const WCHAR *product )
{
LPWSTR prop;
LPWSTR newprop;
DWORD len;
const WCHAR *p = list, *q;
if (!list) return FALSE;
for (;;)
{
while (*p && *p != '{') p++;
if (*p != '{') return FALSE;
q = p;
while (*q && *q != '}') q++;
if (*q != '}') return FALSE;
q++;
if (q - p < strlenW( product )) return FALSE;
if (!memcmp( p, product, (q - p) * sizeof(WCHAR) )) return TRUE;
p = q + 1;
while (*p && *p != ';') p++;
if (*p != ';') break;
}
return FALSE;
}
static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, const WCHAR *product )
{
WCHAR *prop, *newprop;
DWORD len = 0;
UINT r;
prop = msi_dup_property(package->db, action_property );
if (prop)
len = strlenW(prop);
else
len = 0;
/*separator*/
len ++;
len += strlenW(productid);
/*null*/
len++;
newprop = msi_alloc( len*sizeof(WCHAR) );
prop = msi_dup_property( package->db, action_prop );
if (find_product( prop, product ))
{
TRACE( "related product property %s already contains %s\n", debugstr_w(action_prop), debugstr_w(product) );
msi_free( prop );
return;
}
if (prop) len += strlenW( prop );
len += strlenW( product ) + 2;
if (!(newprop = msi_alloc( len * sizeof(WCHAR) ))) return;
if (prop)
{
strcpyW(newprop,prop);
strcatW(newprop,szSemiColon);
strcpyW( newprop, prop );
strcatW( newprop, szSemiColon );
}
else
newprop[0] = 0;
strcatW(newprop,productid);
else newprop[0] = 0;
strcatW( newprop, product );
r = msi_set_property( package->db, action_property, newprop, -1 );
if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir ))
r = msi_set_property( package->db, action_prop, newprop, -1 );
if (r == ERROR_SUCCESS && !strcmpW( action_prop, szSourceDir ))
msi_reset_source_folders( package );
TRACE("Found Related Product... %s now %s\n",
debugstr_w(action_property), debugstr_w(newprop));
TRACE( "related product property %s now %s\n", debugstr_w(action_prop), debugstr_w(newprop) );
msi_free( prop );
msi_free( newprop );