Jacek Caban : mshtml: Use task destructor for set_downloading task.
Alexandre Julliard
julliard at winehq.org
Wed Aug 3 12:48:12 CDT 2011
Module: wine
Branch: master
Commit: 923484bd7caadfbffe03d5b880b50a6752b4c42f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=923484bd7caadfbffe03d5b880b50a6752b4c42f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Aug 3 12:36:41 2011 +0200
mshtml: Use task destructor for set_downloading task.
---
dlls/mshtml/persist.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index a8f6834..a299be2 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -166,7 +166,6 @@ static void set_downloading_proc(task_t *_task)
TRACE("(%p)\n", doc);
set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url);
- CoTaskMemFree(task->url);
if(task->set_download)
set_download_state(doc, 1);
@@ -188,6 +187,14 @@ static void set_downloading_proc(task_t *_task)
}
}
+static void set_downloading_task_destr(task_t *_task)
+{
+ download_proc_task_t *task = (download_proc_task_t*)_task;
+
+ CoTaskMemFree(task->url);
+ heap_free(task);
+}
+
void prepare_for_binding(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL navigated_binding)
{
HRESULT hres;
@@ -303,7 +310,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel
download_task->doc = This->doc_obj;
download_task->set_download = set_download;
download_task->url = url;
- push_task(&download_task->header, set_downloading_proc, NULL, This->doc_obj->basedoc.task_magic);
+ push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic);
return S_OK;
}
More information about the wine-cvs
mailing list