Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 18:35:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Rename msi_reset_folders to msi_reset_source_folders.

Browse source 
It was always called with source parameter set to TRUE.

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

wine commit id 14ddb49df278e44fd184a8fd73ff1341ce0885ec by Hans Leidekker <hans@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 00:08:16 +01:00 • committed by Mark Jansen
parent b608ba9798
commit 0922e524ec
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
7 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/msi/action.c
View file

@ -375,7 +375,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine,
r = msi_set_property( package->db, prop, val, -1 ); r = msi_set_property( package->db, prop, val, -1 );
if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir )) if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
msi_free( val ); msi_free( val );
msi_free( prop ); msi_free( prop );
@ -493,7 +493,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)
{ {
UINT r = msi_set_property( package->db, szSourceDir, source, -1 ); UINT r = msi_set_property( package->db, szSourceDir, source, -1 );
if (r == ERROR_SUCCESS) if (r == ERROR_SUCCESS)
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
} }
msi_free( check ); msi_free( check );

2
dll/win32/msi/appsearch.c
View file

@ -1107,7 +1107,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param)
{ {
r = msi_set_property( package->db, propName, value, -1 ); r = msi_set_property( package->db, propName, value, -1 );
if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir )) if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
msi_free(value); msi_free(value);
} }

2
dll/win32/msi/custom.c
View file

@ -1423,7 +1423,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action)
len = deformat_string( package, target, &deformated ); len = deformat_string( package, target, &deformated );
rc = msi_set_property( package->db, source, deformated, len ); rc = msi_set_property( package->db, source, deformated, len );
if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir )) if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
msi_free(deformated); msi_free(deformated);
break; break;
case 37: /* JScript/VBScript text stored in target column. */ case 37: /* JScript/VBScript text stored in target column. */

2
dll/win32/msi/dialog.c
View file

@ -577,7 +577,7 @@ static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCW
{ {
UINT r = msi_set_property( package->db, property, value, -1 ); UINT r = msi_set_property( package->db, property, value, -1 );
if (r == ERROR_SUCCESS && !strcmpW( property, szSourceDir )) if (r == ERROR_SUCCESS && !strcmpW( property, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
} }
static MSIFEATURE *msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) static MSIFEATURE *msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem )

2
dll/win32/msi/msipriv.h
View file

@ -1026,7 +1026,7 @@ extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BO
extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN;
extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN;
extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN;
extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN;
extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN;
extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN;
extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN;

16
dll/win32/msi/package.c
View file

@ -2161,22 +2161,14 @@ end:
return r; return r;
} }
void msi_reset_folders( MSIPACKAGE *package, BOOL source ) void msi_reset_source_folders( MSIPACKAGE *package )
{ {
MSIFOLDER *folder; MSIFOLDER *folder;
LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry )
{ {
if ( source ) msi_free( folder->ResolvedSource );
{ folder->ResolvedSource = NULL;
msi_free( folder->ResolvedSource );
folder->ResolvedSource = NULL;
}
else
{
msi_free( folder->ResolvedTarget );
folder->ResolvedTarget = NULL;
}
} }
} }
@ -2270,7 +2262,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue
ret = msi_set_property( package->db, szName, szValue, -1 ); ret = msi_set_property( package->db, szName, szValue, -1 );
if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir )) if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
msiobj_release( &package->hdr ); msiobj_release( &package->hdr );
return ret; return ret;

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

@ -90,7 +90,7 @@ static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property,
r = msi_set_property( package->db, action_property, newprop, -1 ); r = msi_set_property( package->db, action_property, newprop, -1 );
if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir ))
msi_reset_folders( package, TRUE ); msi_reset_source_folders( package );
TRACE("Found Related Product... %s now %s\n", TRACE("Found Related Product... %s now %s\n",
debugstr_w(action_property), debugstr_w(newprop)); debugstr_w(action_property), debugstr_w(newprop));