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

Timestamp:

Oct 23, 1999, 6:45:24 PM (26 years ago)

Author:

cbratschi

Message:

GetSystemMetrics, timer and scrollbar fixes

File:

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

trunk/src/user32/timer.cpp

@@ -1 @@
-/* $Id: timer.cpp,v 1.5 1999-10-22 18:11:47 sandervl Exp $ */
+/* $Id: timer.cpp,v 1.6 1999-10-23 16:45:21 cbratschi Exp $ */
 
 /*
@@ -27 +27 @@
 #endif
 
-#define WM_TIMER_W 0x0113
+#define WM_TIMER_W    0x0113
+#define WM_SYSTIMER_W 0x0118
 typedef VOID (CALLBACK *TIMERPROC)(HWND hwnd, UINT msg, UINT id, DWORD dwTime);
 
@@ -62 +63 @@
 }
 
+BOOL TIMER_GetTimerInfo(HWND PMhwnd,ULONG PMid,PBOOL sys,PULONG id)
+{
+  int i;
+  TIMER *pTimer;
+
+  for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
+      if (pTimer->inUse && (pTimer->PMhwnd == PMhwnd) && (pTimer->PMid == PMid))
+          break;
+
+  if (i == NB_TIMERS)  /* no matching timer found */
+      return (FALSE);  /* forward message */
+
+  *sys = pTimer->inUse == TIMER::SystemTimer;
+  *id  = pTimer->id;
+
+  return TRUE;
+}
+
 BOOL TIMER_HandleTimer (PQMSG pMsg)
 {
@@ -76 +95 @@
         return (FALSE);  /* forward message */
 
-    pMsg->mp1 = MPFROMLONG (pTimer->id);
     pMsg->mp2 = MPFROMLONG (TRUE);   /* mark for Win32 */
     if (!pTimer->proc)
@@ -82 +100 @@
 
     if (!WinInSendMsg (GetThreadHAB()))
-        pTimer->proc (pTimer->hwnd, WM_TIMER_W, pTimer->id, pMsg->time);
+        pTimer->proc (pTimer->hwnd, (pTimer->inUse == TIMER::SystemTimer) ? WM_SYSTIMER_W:WM_TIMER_W, pTimer->id, pMsg->time);
 
     return (TRUE);
@@ -100 +118 @@
 
     for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
-        if (pTimer->inUse && (pTimer->hwnd == hwnd) && (pTimer->id == id))
+        if (pTimer->inUse && (pTimer->hwnd == hwnd) && (pTimer->id == id) && ((sys && pTimer->inUse == TIMER::SystemTimer) || !sys))
             break;
 
@@ -151 +169 @@
     for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
         if (pTimer->inUse &&
-            (pTimer->hwnd == hwnd) && (pTimer->id == id)) break;
+            (pTimer->hwnd == hwnd) && (pTimer->id == id) && ((sys && pTimer->inUse == TIMER::SystemTimer) || !sys)) break;
 
     if ((i >= NB_TIMERS) ||