20 Mar
2022
20 Mar
'22
6:44 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0922e524ec30b99315443…
commit 0922e524ec30b99315443763f25173405d9351c7
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 00:08:16 2022 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:04 2022 +0100
[WINESYNC] msi: Rename msi_reset_folders to msi_reset_source_folders.
It was always called with source parameter set to TRUE.
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 14ddb49df278e44fd184a8fd73ff1341ce0885ec by Hans Leidekker
<hans(a)codeweavers.com>
---
dll/win32/msi/action.c | 4 ++--
dll/win32/msi/appsearch.c | 2 +-
dll/win32/msi/custom.c | 2 +-
dll/win32/msi/dialog.c | 2 +-
dll/win32/msi/msipriv.h | 2 +-
dll/win32/msi/package.c | 16 ++++------------
dll/win32/msi/upgrade.c | 2 +-
7 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c
index d73657e98a3..1be0a4ce52c 100644
--- a/dll/win32/msi/action.c
+++ b/dll/win32/msi/action.c
@@ -375,7 +375,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR
szCommandLine,
r = msi_set_property( package->db, prop, val, -1 );
if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir ))
- msi_reset_folders( package, TRUE );
+ msi_reset_source_folders( package );
msi_free( val );
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 );
if (r == ERROR_SUCCESS)
- msi_reset_folders( package, TRUE );
+ msi_reset_source_folders( package );
}
msi_free( check );
diff --git a/dll/win32/msi/appsearch.c b/dll/win32/msi/appsearch.c
index fbed073bd4a..806365191d0 100644
--- a/dll/win32/msi/appsearch.c
+++ b/dll/win32/msi/appsearch.c
@@ -1107,7 +1107,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param)
{
r = msi_set_property( package->db, propName, value, -1 );
if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir ))
- msi_reset_folders( package, TRUE );
+ msi_reset_source_folders( package );
msi_free(value);
}
diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c
index 56801363238..caa379b416d 100644
--- a/dll/win32/msi/custom.c
+++ b/dll/win32/msi/custom.c
@@ -1423,7 +1423,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action)
len = deformat_string( package, target, &deformated );
rc = msi_set_property( package->db, source, deformated, len );
if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir ))
- msi_reset_folders( package, TRUE );
+ msi_reset_source_folders( package );
msi_free(deformated);
break;
case 37: /* JScript/VBScript text stored in target column. */
diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c
index b39e6936678..29e016d9f7b 100644
--- a/dll/win32/msi/dialog.c
+++ b/dll/win32/msi/dialog.c
@@ -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 );
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 )
diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h
index b5f66339133..61032201b53 100644
--- a/dll/win32/msi/msipriv.h
+++ b/dll/win32/msi/msipriv.h
@@ -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_resolve_file_source(MSIPACKAGE *package, MSIFILE *file)
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 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;
diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c
index 80cae055b22..43af32acf14 100644
--- a/dll/win32/msi/package.c
+++ b/dll/win32/msi/package.c
@@ -2161,22 +2161,14 @@ end:
return r;
}
-void msi_reset_folders( MSIPACKAGE *package, BOOL source )
+void msi_reset_source_folders( MSIPACKAGE *package )
{
MSIFOLDER *folder;
LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry )
{
- if ( source )
- {
- msi_free( folder->ResolvedSource );
- folder->ResolvedSource = NULL;
- }
- else
- {
- msi_free( folder->ResolvedTarget );
- folder->ResolvedTarget = NULL;
- }
+ msi_free( folder->ResolvedSource );
+ folder->ResolvedSource = NULL;
}
}
@@ -2270,7 +2262,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName,
LPCWSTR szValue
ret = msi_set_property( package->db, szName, szValue, -1 );
if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir ))
- msi_reset_folders( package, TRUE );
+ msi_reset_source_folders( package );
msiobj_release( &package->hdr );
return ret;
diff --git a/dll/win32/msi/upgrade.c b/dll/win32/msi/upgrade.c
index bbc7df6eec5..36d65be8fe9 100644
--- a/dll/win32/msi/upgrade.c
+++ b/dll/win32/msi/upgrade.c
@@ -90,7 +90,7 @@ static void append_productcode(MSIPACKAGE* package, LPCWSTR
action_property,
r = msi_set_property( package->db, action_property, newprop, -1 );
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",
debugstr_w(action_property), debugstr_w(newprop));