comctl32/taskdialog: Fix buttons might disappear.

In the old button layout algorithm, line count is added before adding button. This cause line count buffer overflow when the first button is very long. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/taskdialog: Fix buttons might disappear.
5d7fa27a · Zhiyi Zhang · Alexandre Julliard · 10e4eb8a · 5d7fa27a
Commit 5d7fa27a authored Jun 17, 2018 by Zhiyi Zhang Committed by Alexandre Julliard Jun 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

taskdialog.c dlls/comctl32/taskdialog.c +5 -6

No files found.
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -506,16 +506,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info)
    x = h_spacing;
    for (i = 0, line_count = 0; i < dialog_info->button_count; i++)
    {
-        if (x + button_layout_infos[i].width + h_spacing >= dialog_width)
+        button_layout_infos[i].line = line_count;
+        x += button_layout_infos[i].width + h_spacing;
+        line_widths[line_count] += button_layout_infos[i].width + h_spacing;
+
+        if ((i + 1 < dialog_info->button_count) && (x + button_layout_infos[i + 1].width + h_spacing >= dialog_width))
        {
            x = h_spacing;
            line_count++;
        }
-
-        button_layout_infos[i].line = line_count;
-
-        x += button_layout_infos[i].width + h_spacing;
-        line_widths[line_count] += button_layout_infos[i].width + h_spacing;
    }
    line_count++;