July 2018 - Wine-devel - list.winehq.org

[PATCH v2 6/6] comctl32/taskdialog: Add support for footer text.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 3508dbc0cb..457a5ff9d0 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -68,6 +68,7 @@ struct taskdialog_info HWND expando_button; HWND verification_box; HWND footer_icon; + HWND footer_text; HWND *buttons; INT button_count; HWND default_button; @@ -737,6 +738,12 @@ static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); } +static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) +{ + dialog_info->footer_text = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszFooter, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -766,6 +773,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; + LONG footer_icon_right, footer_icon_bottom; LONG x, y; SIZE size; INT i; @@ -952,6 +960,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(line_widths); /* Footer icon */ + footer_icon_right = 0; + footer_icon_bottom = dialog_height; if (dialog_info->footer_icon) { x = h_spacing; @@ -959,9 +969,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) size.cx = GetSystemMetrics(SM_CXSMICON); size.cy = GetSystemMetrics(SM_CYSMICON); SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); - dialog_height = y + size.cy; + footer_icon_right = x + size.cx; + footer_icon_bottom = y + size.cy; } + /* Footer text */ + taskdialog_label_layout(dialog_info, dialog_info->footer_text, footer_icon_right, dialog_width, &dialog_height, + syslink); + dialog_height = max(dialog_height, footer_icon_bottom); + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1058,6 +1074,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); taskdialog_add_footer_icon(dialog_info); + taskdialog_add_footer_text(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) @@ -1184,7 +1201,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; if ((taskdialog_hyperlink_enabled(dialog_info)) - && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info + || hwndFrom == dialog_info->footer_text) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl); -- 2.18.0

2 1

[PATCH v2 5/6] comctl32/taskdialog: Add support for footer icon.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 411b8e9212..3508dbc0cb 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -67,6 +67,7 @@ struct taskdialog_info HWND expanded_info; HWND expando_button; HWND verification_box; + HWND footer_icon; HWND *buttons; INT button_count; HWND default_button; @@ -446,17 +447,24 @@ static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; + INT cx = 0, cy = 0; HICON hicon; if (!icon) return; - if ((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + if (((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + || ((flags & TDF_USE_HICON_FOOTER) && element == TDIE_ICON_FOOTER)) hicon = icon; else { - hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (element == TDIE_ICON_FOOTER) + { + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + } + hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); if (!hicon) - hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); } @@ -467,6 +475,8 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->hwnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hicon); SendMessageW(dialog_info->main_icon, STM_SETICON, (WPARAM)hicon, 0); } + else if (element == TDIE_ICON_FOOTER) + SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) @@ -718,6 +728,15 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) dialog_info->button_count = count; } +static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) +{ + if (!dialog_info->taskconfig->u2.hFooterIcon) return; + + dialog_info->footer_icon = + CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0); + taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -932,6 +951,17 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Footer icon */ + if (dialog_info->footer_icon) + { + x = h_spacing; + y = dialog_height + v_spacing; + size.cx = GetSystemMetrics(SM_CXSMICON); + size.cy = GetSystemMetrics(SM_CYSMICON); + SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + dialog_height = y + size.cy; + } + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1027,6 +1057,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_expando_button(dialog_info); taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); + taskdialog_add_footer_icon(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) -- 2.18.0

2 1

