October 2006 - Wine-commits

James Hawkins : msi: Only apply the last font style in the list of styles.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: f16ddf1b325b2e2b57b4bd940b7372135b968d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16ddf1b325b2e2b57b4bd940… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 19:15:08 2006 -0700 msi: Only apply the last font style in the list of styles. --- dlls/msi/dialog.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2ffc3db..55743ca 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -240,30 +240,34 @@ LPWSTR msi_dialog_get_name( msi_dialog * * msi_dialog_get_style * * Extract the {\style} string from the front of the text to display and - * update the pointer. + * update the pointer. Only the last style in a list is applied. */ static LPWSTR msi_dialog_get_style( LPCWSTR p, LPCWSTR *rest ) { - LPWSTR ret = NULL; - LPCWSTR q, i; + LPWSTR ret; + LPCWSTR q, i, first; DWORD len; + q = NULL; *rest = p; if( !p ) - return ret; - if( *p++ != '{' ) - return ret; - q = strchrW( p, '}' ); - if( !q ) - return ret; - if( *p == '\\' || *p == '&' ) - p++; + return NULL; + + while ((first = strchrW( p, '{' )) && (q = strchrW( first + 1, '}' ))) + { + p = first + 1; + if( *p == '\\' || *p == '&' ) + p++; + + /* little bit of sanity checking to stop us getting confused with RTF */ + for( i=p; i<q; i++ ) + if( *i == '}' || *i == '\\' ) + return NULL; + } + + if (!p || !q) + return NULL; - /* little bit of sanity checking to stop us getting confused with RTF */ - for( i=p; i<q; i++ ) - if( *i == '}' || *i == '\\' ) - return ret; - *rest = ++q; len = q - p;

1 0

James Hawkins : msi: Subscribe the SelectionTree control to the SelectionPath event.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 5ea2cd44c1766710bf6c944a1889e1e47c8bd15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea2cd44c1766710bf6c944a1… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:04:51 2006 -0700 msi: Subscribe the SelectionTree control to the SelectionPath event. --- dlls/msi/dialog.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ff9e146..2ffc3db 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -147,6 +147,7 @@ static const WCHAR szDirectoryList[] = { static const WCHAR szVolumeCostList[] = { 'V','o','l','u','m','e','C','o','s','t','L','i','s','t',0 }; static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; +static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -155,7 +156,7 @@ static UINT msi_dialog_edit_handler( msi static UINT msi_dialog_radiogroup_handler( msi_dialog *, msi_control *, WPARAM param ); static UINT msi_dialog_evaluate_control_conditions( msi_dialog *dialog ); static LRESULT WINAPI MSIRadioGroup_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); - +static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); /* dialog sequencing */ @@ -578,6 +579,11 @@ void msi_dialog_handle_event( msi_dialog break; } } + else if ( !lstrcmpW(attribute, szProperty) ) + { + MSIFEATURE *feature = msi_seltree_get_selected_feature( ctrl ); + MSI_SetPropertyW( dialog->package, ctrl->property, feature->Directory ); + } else { FIXME("Attribute %s not being set\n", debugstr_w(attribute)); @@ -1770,6 +1776,12 @@ msi_seltree_menu( HWND hwnd, HTREEITEM h return 0; } +static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ) +{ + struct msi_selection_tree_info *info = GetPropW(control->hwnd, szButtonData); + return msi_seltree_feature_from_item( control->hwnd, info->selected ); +} + static LRESULT WINAPI MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -1973,6 +1985,9 @@ static UINT msi_dialog_selection_tree( m (LONG_PTR)MSISelectionTree_WndProc ); SetPropW( control->hwnd, szButtonData, info ); + ControlEvent_SubscribeToEvent( dialog->package, dialog, + szSelectionPath, control->name, szProperty ); + /* initialize it */ msi_seltree_create_imagelist( control->hwnd ); msi_seltree_add_child_features( package, control->hwnd, NULL, NULL );

1 0

James Hawkins : msi: Handle the SelectionBrowse event using ControlEvent_SpawnDialog.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 971ab9aa47476a56a1d6ee616fa332351c368f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=971ab9aa47476a56a1d6ee616… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:05:05 2006 -0700 msi: Handle the SelectionBrowse event using ControlEvent_SpawnDialog. --- dlls/msi/events.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 53a6f62..dac7f8e 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -410,6 +410,7 @@ static const struct _events Events[] = { { "Reset",ControlEvent_Reset }, { "SetInstallLevel",ControlEvent_SetInstallLevel }, { "DirectoryListUp",ControlEvent_DirectoryListUp }, + { "SelectionBrowse",ControlEvent_SpawnDialog }, { NULL,NULL }, };

1 0

James Hawkins : msi: Store the selected item in the SelectionTree control.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 908e27d6fcb8cb874912d610b6e5f9c311e721e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908e27d6fcb8cb874912d610b… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:03:32 2006 -0700 msi: Store the selected item in the SelectionTree control. --- dlls/msi/dialog.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 98d42ae..ff9e146 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1664,6 +1664,7 @@ struct msi_selection_tree_info msi_dialog *dialog; HWND hwnd; WNDPROC oldproc; + HTREEITEM selected; }; static void @@ -1809,6 +1810,7 @@ static void msi_seltree_add_child_features( MSIPACKAGE *package, HWND hwnd, LPCWSTR parent, HTREEITEM hParent ) { + struct msi_selection_tree_info *info = GetPropW( hwnd, szButtonData ); MSIFEATURE *feature; TVINSERTSTRUCTW tvis; HTREEITEM hitem, hfirst = NULL; @@ -1849,6 +1851,7 @@ msi_seltree_add_child_features( MSIPACKA /* select the first item */ SendMessageW( hwnd, TVM_SELECTITEM, TVGN_CARET | TVGN_DROPHILITE, (LPARAM) hfirst ); + info->selected = hfirst; } static void msi_seltree_create_imagelist( HWND hwnd ) @@ -1891,6 +1894,7 @@ static void msi_seltree_create_imagelist static UINT msi_dialog_seltree_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) { + struct msi_selection_tree_info *info = GetPropW( control->hwnd, szButtonData ); LPNMTREEVIEWW tv = (LPNMTREEVIEWW)param; MSIRECORD *row, *rec; MSIFOLDER *folder; @@ -1906,6 +1910,8 @@ static UINT msi_dialog_seltree_handler( if (tv->hdr.code != TVN_SELCHANGINGW) return ERROR_SUCCESS; + info->selected = tv->itemNew.hItem; + row = MSI_QueryGetRecord( dialog->package->db, select, tv->itemNew.pszText ); if (!row) return ERROR_FUNCTION_FAILED;

1 0

James Hawkins : msi: Publish the SelectionDescription and SelectionPath events when the selection changes in the SelectionTree control .
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 846fdd1550925803f1613fdad02f00bc1a4ddddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=846fdd1550925803f1613fdad… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:03:16 2006 -0700 msi: Publish the SelectionDescription and SelectionPath events when the selection changes in the SelectionTree control. --- dlls/msi/dialog.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 91be275..98d42ae 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -145,6 +145,8 @@ static const WCHAR szListBox[] = { 'L',' static const WCHAR szDirectoryCombo[] = { 'D','i','r','e','c','t','o','r','y','C','o','m','b','o',0 }; static const WCHAR szDirectoryList[] = { 'D','i','r','e','c','t','o','r','y','L','i','s','t',0 }; static const WCHAR szVolumeCostList[] = { 'V','o','l','u','m','e','C','o','s','t','L','i','s','t',0 }; +static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -1886,6 +1888,51 @@ static void msi_seltree_create_imagelist SendMessageW( hwnd, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)himl ); } +static UINT msi_dialog_seltree_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + LPNMTREEVIEWW tv = (LPNMTREEVIEWW)param; + MSIRECORD *row, *rec; + MSIFOLDER *folder; + LPCWSTR dir; + UINT r = ERROR_SUCCESS; + + static const WCHAR select[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ', + '`','T','i','t','l','e','`',' ','=',' ','\'','%','s','\'',0 + }; + + if (tv->hdr.code != TVN_SELCHANGINGW) + return ERROR_SUCCESS; + + row = MSI_QueryGetRecord( dialog->package->db, select, tv->itemNew.pszText ); + if (!row) + return ERROR_FUNCTION_FAILED; + + rec = MSI_CreateRecord( 1 ); + + MSI_RecordSetStringW( rec, 1, MSI_RecordGetString( row, 4 ) ); + ControlEvent_FireSubscribedEvent( dialog->package, szSelectionDescription, rec ); + + dir = MSI_RecordGetString( row, 7 ); + folder = get_loaded_folder( dialog->package, dir ); + if (!folder) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + MSI_RecordSetStringW( rec, 1, folder->ResolvedTarget ); + ControlEvent_FireSubscribedEvent( dialog->package, szSelectionPath, rec ); + +done: + msiobj_release(&row->hdr); + msiobj_release(&rec->hdr); + + return r; +} + static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; @@ -1908,6 +1955,7 @@ static UINT msi_dialog_selection_tree( m return ERROR_FUNCTION_FAILED; } + control->handler = msi_dialog_seltree_handler; control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE );

