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

msi: Make msi_dialog_dup_property return a copy of the property if the property is empty.

Browse Source
This commit is contained in:
James Hawkins 2006-10-05 19:41:13 -07:00 committed by Alexandre Julliard
parent 1a922b6a38
commit 9024a88dd9
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/msi/dialog.c
View File

@ -217,13 +217,18 @@ static LPWSTR msi_get_deformatted_field( MSIPACKAGE *package, MSIRECORD *rec, in
static LPWSTR msi_dialog_dup_property( msi_dialog *dialog, LPCWSTR property, BOOL indirect ) static LPWSTR msi_dialog_dup_property( msi_dialog *dialog, LPCWSTR property, BOOL indirect )
{ {
LPWSTR prop = NULL;
if (!property) if (!property)
return NULL; return NULL;
if (indirect) if (indirect)
return msi_dup_property( dialog->package, property ); prop = msi_dup_property( dialog->package, property );
return strdupW( property ); if (!prop)
prop = strdupW( property );
return prop;
} }
msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ) msi_dialog *msi_dialog_get_parent( msi_dialog *dialog )
@ -1469,10 +1474,7 @@ static void msi_dialog_update_pathedit( msi_dialog *dialog, msi_control *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_dialog_dup_property( dialog, prop, TRUE );
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 );
@ -2171,10 +2173,7 @@ 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_dialog_dup_property( dialog, prop, TRUE );
path = msi_dup_property( dialog->package, prop );
if (!path)
path = prop;
PathStripPathW( path ); PathStripPathW( path );
PathRemoveBackslashW( path ); PathRemoveBackslashW( path );
@ -2231,10 +2230,7 @@ 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_dialog_dup_property( dialog, prop, TRUE );
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 );
@ -2274,10 +2270,7 @@ UINT msi_dialog_directorylist_up( msi_dialog *dialog )
control = msi_dialog_find_control_by_type( dialog, szDirectoryList ); control = msi_dialog_find_control_by_type( dialog, szDirectoryList );
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_dialog_dup_property( dialog, prop, TRUE );
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 );
@ -2326,10 +2319,7 @@ 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_dialog_dup_property( dialog, prop, TRUE );
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 );