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

msi: Assign the property to path if the property is empty.

Browse Source
This commit is contained in:
James Hawkins 2006-10-03 14:59:52 -07:00 committed by Alexandre Julliard
parent 038d31ca93
commit e3496be256
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/dialog.c
View File

@ -1456,6 +1456,9 @@ static void msi_dialog_update_pathedit( msi_dialog *dialog, msi_control *control
prop = msi_dialog_dup_property( dialog, control->property, indirect ); prop = msi_dialog_dup_property( dialog, control->property, indirect );
path = msi_dup_property( dialog->package, prop ); path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
SetWindowTextW( control->hwnd, path ); SetWindowTextW( control->hwnd, path );
SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); SendMessageW( control->hwnd, EM_SETSEL, 0, -1 );
@ -2083,7 +2086,10 @@ static void msi_dialog_update_directory_combo( msi_dialog *dialog, msi_control *
indirect = control->attributes & msidbControlAttributesIndirect; indirect = control->attributes & msidbControlAttributesIndirect;
prop = msi_dialog_dup_property( dialog, control->property, indirect ); prop = msi_dialog_dup_property( dialog, control->property, indirect );
path = msi_dup_property( dialog->package, prop ); path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
PathStripPathW( path ); PathStripPathW( path );
PathRemoveBackslashW( path ); PathRemoveBackslashW( path );
@ -2140,7 +2146,10 @@ static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *c
indirect = control->attributes & msidbControlAttributesIndirect; indirect = control->attributes & msidbControlAttributesIndirect;
prop = msi_dialog_dup_property( dialog, control->property, indirect ); prop = msi_dialog_dup_property( dialog, control->property, indirect );
path = msi_dup_property( dialog->package, prop ); path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
lstrcpyW( dir_spec, path ); lstrcpyW( dir_spec, path );
lstrcatW( dir_spec, asterisk ); lstrcatW( dir_spec, asterisk );
@ -2182,6 +2191,8 @@ UINT msi_dialog_directorylist_up( msi_dialog *dialog )
prop = msi_dialog_dup_property( dialog, control->property, indirect ); prop = msi_dialog_dup_property( dialog, control->property, indirect );
path = msi_dup_property( dialog->package, prop ); path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
/* strip off the last directory */ /* strip off the last directory */
ptr = PathFindFileNameW( path ); ptr = PathFindFileNameW( path );
@ -2230,7 +2241,10 @@ static UINT msi_dialog_dirlist_handler( msi_dialog *dialog,
indirect = control->attributes & msidbControlAttributesIndirect; indirect = control->attributes & msidbControlAttributesIndirect;
prop = msi_dialog_dup_property( dialog, control->property, indirect ); prop = msi_dialog_dup_property( dialog, control->property, indirect );
path = msi_dup_property( dialog->package, prop ); path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
lstrcpyW( new_path, path ); lstrcpyW( new_path, path );
lstrcatW( new_path, text ); lstrcatW( new_path, text );