[PATCH 0/3] MR3322: msi: Fully initialize the control structure in dialog_line_control(), and make it further consistent with other controls.

[Jinoh Kang (＠iamahuman)]

Commit b1cc87cb656 ("msi: The line control has a height of exactly 2
device units.", 2007-12-16) open-coded the body of
(msi_)dialog_add_control() inside dialog_line_control() modulo the
height override.

Except the fixed height, line controls have nothing special compared to
other controls.  Thus, there is little merit in open-coding it.

Also, dialog_line_control() has bit-rotted over time; it already missed
a few changes that were done to any other controls.

Fix this by just using dialog_add_control().  Also, add a special case
logic just for line controls.

[PATCH 1/3] msi: Fully initialize the control structure in dialog_line_control().

[Jinoh Kang]

From: Jinoh Kang

Fixes: 76606eaea034c51a73190aac92e75d8b20e82164
Fixes: 174b7b51ac9e57c6cfa8f48e62bbf468ae3b1f24
---
 dlls/msi/dialog.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 1374f3b6274..061bca9a6c9 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1192,10 +1192,12 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec )
     lstrcpyW( control->name, name );
     list_add_head( &dialog->controls, &control->entry );
     control->handler = NULL;
+    control->update = NULL;
     control->property = NULL;
     control->value = NULL;
     control->hBitmap = NULL;
     control->hIcon = NULL;
+    control->hImageList = NULL;
     control->hDll = NULL;
     control->tabnext = wcsdup( MSI_RecordGetString( rec, 11 ) );
     control->type = wcsdup( MSI_RecordGetString( rec, 3 ) );

[PATCH 2/3] msi: Make insertion order of line controls consistent with other controls.

[Jinoh Kang]

From: Jinoh Kang

Fixes: 2c5bd49297f79d9941a256d8ec61e0eb2bf9bf9c
---
 dlls/msi/dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 061bca9a6c9..11d6af75846 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1190,7 +1190,7 @@ static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec )
         return ERROR_OUTOFMEMORY;

lstrcpyW( control->name, name );
-    list_add_head( &dialog->controls, &control->entry );
+    list_add_tail( &dialog->controls, &control->entry );
     control->handler = NULL;
     control->update = NULL;
     control->property = NULL;

[PATCH 3/3] msi: Don't open code dialog_add_control() in dialog_line_control().

[Jinoh Kang]

From: Jinoh Kang

Commit b1cc87cb656 ("msi: The line control has a height of exactly 2
device units.", 2007-12-16) open-coded the body of
(msi_)dialog_add_control() inside dialog_line_control() modulo the
height override.

Except the fixed height, line controls have nothing special compared to
other controls.  Thus, there is little merit in open-coding it.

Also, dialog_line_control() has bit-rotted over time; it already missed
a few changes that were done to any other controls.

Fix this by just using dialog_add_control().  Also, add a special case
logic just for line controls.
---
 dlls/msi/dialog.c | 61 ++++-------------------------------------------
 1 file changed, 5 insertions(+), 56 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 11d6af75846..6c1b9ebf2a8 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -419,6 +419,9 @@ static struct control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec,
         font = dialog_get_style( title_font, &title );
     }

+    if (!wcsicmp( MSI_RecordGetString( rec, 3 ), L"Line" ))
+        height = 2; /* line is exactly 2 units in height */
+
     control->hwnd = CreateWindowExW( exstyle, szCls, title, style,
                           x, y, width, height, parent, NULL, NULL, NULL );

@@ -1163,62 +1166,8 @@ static UINT dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec )

static UINT dialog_line_control( msi_dialog *dialog, MSIRECORD *rec )
 {
-    DWORD attributes;
-    LPCWSTR name;
-    DWORD style, exstyle = 0;
-    DWORD x, y, width, height;
-    struct control *control;
-
-    TRACE("%p %p\n", dialog, rec);
-
-    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;
-
-    dialog_map_events( dialog, name );
-
-    control = malloc( offsetof( struct control, name[wcslen( name ) + 1] ) );
-    if (!control)
-        return ERROR_OUTOFMEMORY;
-
-    lstrcpyW( control->name, name );
-    list_add_tail( &dialog->controls, &control->entry );
-    control->handler = NULL;
-    control->update = NULL;
-    control->property = NULL;
-    control->value = NULL;
-    control->hBitmap = NULL;
-    control->hIcon = NULL;
-    control->hImageList = NULL;
-    control->hDll = NULL;
-    control->tabnext = wcsdup( MSI_RecordGetString( rec, 11 ) );
-    control->type = wcsdup( MSI_RecordGetString( rec, 3 ) );
-    control->progress_current = 0;
-    control->progress_max = 100;
-    control->progress_backwards = FALSE;
-
-    x = MSI_RecordGetInteger( rec, 4 );
-    y = MSI_RecordGetInteger( rec, 5 );
-    width = MSI_RecordGetInteger( rec, 6 );
-
-    x = dialog_scale_unit( dialog, x );
-    y = dialog_scale_unit( dialog, y );
-    width = dialog_scale_unit( dialog, width );
-    height = 2; /* line is exactly 2 units in height */
-
-    control->hwnd = CreateWindowExW( exstyle, L"Static", 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 );
+    if (!dialog_add_control( dialog, rec, L"Static", SS_ETCHEDHORZ | SS_SUNKEN))
+        return ERROR_FUNCTION_FAILED;

return ERROR_SUCCESS;
 }

[PATCH 0/3] MR3322: msi: Fully initialize the control structure in dialog_line_control(), and make it further consistent with other controls. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.