Zhiyi Zhang : comctl32/taskdialog: Add taskdialog_destroy().

[Alexandre Julliard]

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

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Tue Jun 12 12:10:20 2018 +0800

comctl32/taskdialog: Add taskdialog_destroy().

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 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c
index 7424467..549c7f2 100644
--- a/dlls/comctl32/taskdialog.c
+++ b/dlls/comctl32/taskdialog.c
@@ -573,6 +573,12 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd)
     taskdialog_set_main_instruction_font(dialog_info);
 }
 
+static void taskdialog_destroy(struct taskdialog_info *dialog_info)
+{
+    if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER);
+    if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font);
+}
+
 static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0};
@@ -618,10 +624,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
         case WM_DESTROY:
             taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0);
             RemovePropW(hwnd, taskdialog_info_propnameW);
-            if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER)
-                KillTimer(hwnd, ID_TIMER);
-            if (dialog_info->main_instruction_font)
-                DeleteObject(dialog_info->main_instruction_font);
+            taskdialog_destroy(dialog_info);
             break;
         default:
             return FALSE;