James Hawkins : msi:
Use ACTION_UpdateComponentStates in the selection tree so we don'
t have to duplicate the component changing logic.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 20 05:33:54 CDT 2006
Module: wine
Branch: master
Commit: 7a97b3ed84baf36d7a09f5932d64f4daa819a890
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a97b3ed84baf36d7a09f5932d64f4daa819a890
Author: James Hawkins <truiken at gmail.com>
Date: Fri Sep 15 17:13:10 2006 -0700
msi: Use ACTION_UpdateComponentStates in the selection tree so we don't have to duplicate the component changing logic.
---
dlls/msi/dialog.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index ce1ae81..1f15f40 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1700,8 +1700,9 @@ msi_seltree_feature_from_item( HWND hwnd
static LRESULT
msi_seltree_menu( HWND hwnd, HTREEITEM hItem )
{
+ struct msi_selection_tree_info *info;
MSIFEATURE *feature;
- ComponentList *cl;
+ MSIPACKAGE *package;
union {
RECT rc;
POINT pt[2];
@@ -1709,6 +1710,9 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h
} u;
UINT r;
+ info = GetPropW(hwnd, szButtonData);
+ package = info->dialog->package;
+
feature = msi_seltree_feature_from_item( hwnd, hItem );
if (!feature)
{
@@ -1737,13 +1741,7 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h
/* update */
msi_seltree_sync_item_state( hwnd, feature, hItem );
-
- /* update the feature's components */
- LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )
- {
- cl->component->Action = feature->Action;
- cl->component->ActionRequest = feature->ActionRequest;
- }
+ ACTION_UpdateComponentStates( package, feature->Feature );
return 0;
}
More information about the wine-cvs
mailing list