ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Only insert entries into listbox if property value matches.

Browse Source
This commit is contained in:
Peter Oberndorfer 2007-02-06 20:01:03 +01:00 committed by Alexandre Julliard
parent f3bcc0c4f8
commit 79d2f76b8e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/msi/dialog.c
View File

@ -2124,7 +2124,7 @@ static UINT msi_listbox_add_item( MSIRECORD *rec, LPVOID param )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT msi_listbox_add_items( struct msi_listbox_info *info ) static UINT msi_listbox_add_items( struct msi_listbox_info *info, LPCWSTR property )
{ {
UINT r; UINT r;
MSIQUERY *view = NULL; MSIQUERY *view = NULL;
@ -2133,10 +2133,12 @@ static UINT msi_listbox_add_items( struct msi_listbox_info *info )
static const WCHAR query[] = { static const WCHAR query[] = {
'S','E','L','E','C','T',' ','*',' ', 'S','E','L','E','C','T',' ','*',' ',
'F','R','O','M',' ','`','L','i','s','t','B','o','x','`',' ', 'F','R','O','M',' ','`','L','i','s','t','B','o','x','`',' ',
'W','H','E','R','E',' ',
'`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ',
'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0
}; };
r = MSI_OpenQuery( info->dialog->package->db, &view, query ); r = MSI_OpenQuery( info->dialog->package->db, &view, query, property );
if ( r != ERROR_SUCCESS ) if ( r != ERROR_SUCCESS )
return r; return r;
@ -2176,6 +2178,7 @@ static UINT msi_dialog_list_box( msi_dialog *dialog, MSIRECORD *rec )
struct msi_listbox_info *info; struct msi_listbox_info *info;
msi_control *control; msi_control *control;
DWORD style; DWORD style;
LPCWSTR prop;
info = msi_alloc( sizeof *info ); info = msi_alloc( sizeof *info );
if (!info) if (!info)
@ -2188,6 +2191,9 @@ static UINT msi_dialog_list_box( msi_dialog *dialog, MSIRECORD *rec )
control->handler = msi_dialog_listbox_handler; control->handler = msi_dialog_listbox_handler;
prop = MSI_RecordGetString( rec, 9 );
control->property = msi_dialog_dup_property( dialog, prop, FALSE );
/* subclass */ /* subclass */
info->dialog = dialog; info->dialog = dialog;
info->hwnd = control->hwnd; info->hwnd = control->hwnd;
@ -2196,7 +2202,8 @@ static UINT msi_dialog_list_box( msi_dialog *dialog, MSIRECORD *rec )
(LONG_PTR)MSIListBox_WndProc ); (LONG_PTR)MSIListBox_WndProc );
SetPropW( control->hwnd, szButtonData, info ); SetPropW( control->hwnd, szButtonData, info );
msi_listbox_add_items( info ); if ( control->property )
msi_listbox_add_items( info, control->property );
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }