Zhiyi Zhang : comctl32/taskdialog: Fix id casting.

Alexandre Julliard julliard at winehq.org
Tue Oct 30 14:19:34 CDT 2018


Module: wine
Branch: master
Commit: dcd5a37b1c3801844f53fe6c1a8545a822e6aded
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dcd5a37b1c3801844f53fe6c1a8545a822e6aded

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Mon Oct 29 15:24:59 2018 +0800

comctl32/taskdialog: Fix id casting.

This fix tests on 64bit because id is a signed int.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/taskdialog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c
index 1d91e1d..9bfdef9 100644
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -666,7 +666,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info)
         textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText);
         dialog_info->radio_buttons[i] =
             CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd,
-                          ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL);
+                          LongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL);
         SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0);
         Free(textW);
     }
@@ -692,7 +692,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info)
         style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK;
         textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText);
         dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd,
-                                                      ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL);
+                                                      LongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL);
         SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0);
         Free(textW);
 




More information about the wine-cvs mailing list