Changeset 10104 for trunk/src/user32/timer.cpp

Timestamp:

May 16, 2003, 12:59:28 PM (22 years ago)

Author:

sandervl

Message:

Handle WM_(SYS)TIMER timer calls in DispatchMessageA/W

File:

• trunk/src/user32/timer.cpp (modified) (5 diffs)

trunk/src/user32/timer.cpp

@@ -1 @@
-/* $Id: timer.cpp,v 1.15 2003-05-16 09:21:00 sandervl Exp $ */
+/* $Id: timer.cpp,v 1.16 2003-05-16 10:59:27 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #endif
 
-#define WM_TIMER_W    0x0113
-#define WM_SYSTIMER_W 0x0118
-typedef VOID (CALLBACK *TIMERPROC)(HWND hwnd, UINT msg, UINT id, DWORD dwTime);
-
 typedef struct tagTIMER
 {
@@ -68 +64 @@
 }
 
-BOOL TIMER_GetTimerInfo(HWND PMhwnd,ULONG PMid,PBOOL sys,PULONG id)
+BOOL TIMER_GetTimerInfo(HWND PMhwnd,ULONG PMid,PBOOL sys,PULONG id, PULONG proc)
 {
   int i;
   TIMER *pTimer;
 
+  EnterCriticalSection ();
   for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
       if (pTimer->inUse && (pTimer->PMhwnd == PMhwnd) && (pTimer->PMid == PMid))
           break;
+  LeaveCriticalSection();
 
   if (i == NB_TIMERS)  /* no matching timer found */
@@ -82 +80 @@
   *sys = pTimer->inUse == TIMER::SystemTimer;
   *id  = pTimer->id;
+  *proc = (ULONG)pTimer->proc;
 
   return TRUE;
 }
+
+/***********************************************************************
+ *           TIMER_IsTimerValid
+ */
+BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, ULONG proc )
+{
+    int i;
+    TIMER *pTimer;
+    BOOL ret = FALSE;
+
+    EnterCriticalSection ();
+
+    for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
+        if ((pTimer->hwnd == hwnd) && (pTimer->id == id) && (pTimer->proc == (TIMERPROC)proc))
+        {
+            ret = TRUE;
+            break;
+        }
+
+    LeaveCriticalSection();
+    return ret;
+}
+
 
 BOOL TIMER_HandleTimer (PQMSG pMsg)
@@ -93 +115 @@
     ULONG PMid   = (ULONG)(pMsg->mp1);
 
+    EnterCriticalSection ();
     for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
         if (pTimer->inUse && (pTimer->PMhwnd == PMhwnd) && (pTimer->PMid == PMid))
             break;
+    LeaveCriticalSection();
 
     if (i == NB_TIMERS)  /* no matching timer found */