[PATCH 1/5] mshtml: Remember if timer was blocked.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---

Needed for next patch.
---
 dlls/mshtml/mshtml_private.h |  1 +
 dlls/mshtml/task.c           | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index d97a206b215..582cc109d31 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -1493,6 +1493,7 @@ typedef struct {
     struct list *pending_xhr_events_tail;
     struct wine_rb_tree session_storage_map;
     void *blocking_xhr;
+    BOOL timer_blocked;
 } thread_data_t;

thread_data_t *get_thread_data(BOOL);
diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c
index 49f76d101a9..9387a217109 100644
--- a/dlls/mshtml/task.c
+++ b/dlls/mshtml/task.c
@@ -112,6 +112,17 @@ static void release_task_timer(HWND thread_hwnd, task_timer_t *timer)
     free(timer);
 }

+static void unblock_timers(thread_data_t *thread_data)
+{
+    if(thread_data->timer_blocked && !list_empty(&thread_data->timer_list)) {
+        task_timer_t *timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry);
+        DWORD tc = GetTickCount();
+
+        thread_data->timer_blocked = FALSE;
+        SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time > tc ? timer->time - tc : 0, NULL);
+    }
+}
+
 void remove_target_tasks(LONG target)
 {
     thread_data_t *thread_data = get_thread_data(FALSE);
@@ -311,6 +322,8 @@ static LRESULT process_timer(void)
     assert(thread_data != NULL);

if(list_empty(&thread_data->timer_list) || thread_data->blocking_xhr) {
+        if(!list_empty(&thread_data->timer_list))
+            thread_data->timer_blocked = TRUE;
         KillTimer(thread_data->thread_hwnd, TIMER_ID);
         return 0;
     }
@@ -347,6 +360,8 @@ static LRESULT process_timer(void)
         IDispatch_Release(disp);
     }while(!list_empty(&thread_data->timer_list) && !thread_data->blocking_xhr);

+    if(!list_empty(&thread_data->timer_list))
+        thread_data->timer_blocked = TRUE;
     KillTimer(thread_data->thread_hwnd, TIMER_ID);
     return 0;
 }
@@ -484,10 +499,5 @@ void unblock_tasks_and_timers(thread_data_t *thread_data)
     if(!list_empty(&thread_data->event_task_list))
         PostMessageW(thread_data->thread_hwnd, WM_PROCESSTASK, 0, 0);

-    if(!thread_data->blocking_xhr && !list_empty(&thread_data->timer_list)) {
-        task_timer_t *timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry);
-        DWORD tc = GetTickCount();
-
-        SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time > tc ? timer->time - tc : 0, NULL);
-    }
+    unblock_timers(thread_data);
 }