James Hawkins : msi: The line control has a height of exactly 2 device units.
Alexandre Julliard
julliard at winehq.org
Mon Dec 17 06:41:57 CST 2007
Module: wine
Branch: master
Commit: b1cc87cb6565fe9cd44bd7c4bfb3804bce190417
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cc87cb6565fe9cd44bd7c4bfb3804bce190417
Author: James Hawkins <truiken at gmail.com>
Date: Sun Dec 16 20:31:49 2007 -0600
msi: The line control has a height of exactly 2 device units.
---
dlls/msi/dialog.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 078ceda..97e042e 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -871,12 +871,60 @@ static UINT msi_dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec )
static UINT msi_dialog_line_control( msi_dialog *dialog, MSIRECORD *rec )
{
+ DWORD attributes;
+ LPCWSTR name;
+ DWORD style, exstyle = 0;
+ DWORD x, y, width, height;
+ msi_control *control;
+
TRACE("%p %p\n", dialog, rec);
- /* line is exactly 2 units in height */
- MSI_RecordSetInteger( rec, 7, 2 );
+ style = WS_CHILD | SS_ETCHEDHORZ | SS_SUNKEN;
+
+ name = MSI_RecordGetString( rec, 2 );
+ attributes = MSI_RecordGetInteger( rec, 8 );
+
+ if( attributes & msidbControlAttributesVisible )
+ style |= WS_VISIBLE;
+ if( ~attributes & msidbControlAttributesEnabled )
+ style |= WS_DISABLED;
+ if( attributes & msidbControlAttributesSunken )
+ exstyle |= WS_EX_CLIENTEDGE;
+
+ msi_dialog_map_events(dialog, name);
+
+ control = msi_alloc( sizeof(*control) + strlenW(name) * sizeof(WCHAR) );
+ if (!control)
+ return ERROR_OUTOFMEMORY;
+
+ strcpyW( control->name, name );
+ list_add_head( &dialog->controls, &control->entry );
+ control->handler = NULL;
+ control->property = NULL;
+ control->value = NULL;
+ control->hBitmap = NULL;
+ control->hIcon = NULL;
+ control->hDll = NULL;
+ control->tabnext = strdupW( MSI_RecordGetString( rec, 11) );
+ control->type = strdupW( MSI_RecordGetString( rec, 3 ) );
+ control->progress_current = 0;
+ control->progress_max = 100;
+
+ x = MSI_RecordGetInteger( rec, 4 );
+ y = MSI_RecordGetInteger( rec, 5 );
+ width = MSI_RecordGetInteger( rec, 6 );
+
+ x = msi_dialog_scale_unit( dialog, x );
+ y = msi_dialog_scale_unit( dialog, y );
+ width = msi_dialog_scale_unit( dialog, width );
+ height = 2; /* line is exactly 2 units in height */
+
+ control->hwnd = CreateWindowExW( exstyle, szStatic, NULL, style,
+ x, y, width, height, dialog->hwnd, NULL, NULL, NULL );
+
+ TRACE("Dialog %s control %s hwnd %p\n",
+ debugstr_w(dialog->name), debugstr_w(name), control->hwnd );
- msi_dialog_add_control( dialog, rec, szStatic, SS_ETCHEDHORZ | SS_SUNKEN );
return ERROR_SUCCESS;
}
More information about the wine-cvs
mailing list