1 0

James Hawkins : msi: Properly initialize the SelectionTree control' s attributes and property values.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: de0efba366ede0f1f3cd62fc114aefe51ebe05fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0efba366ede0f1f3cd62fc1… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:02:44 2006 -0700 msi: Properly initialize the SelectionTree control's attributes and property values. --- dlls/msi/dialog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 940939f..91be275 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1899,7 +1899,6 @@ static UINT msi_dialog_selection_tree( m return ERROR_FUNCTION_FAILED; /* create the treeview control */ - prop = MSI_RecordGetString( rec, 9 ); style = TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT; style |= WS_GROUP | WS_VSCROLL; control = msi_dialog_add_control( dialog, rec, WC_TREEVIEWW, style ); @@ -1909,6 +1908,10 @@ static UINT msi_dialog_selection_tree( m return ERROR_FUNCTION_FAILED; } + control->attributes = MSI_RecordGetInteger( rec, 8 ); + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + /* subclass */ info->dialog = dialog; info->hwnd = control->hwnd;

1 0

James Hawkins : msi: Publish the SelectionPath event in the SetTargetPath event.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: aea0dcc86da5c4779c04c87e4db7c9d409c7d739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea0dcc86da5c4779c04c87e4… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:02:07 2006 -0700 msi: Publish the SelectionPath event in the SetTargetPath event. --- dlls/msi/events.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 3502e9a..53a6f62 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -243,10 +243,18 @@ static UINT ControlEvent_SetTargetPath(M msi_dialog* dialog) { LPWSTR path = msi_dup_property( package, argument ); + MSIRECORD *rec = MSI_CreateRecord( 1 ); UINT r; + + static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; + + MSI_RecordSetStringW( rec, 1, path ); + ControlEvent_FireSubscribedEvent( package, szSelectionPath, rec ); + /* failure to set the path halts the executing of control events */ r = MSI_SetTargetPathW(package, argument, path); msi_free(path); + msi_free(&rec->hdr); return r; }

1 0

James Hawkins : msi: Provide a specific dialog to ControlEvent_SubscribeToEvent, as package-> dialog does not always point to the same dialog.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 2a8c38ff74f0ba488934cdb0fd30fce3139ab43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8c38ff74f0ba488934cdb0f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:01:23 2006 -0700 msi: Provide a specific dialog to ControlEvent_SubscribeToEvent, as package->dialog does not always point to the same dialog. --- dlls/msi/action.h | 4 ++-- dlls/msi/dialog.c | 2 +- dlls/msi/events.c | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.h b/dlls/msi/action.h index ae7de82..d58bc52 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -295,8 +295,8 @@ extern UINT msi_create_component_directo extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event, MSIRECORD *data); extern VOID ControlEvent_CleanupSubscriptions(MSIPACKAGE *package); -extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute); +extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, msi_dialog *dialog, + LPCWSTR event, LPCWSTR control, LPCWSTR attribute); extern VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, LPCWSTR control, LPCWSTR attribute ); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7d60791..940939f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -602,7 +602,7 @@ static void msi_dialog_map_events(msi_di event = MSI_RecordGetString( row, 3 ); attribute = MSI_RecordGetString( row, 4 ); - ControlEvent_SubscribeToEvent( dialog->package, event, control, attribute ); + ControlEvent_SubscribeToEvent( dialog->package, dialog, event, control, attribute ); msiobj_release( &row->hdr ); } diff --git a/dlls/msi/events.c b/dlls/msi/events.c index e9b7d55..3502e9a 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -48,6 +48,7 @@ struct _events { struct subscriber { struct list entry; + msi_dialog *dialog; LPWSTR event; LPWSTR control; LPWSTR attribute; @@ -267,14 +268,15 @@ static void free_subscriber( struct subs msi_free(sub); } -VOID ControlEvent_SubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute ) +VOID ControlEvent_SubscribeToEvent( MSIPACKAGE *package, msi_dialog *dialog, + LPCWSTR event, LPCWSTR control, LPCWSTR attribute ) { struct subscriber *sub; sub = msi_alloc(sizeof (*sub)); if( !sub ) return; + sub->dialog = dialog; sub->event = strdupW(event); sub->control = strdupW(control); sub->attribute = strdupW(attribute); @@ -309,14 +311,11 @@ VOID ControlEvent_FireSubscribedEvent( M TRACE("Firing Event %s\n",debugstr_w(event)); - if (!package->dialog) - return; - LIST_FOR_EACH_ENTRY( sub, &package->subscriptions, struct subscriber, entry ) { if (lstrcmpiW(sub->event, event)) continue; - msi_dialog_handle_event( package->dialog, sub->control, + msi_dialog_handle_event( sub->dialog, sub->control, sub->attribute, rec ); } }

1 0

James Hawkins : msi: Select the first item in the SelectionTree control.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 7ee3a4efdf13b671dcf253fd4265d2d7f41944f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee3a4efdf13b671dcf253fd4… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:00:59 2006 -0700 msi: Select the first item in the SelectionTree control. --- dlls/msi/dialog.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f0c9d7c..7d60791 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1809,7 +1809,7 @@ msi_seltree_add_child_features( MSIPACKA { MSIFEATURE *feature; TVINSERTSTRUCTW tvis; - HTREEITEM hitem; + HTREEITEM hitem, hfirst = NULL; LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1833,6 +1833,9 @@ msi_seltree_add_child_features( MSIPACKA if (!hitem) continue; + if (!hfirst) + hfirst = hitem; + msi_seltree_sync_item_state( hwnd, feature, hitem ); msi_seltree_add_child_features( package, hwnd, feature->Feature, hitem ); @@ -1841,6 +1844,9 @@ msi_seltree_add_child_features( MSIPACKA if ( feature->Display % 2 != 0 ) SendMessageW( hwnd, TVM_EXPAND, TVE_EXPAND, (LPARAM) hitem ); } + + /* select the first item */ + SendMessageW( hwnd, TVM_SELECTITEM, TVGN_CARET | TVGN_DROPHILITE, (LPARAM) hfirst ); } static void msi_seltree_create_imagelist( HWND hwnd )

1 0

James Hawkins : msi: Empty the window text if no text is provided.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 0fe1b3671624ceb077598eac8f7deaa24469a671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe1b3671624ceb077598eac8… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 15:00:19 2006 -0700 msi: Empty the window text if no text is provided. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b4e9ce3..f0c9d7c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -536,6 +536,8 @@ void msi_dialog_handle_event( msi_dialog LPCWSTR font_text, text = NULL; LPWSTR font; + static const WCHAR empty[] = {0}; + ctrl = msi_dialog_find_control( dialog, control ); if (!ctrl) return; @@ -543,6 +545,7 @@ void msi_dialog_handle_event( msi_dialog { font_text = MSI_RecordGetString( rec , 1 ); font = msi_dialog_get_style( font_text, &text ); + if (!text) text = empty; SetWindowTextW( ctrl->hwnd, text ); msi_free( font ); msi_dialog_check_messages( NULL );

1 0