James Hawkins : msi: Use msi_dialog_dup_property where appropriate.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Aug 29 07:19:33 CDT 2006
Module: wine
Branch: master
Commit: 20d98e81eda835a91524f2585f3253a806b968a5
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20d98e81eda835a91524f2585f3253a806b968a5
Author: James Hawkins <truiken at gmail.com>
Date: Mon Aug 28 17:55:30 2006 -0700
msi: Use msi_dialog_dup_property where appropriate.
---
dlls/msi/dialog.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index db1e9f5..f509655 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1396,18 +1396,14 @@ static LPWSTR msi_get_window_text( HWND
static UINT msi_dialog_pathedit_handler( msi_dialog *dialog,
msi_control *control, WPARAM param )
{
- LPCWSTR prop;
- LPWSTR buf, indirect = NULL;
+ LPWSTR buf, prop;
+ BOOL indirect;
if( HIWORD(param) != EN_KILLFOCUS )
return ERROR_SUCCESS;
- prop = control->property;
- if ( control->attributes & msidbControlAttributesIndirect )
- {
- indirect = msi_dup_property( dialog->package, control->property );
- prop = indirect;
- }
+ indirect = control->attributes & msidbControlAttributesIndirect;
+ prop = msi_dialog_dup_property( dialog, control->property, indirect );
/* FIXME: verify the new path */
buf = msi_get_window_text( control->hwnd );
@@ -1417,7 +1413,7 @@ static UINT msi_dialog_pathedit_handler(
debugstr_w(prop));
msi_free( buf );
- msi_free( indirect );
+ msi_free( prop );
return ERROR_SUCCESS;
}
@@ -1449,10 +1445,8 @@ static UINT msi_dialog_pathedit_control(
WS_BORDER | WS_TABSTOP );
control->handler = msi_dialog_pathedit_handler;
control->attributes = MSI_RecordGetInteger( rec, 8 );
-
prop = MSI_RecordGetString( rec, 9 );
- if ( prop )
- control->property = strdupW( prop );
+ control->property = msi_dialog_dup_property( dialog, prop, FALSE );
msi_dialog_update_pathedit( dialog );
More information about the wine-cvs
mailing list