system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 17:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: Change ACTION_UpdateComponentStates to take a feature pointer.

Browse source
This commit is contained in:
Hans Leidekker 2010-12-24 15:32:01 +01:00 committed by Alexandre Julliard
parent 706b54daa7
commit 6d10216891
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/msi/dialog.c
View file

@ -2127,7 +2127,7 @@ msi_seltree_update_feature_installstate( HWND hwnd, HTREEITEM hItem,
{
msi_feature_set_state( package, feature, state );
msi_seltree_sync_item_state( hwnd, feature, hItem );
ACTION_UpdateComponentStates( package, feature->Feature );
ACTION_UpdateComponentStates( package, feature );
}
static void

7
dlls/msi/helpers.c
View file

@ -639,16 +639,11 @@ LPWSTR create_component_advertise_string(MSIPACKAGE* package,
}
/* update component state based on a feature change */
void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature)
void ACTION_UpdateComponentStates( MSIPACKAGE *package, MSIFEATURE *feature )
{
INSTALLSTATE newstate;
MSIFEATURE *feature;
ComponentList *cl;
feature = get_loaded_feature(package,szFeature);
if (!feature)
return;
newstate = feature->ActionRequest;
if (newstate == INSTALLSTATE_ABSENT)

2
dlls/msi/install.c
View file

@ -827,7 +827,7 @@ UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE* package, LPCWSTR szFeature,
feature->ActionRequest = iState;
ACTION_UpdateComponentStates(package,szFeature);
ACTION_UpdateComponentStates( package, feature );
/* update all the features that are children of this feature */
LIST_FOR_EACH_ENTRY( child, &package->features, MSIFEATURE, entry )

2
dlls/msi/msipriv.h
View file

@ -945,7 +945,7 @@ extern LPWSTR build_directory_name(DWORD , ...);
extern BOOL create_full_pathW(const WCHAR *path);
extern void reduce_to_longfilename(WCHAR*);
extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR);
extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature);
extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, MSIFEATURE *feature);
extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR);
extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR);
extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... );