[PATCH v2 4/6] comctl32/taskdialog: Add support for verification box.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 58 ++++++++++++- dlls/comctl32/tests/taskdialog.c | 136 +++++++++++++++++++++++++------ 2 files changed, 166 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 54ad58b340..411b8e9212 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -66,6 +66,7 @@ struct taskdialog_info INT command_link_count; HWND expanded_info; HWND expando_button; + HWND verification_box; HWND *buttons; INT button_count; HWND default_button; @@ -78,6 +79,7 @@ struct taskdialog_info LONG v_spacing; } m; INT selected_radio_id; + BOOL verification_checked; BOOL expanded; WCHAR *expanded_text; WCHAR *collapsed_text; @@ -247,6 +249,13 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND return; } + if (hwnd == dialog_info->verification_box) + { + dialog_info->verification_checked = !dialog_info->verification_checked; + taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, dialog_info->verification_checked, 0); + return; + } + radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); if (radio_button) { @@ -636,6 +645,26 @@ static void taskdialog_add_expando_button(struct taskdialog_info *dialog_info) SendMessageW(dialog_info->expando_button, WM_SETFONT, (WPARAM)dialog_info->font, 0); } +static void taskdialog_add_verification_box(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + static const DWORD style = BS_AUTOCHECKBOX | BS_MULTILINE | BS_LEFT | BS_TOP | WS_CHILD | WS_VISIBLE | WS_TABSTOP; + WCHAR *textW; + + /* TDF_VERIFICATION_FLAG_CHECKED works even if pszVerificationText is not set */ + if (taskconfig->dwFlags & TDF_VERIFICATION_FLAG_CHECKED) dialog_info->verification_checked = TRUE; + + if (!taskconfig->pszVerificationText) return; + + textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pszVerificationText); + dialog_info->verification_box = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, 0, 0, 0); + SendMessageW(dialog_info->verification_box, WM_SETFONT, (WPARAM)dialog_info->font, 0); + Free(textW); + + if (taskconfig->dwFlags & TDF_VERIFICATION_FLAG_CHECKED) + SendMessageW(dialog_info->verification_box, BM_SETCHECK, BST_CHECKED, 0); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -806,6 +835,19 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) expando_bottom = y + size.cy; } + /* Verification box */ + if (dialog_info->verification_box) + { + x = h_spacing; + y = expando_bottom + v_spacing; + size.cx = DIALOG_MIN_WIDTH / 2; + taskdialog_du_to_px(dialog_info, &size.cx, NULL); + taskdialog_get_radio_button_size(dialog_info, dialog_info->verification_box, size.cx, &size); + SetWindowPos(dialog_info->verification_box, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + expando_right = max(expando_right, x + size.cx); + expando_bottom = y + size.cy; + } + /* Common and custom buttons */ button_layout_infos = Alloc(dialog_info->button_count * sizeof(*button_layout_infos)); line_widths = Alloc(dialog_info->button_count * sizeof(*line_widths)); @@ -983,6 +1025,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); taskdialog_add_expando_button(dialog_info); + taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); /* Set default button */ @@ -1063,6 +1106,19 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_ENABLE_RADIO_BUTTON: taskdialog_enable_radio_button(dialog_info, wParam, lParam); break; + case TDM_CLICK_VERIFICATION: + { + BOOL checked = (BOOL)wParam; + BOOL focused = (BOOL)lParam; + dialog_info->verification_checked = checked; + if (dialog_info->verification_box) + { + SendMessageW(dialog_info->verification_box, BM_SETCHECK, checked ? BST_CHECKED : BST_UNCHECKED, 0); + taskdialog_notify(dialog_info, TDN_VERIFICATION_CLICKED, checked, 0); + if (focused) SetFocus(dialog_info->verification_box); + } + break; + } case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; @@ -1151,7 +1207,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (button) *button = ret; if (radio_button) *radio_button = dialog_info.selected_radio_id; - if (verification_flag_checked) *verification_flag_checked = TRUE; + if (verification_flag_checked) *verification_flag_checked = dialog_info.verification_checked; return S_OK; } diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 7fb8f3dcfc..8d60fb2eb8 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -229,6 +229,48 @@ static const struct message_info msg_return_press_negative_id_radio_button[] = { 0 } }; +static const struct message_info msg_return_default_verification_unchecked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_return_default_verification_checked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_uncheck_verification[] = +{ + { TDM_CLICK_VERIFICATION, FALSE, 0 }, + { 0 } +}; + +static const struct message_info msg_return_verification_unchecked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_uncheck_verification }, + { TDN_VERIFICATION_CLICKED, FALSE, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static const struct message_info msg_check_verification[] = +{ + { TDM_CLICK_VERIFICATION, TRUE, 0 }, + { 0 } +}; + +static const struct message_info msg_return_verification_checked[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_check_verification }, + { TDN_VERIFICATION_CLICKED, TRUE, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -239,17 +281,18 @@ static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct msg->stage = 0; } -#define run_test(info, expect_button, expect_radio_button, seq, context) \ - run_test_(info, expect_button, expect_radio_button, seq, context, \ - ARRAY_SIZE(seq) - 1, __FILE__, __LINE__) +#define run_test(info, expect_button, expect_radio_button, verification_checked, seq, context) \ + run_test_(info, expect_button, expect_radio_button, verification_checked, seq, context, \ + ARRAY_SIZE(seq) - 1, __FILE__, __LINE__) -static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio_button, +static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio_button, BOOL verification_checked, const struct message_info *test_messages, const char *context, int test_messages_len, const char *file, int line) { struct message *msg, *msg_start; int ret_button = 0; int ret_radio = 0; + BOOL ret_verification = FALSE; HRESULT hr; int i; @@ -266,7 +309,7 @@ static void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radi current_message_info = test_messages; flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, NULL); + hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, &ret_verification); ok_(file, line)(hr == S_OK, "TaskDialogIndirect() failed, got %#x.\n", hr); ok_sequence_(sequences, TASKDIALOG_SEQ_INDEX, msg_start, context, FALSE, file, line); @@ -331,7 +374,7 @@ static void test_callback(void) info.pfCallback = taskdialog_callback_proc; info.lpCallbackData = test_ref_data; - run_test(&info, IDOK, 0, msg_return_press_ok, "Press VK_RETURN."); + run_test(&info, IDOK, 0, FALSE, msg_return_press_ok, "Press VK_RETURN."); } static void test_buttons(void) @@ -376,16 +419,16 @@ static void test_buttons(void) info.nDefaultButton = 0; /* Should default to first created button */ info.dwCommonButtons = TDCBF_OK_BUTTON | TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDOK, 0, msg_return_press_ok, "default button: unset default"); + run_test(&info, IDOK, 0, FALSE, msg_return_press_ok, "default button: unset default"); info.dwCommonButtons = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDYES, 0, msg_return_press_yes, "default button: unset default"); + run_test(&info, IDYES, 0, FALSE, msg_return_press_yes, "default button: unset default"); info.dwCommonButtons = TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDNO, 0, msg_return_press_no, "default button: unset default"); + run_test(&info, IDNO, 0, FALSE, msg_return_press_no, "default button: unset default"); info.dwCommonButtons = TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDRETRY, 0, msg_return_press_retry, "default button: unset default"); + run_test(&info, IDRETRY, 0, FALSE, msg_return_press_retry, "default button: unset default"); info.dwCommonButtons = TDCBF_CANCEL_BUTTON | TDCBF_CLOSE_BUTTON; - run_test(&info, IDCANCEL, 0, msg_return_press_cancel, "default button: unset default"); + run_test(&info, IDCANCEL, 0, FALSE, msg_return_press_cancel, "default button: unset default"); /* Custom buttons could be command links */ for (i = 0; i < ARRAY_SIZE(command_link_flags); i++) @@ -396,30 +439,30 @@ static void test_buttons(void) info.nDefaultButton = 0xff; /* Random ID, should also default to first created button */ info.cButtons = TEST_NUM_BUTTONS; info.pButtons = custom_buttons; - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, with common buttons - 1"); info.nDefaultButton = -1; /* Should work despite button ID -1 */ - run_test(&info, -1, 0, msg_return_press_custom10, "default button: invalid default, with common buttons - 2"); + run_test(&info, -1, 0, FALSE, msg_return_press_custom10, "default button: invalid default, with common buttons - 2"); info.nDefaultButton = -2; /* Should also default to first created button */ - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, with common buttons - 3"); /* Test with only custom buttons and invalid default ID */ info.dwCommonButtons = 0; - run_test(&info, ID_START_BUTTON, 0, msg_return_press_custom1, + run_test(&info, ID_START_BUTTON, 0, FALSE, msg_return_press_custom1, "default button: invalid default, no common buttons"); /* Test with common and custom buttons and valid default ID */ info.dwCommonButtons = TDCBF_OK_BUTTON | TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CLOSE_BUTTON; info.nDefaultButton = IDRETRY; - run_test(&info, IDRETRY, 0, msg_return_press_retry, "default button: valid default - 1"); + run_test(&info, IDRETRY, 0, FALSE, msg_return_press_retry, "default button: valid default - 1"); /* Test with common and custom buttons and valid default ID */ info.nDefaultButton = ID_START_BUTTON + 3; - run_test(&info, ID_START_BUTTON + 3, 0, msg_return_press_custom4, "default button: valid default - 2"); + run_test(&info, ID_START_BUTTON + 3, 0, FALSE, msg_return_press_custom4, "default button: valid default - 2"); } /* Test radio buttons */ @@ -431,44 +474,52 @@ static void test_buttons(void) info.pRadioButtons = radio_buttons; /* Test default first radio button */ - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_default_radio_button_1, "default radio button: default first radio button"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_default_radio_button_1, + "default radio button: default first radio button"); /* Test default radio button */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_default_radio_button_2, "default radio button: default radio button"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_default_radio_button_2, + "default radio button: default radio button"); /* Test default radio button with -2 */ info.nDefaultRadioButton = -2; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_default_radio_button_3, "default radio button: default radio button with id -2"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_default_radio_button_3, + "default radio button: default radio button with id -2"); /* Test default radio button after clicking the first, messages still work even radio button is disabled */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_first_radio_button, "default radio button: radio button after clicking"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_first_radio_button, + "default radio button: radio button after clicking"); /* Test radio button after disabling and clicking the first */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON + 1; - run_test(&info, IDOK, ID_START_RADIO_BUTTON, msg_return_default_radio_button_clicking_disabled, "default radio button: disable radio button before clicking"); + run_test(&info, IDOK, ID_START_RADIO_BUTTON, FALSE, msg_return_default_radio_button_clicking_disabled, + "default radio button: disable radio button before clicking"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set, TDN_RADIO_BUTTON_CLICKED will still be received, just radio button not selected */ info.nDefaultRadioButton = ID_START_RADIO_BUTTON; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, info.nDefaultRadioButton, msg_return_no_default_radio_button_flag, "default radio button: no default radio flag"); + run_test(&info, IDOK, info.nDefaultRadioButton, FALSE, msg_return_no_default_radio_button_flag, + "default radio button: no default radio flag"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set and nDefaultRadioButton is 0. * TDN_RADIO_BUTTON_CLICKED will not be sent, and just radio button not selected */ info.nDefaultRadioButton = 0; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default radio id and flag"); + run_test(&info, IDOK, 0, FALSE, msg_return_no_default_radio_button_id_and_flag, + "default radio button: no default radio id and flag"); /* Test no default radio button, TDF_NO_DEFAULT_RADIO_BUTTON is set and nDefaultRadioButton is invalid. * TDN_RADIO_BUTTON_CLICKED will not be sent, and just radio button not selected */ info.nDefaultRadioButton = 0xff; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default flag, invalid id"); + run_test(&info, IDOK, 0, FALSE, msg_return_no_default_radio_button_id_and_flag, + "default radio button: no default flag, invalid id"); info.nDefaultRadioButton = 0; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; - run_test(&info, IDOK, -2, msg_return_press_negative_id_radio_button, + run_test(&info, IDOK, -2, FALSE, msg_return_press_negative_id_radio_button, "radio button: manually click radio button with negative id"); } @@ -481,7 +532,7 @@ static void test_help(void) info.lpCallbackData = test_ref_data; info.dwCommonButtons = TDCBF_OK_BUTTON; - run_test(&info, IDOK, 0, msg_got_tdn_help, "send f1"); + run_test(&info, IDOK, 0, FALSE, msg_got_tdn_help, "send f1"); } struct timer_notification_data @@ -601,6 +652,36 @@ static void test_progress_bar(void) pTaskDialogIndirect(&info, NULL, NULL, NULL); } +static void test_verification_box(void) +{ + TASKDIALOGCONFIG info = {0}; + WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + /* TDF_VERIFICATION_FLAG_CHECKED works even if pszVerificationText is not set */ + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_unchecked, "default verification box: unchecked"); + + info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_checked, "default verification box: checked"); + + info.pszVerificationText = textW; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_unchecked, "default verification box: unchecked"); + + info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + run_test(&info, IDOK, 0, FALSE, msg_return_default_verification_checked, "default verification box: checked"); + + run_test(&info, IDOK, 0, FALSE, msg_return_verification_unchecked, + "default verification box: default checked and then unchecked"); + + info.dwFlags = 0; + run_test(&info, IDOK, 0, FALSE, msg_return_verification_checked, + "default verification box: default unchecked and then checked"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -640,6 +721,7 @@ START_TEST(taskdialog) test_help(); test_timer(); test_progress_bar(); + test_verification_box(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH v2 3/6] comctl32/taskdialog: Add support for expando button.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 4 + dlls/comctl32/comctl32.rc | 6 ++ dlls/comctl32/taskdialog.c | 163 ++++++++++++++++++++++++++++++++++++- 3 files changed, 170 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index eef2072e18..67da0e1677 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -107,6 +107,10 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDS_BUTTON_CANCEL 3004 #define IDS_BUTTON_CLOSE 3005 +/* Task dialog expando control default text */ +#define IDS_TD_EXPANDED 3020 +#define IDS_TD_COLLAPSED 3021 + #define WM_SYSTIMER 0x0118 enum combobox_state_flags diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index cea815a347..3f8e148bfa 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -56,6 +56,12 @@ STRINGTABLE IDS_BUTTON_CLOSE "&Close" } +STRINGTABLE +{ + IDS_TD_EXPANDED "Hide details" + IDS_TD_COLLAPSED "See details" +} + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Properties for %s" diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index db278cac46..54ad58b340 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -42,6 +42,8 @@ static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; +static const UINT DIALOG_EXPANDO_ICON_WIDTH = 10; +static const UINT DIALOG_EXPANDO_ICON_HEIGHT = 10; static const UINT DIALOG_TIMER_MS = 200; static const UINT ID_TIMER = 1; @@ -63,6 +65,7 @@ struct taskdialog_info HWND *command_links; INT command_link_count; HWND expanded_info; + HWND expando_button; HWND *buttons; INT button_count; HWND default_button; @@ -76,6 +79,8 @@ struct taskdialog_info } m; INT selected_radio_id; BOOL expanded; + WCHAR *expanded_text; + WCHAR *collapsed_text; }; struct button_layout_info @@ -85,6 +90,7 @@ struct button_layout_info }; static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); +static void taskdialog_layout(struct taskdialog_info *dialog_info); static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) { @@ -222,11 +228,25 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) +{ + dialog_info->expanded = !dialog_info->expanded; + ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); + taskdialog_layout(dialog_info); +} + static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) { INT command_id = GetWindowLongW(hwnd, GWLP_ID); HWND radio_button; + if (hwnd == dialog_info->expando_button) + { + taskdialog_toggle_expando_control(dialog_info); + taskdialog_notify(dialog_info, TDN_EXPANDO_BUTTON_CLICKED, dialog_info->expanded, 0); + return; + } + radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); if (radio_button) { @@ -357,6 +377,49 @@ static void taskdialog_get_radio_button_size(struct taskdialog_info *dialog_info ReleaseDC(hwnd, hdc); } +static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWND hwnd, SIZE *size) +{ + DWORD style = DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK; + HFONT hfont, old_hfont; + HDC hdc; + RECT rect = {0}; + LONG icon_width, icon_height, text_offset; + LONG max_width, max_text_height; + + hdc = GetDC(hwnd); + hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + old_hfont = SelectObject(hdc, hfont); + + icon_width = DIALOG_EXPANDO_ICON_WIDTH; + icon_height = DIALOG_EXPANDO_ICON_HEIGHT; + taskdialog_du_to_px(dialog_info, &icon_width, &icon_height); + + GetCharWidthW(hdc, '0', '0', &text_offset); + text_offset /= 2; + + if (dialog_info->taskconfig->dwFlags & TDF_RTL_LAYOUT) + style |= DT_RIGHT | DT_RTLREADING; + else + style |= DT_LEFT; + + max_width = DIALOG_MIN_WIDTH / 2; + taskdialog_du_to_px(dialog_info, &max_width, NULL); + + rect.right = max_width - icon_width - text_offset; + max_text_height = DrawTextW(hdc, dialog_info->expanded_text, -1, &rect, style); + size->cy = max(max_text_height, icon_height); + size->cx = rect.right - rect.left; + + rect.right = max_width - icon_width - text_offset; + max_text_height = DrawTextW(hdc, dialog_info->collapsed_text, -1, &rect, style); + size->cy = max(size->cy, max_text_height); + size->cx = max(size->cx, rect.right - rect.left); + size->cx = min(size->cx, max_width); + + if (old_hfont) SelectObject(hdc, old_hfont); + ReleaseDC(hwnd, hdc); +} + static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) { if (icon == TD_WARNING_ICON) @@ -544,6 +607,35 @@ static void taskdialog_add_expanded_info(struct taskdialog_info *dialog_info) ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); } +static void taskdialog_add_expando_button(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *textW; + + if (!taskconfig->pszExpandedInformation) return; + + if (!taskconfig->pszCollapsedControlText && !taskconfig->pszExpandedControlText) + { + dialog_info->expanded_text = taskdialog_gettext(dialog_info, FALSE, MAKEINTRESOURCEW(IDS_TD_EXPANDED)); + dialog_info->collapsed_text = taskdialog_gettext(dialog_info, FALSE, MAKEINTRESOURCEW(IDS_TD_COLLAPSED)); + } + else + { + textW = taskconfig->pszExpandedControlText ? taskconfig->pszExpandedControlText + : taskconfig->pszCollapsedControlText; + dialog_info->expanded_text = taskdialog_gettext(dialog_info, TRUE, textW); + textW = taskconfig->pszCollapsedControlText ? taskconfig->pszCollapsedControlText + : taskconfig->pszExpandedControlText; + dialog_info->collapsed_text = taskdialog_gettext(dialog_info, TRUE, textW); + } + + textW = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + + dialog_info->expando_button = CreateWindowW(WC_BUTTONW, textW, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_OWNERDRAW, 0, + 0, 0, 0, dialog_info->hwnd, 0, 0, 0); + SendMessageW(dialog_info->expando_button, WM_SETFONT, (WPARAM)dialog_info->font, 0); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -622,6 +714,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) LONG screen_width, dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; LONG main_icon_right, main_icon_bottom; + LONG expando_right, expando_bottom; struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; @@ -700,6 +793,19 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) dialog_height = max(dialog_height, main_icon_bottom); + expando_right = 0; + expando_bottom = dialog_height; + /* Expando control */ + if (dialog_info->expando_button) + { + x = h_spacing; + y = dialog_height + v_spacing; + taskdialog_get_expando_size(dialog_info, dialog_info->expando_button, &size); + SetWindowPos(dialog_info->expando_button, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + expando_right = x + size.cx; + expando_bottom = y + size.cy; + } + /* Common and custom buttons */ button_layout_infos = Alloc(dialog_info->button_count * sizeof(*button_layout_infos)); line_widths = Alloc(dialog_info->button_count * sizeof(*line_widths)); @@ -709,12 +815,13 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) taskdialog_du_to_px(dialog_info, &button_min_width, &button_height); for (i = 0; i < dialog_info->button_count; i++) { - taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - h_spacing * 2, &size, FALSE); + taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - expando_right - h_spacing * 2, + &size, FALSE); button_layout_infos[i].width = max(size.cx, button_min_width); } /* Separate buttons into lines */ - x = h_spacing; + x = expando_right + h_spacing; for (i = 0, line_count = 0; i < dialog_info->button_count; i++) { button_layout_infos[i].line = line_count; @@ -723,7 +830,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if ((i + 1 < dialog_info->button_count) && (x + button_layout_infos[i + 1].width + h_spacing >= dialog_width)) { - x = h_spacing; + x = expando_right + h_spacing; line_count++; } } @@ -778,6 +885,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) /* Add height for last row button and spacing */ dialog_height += size.cy + v_spacing; + dialog_height = max(dialog_height, expando_bottom); Free(button_layout_infos); Free(line_widths); @@ -802,6 +910,41 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) SetWindowPos(dialog_info->hwnd, 0, 0, 0, dialog_width, dialog_height, SWP_NOMOVE | SWP_NOZORDER); } +static void taskdialog_draw_expando_control(struct taskdialog_info *dialog_info, LPDRAWITEMSTRUCT dis) +{ + HWND hwnd; + HDC hdc; + RECT rect = {0}; + WCHAR *text; + LONG icon_width, icon_height, text_offset; + UINT style = DFCS_FLAT; + BOOL draw_focus; + + hdc = dis->hDC; + hwnd = dis->hwndItem; + + SendMessageW(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + + icon_width = DIALOG_EXPANDO_ICON_WIDTH; + icon_height = DIALOG_EXPANDO_ICON_HEIGHT; + taskdialog_du_to_px(dialog_info, &icon_width, &icon_height); + rect.right = icon_width; + rect.bottom = icon_height; + style |= dialog_info->expanded ? DFCS_SCROLLUP : DFCS_SCROLLDOWN; + DrawFrameControl(hdc, &rect, DFC_SCROLL, style); + + GetCharWidthW(hdc, '0', '0', &text_offset); + text_offset /= 2; + + rect = dis->rcItem; + rect.left += icon_width + text_offset; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + DrawTextW(hdc, text, -1, &rect, DT_WORDBREAK | DT_END_ELLIPSIS | DT_EXPANDTABS); + + draw_focus = (dis->itemState & ODS_FOCUS) && !(dis->itemState & ODS_NOFOCUSRECT); + if(draw_focus) DrawFocusRect(hdc, &rect); +} + static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -839,6 +982,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_progress_bar(dialog_info); taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); + taskdialog_add_expando_button(dialog_info); taskdialog_add_buttons(dialog_info); /* Set default button */ @@ -860,6 +1004,8 @@ static void taskdialog_destroy(struct taskdialog_info *dialog_info) Free(dialog_info->buttons); Free(dialog_info->radio_buttons); Free(dialog_info->command_links); + Free(dialog_info->expanded_text); + Free(dialog_info->collapsed_text); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -959,6 +1105,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } return FALSE; } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; + if (dis->hwndItem == dialog_info->expando_button) + { + taskdialog_draw_expando_control(dialog_info, dis); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, TRUE); + break; + } + return FALSE; + } case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); -- 2.18.0

2 1

[PATCH v2 2/6] comctl32/taskdialog: Add support for expanded information.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1c32a4b3fa..db278cac46 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -62,6 +62,7 @@ struct taskdialog_info INT radio_button_count; HWND *command_links; INT command_link_count; + HWND expanded_info; HWND *buttons; INT button_count; HWND default_button; @@ -74,6 +75,7 @@ struct taskdialog_info LONG v_spacing; } m; INT selected_radio_id; + BOOL expanded; }; struct button_layout_info @@ -530,6 +532,18 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) } } +static void taskdialog_add_expanded_info(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + + if (!taskconfig->pszExpandedInformation) return; + + dialog_info->expanded = taskconfig->dwFlags & TDF_EXPANDED_BY_DEFAULT; + dialog_info->expanded_info = taskdialog_create_label(dialog_info, taskconfig->pszExpandedInformation, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); + ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -644,6 +658,11 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) /* Content */ taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height, syslink); + /* Expanded information */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, main_icon_right, dialog_width, &dialog_height, + syslink); + /* Progress bar */ if (dialog_info->progress_bar) { @@ -763,6 +782,10 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Expanded information */ + if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); + /* Add height for spacing, title height and frame height */ dialog_height += v_spacing; dialog_height += GetSystemMetrics(SM_CYCAPTION); @@ -812,6 +835,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_main_icon(dialog_info); taskdialog_add_main_instruction(dialog_info); taskdialog_add_content(dialog_info); + taskdialog_add_expanded_info(dialog_info); taskdialog_add_progress_bar(dialog_info); taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); @@ -926,7 +950,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR { PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; - if ((taskdialog_hyperlink_enabled(dialog_info)) && (hwndFrom == dialog_info->content) + if ((taskdialog_hyperlink_enabled(dialog_info)) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl); -- 2.18.0

2 1

[PATCH v2 1/6] comctl32/taskdialog: Use window handle to identify control internally.
by Zhiyi Zhang 19 Jul '18

19 Jul '18

Use window handle to identify control when handling BN_CLICKED notification to support buttons with id larger than 0xFFFF. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 20 ++++++++++++++------ dlls/comctl32/tests/taskdialog.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 856a0b39bf..1c32a4b3fa 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -82,6 +82,8 @@ struct button_layout_info LONG line; }; +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); + static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) { if (width) *width = MulDiv(*width, dialog_info->m.x_baseunit, 4); @@ -191,6 +193,13 @@ static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, if (hwnd) EnableWindow(hwnd, enable); } +static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -211,8 +220,9 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, INT command_id) +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) { + INT command_id = GetWindowLongW(hwnd, GWLP_ID); HWND radio_button; radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); @@ -389,7 +399,6 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; HWND default_button; - INT id; if (!dialog_info->radio_button_count) return; @@ -402,8 +411,7 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo if (default_button) { SendMessageW(default_button, BM_SETCHECK, BST_CHECKED, 0); - id = GetWindowLongW(default_button, GWLP_ID); - taskdialog_on_button_click(dialog_info, id); + taskdialog_on_button_click(dialog_info, default_button); } } @@ -844,7 +852,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { case TDM_CLICK_BUTTON: - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_click_button(dialog_info, wParam); break; case TDM_ENABLE_BUTTON: taskdialog_enable_button(dialog_info, wParam, lParam); @@ -899,7 +907,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_on_button_click(dialog_info, (HWND)lParam); break; } return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 33d3757308..7fb8f3dcfc 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -215,6 +215,20 @@ static const struct message_info msg_return_no_default_radio_button_id_and_flag[ { 0 } }; +static const struct message_info msg_select_negative_id_radio_button[] = +{ + { TDM_CLICK_RADIO_BUTTON, -2, 0 }, + { 0 } +}; + +static const struct message_info msg_return_press_negative_id_radio_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_select_negative_id_radio_button }, + { TDN_RADIO_BUTTON_CLICKED, -2, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -451,6 +465,11 @@ static void test_buttons(void) info.nDefaultRadioButton = 0xff; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default flag, invalid id"); + + info.nDefaultRadioButton = 0; + info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; + run_test(&info, IDOK, -2, msg_return_press_negative_id_radio_button, + "radio button: manually click radio button with negative id"); } static void test_help(void) -- 2.18.0

2 1

[PATCH 2/2] msvcp60: Don't set failbit in basic_istream::tellg
by Piotr Caban 19 Jul '18

19 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 5 ----- dlls/msvcp60/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] msvcp90: Don't set failbit in basic_istream::tellg
by Piotr Caban 19 Jul '18

19 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42304 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/ios.c | 11 ----------- dlls/msvcp90/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-)

1 0

[PATCH] winegcc: Check also for unsuffixed lib/ dir in get_lib_dir.
by Jacek Caban 19 Jul '18

19 Jul '18

Wine uses lib/ and lib64/ by default. This fixes -m32 handling in such configuration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 4/4] libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL.
by Józef Kucia 19 Jul '18

19 Jul '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 8 +++++++- tests/d3d12.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 97d642a7cf91..0e2d422d216b 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -28,7 +28,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, TRACE("create_info %p, iid %s, device %p.\n", create_info, debugstr_guid(iid), device); - if (!create_info || !device) + if (!create_info) return E_INVALIDARG; if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) { @@ -76,6 +76,12 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (FAILED(hr)) return hr; + if (!device) + { + ID3D12Device_Release(&object->ID3D12Device_iface); + return S_FALSE; + } + return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6128a402d3a6..e2337c4427ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1080,6 +1080,9 @@ static void test_create_device(void) ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); ID3D12Device_Release(device); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_2, &IID_ID3D12Device, (void **)&device); -- 2.16.4

2 1