From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 9 Oct 2008 20:33:50 +0000 (-0500)
Subject: mshtml: Don't use IDispatchEx for timer callbacks.
X-Git-Tag: wine-1.1.6~14
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=37b7a217f3e79d65d10ee12ee1d1d31bdf282e90;p=wine%2Feterwine.git

mshtml: Don't use IDispatchEx for timer callbacks.
---

diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c
index a1c8da9840..ffef5434ab 100644
--- a/dlls/mshtml/task.c
+++ b/dlls/mshtml/task.c
@@ -365,6 +365,20 @@ static void process_task(task_t *task)
     }
 }
 
+static void call_timer_disp(IDispatch *disp)
+{
+    DISPPARAMS dp = {NULL, NULL, 0, 0};
+    EXCEPINFO ei;
+    VARIANT res;
+    HRESULT hres;
+
+    V_VT(&res) = VT_EMPTY;
+    memset(&ei, 0, sizeof(ei));
+    hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL);
+    TRACE("ret %08x %s\n", hres, debugstr_variant(&res));
+    VariantClear(&res);
+}
+
 static LRESULT process_timer(void)
 {
     thread_data_t *thread_data = get_thread_data(TRUE);
@@ -395,7 +409,7 @@ static LRESULT process_timer(void)
             release_task_timer(thread_data->thread_hwnd, timer);
         }
 
-        call_disp_func(doc, disp);
+        call_timer_disp(disp);
 
         IDispatch_Release(disp);
     }