Changeset 10104

Timestamp:

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

Author:

sandervl

Message:

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

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (5 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• timer.cpp (modified) (5 diffs)
• timer.h (modified) (2 diffs)
• windowmsg.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsg.cpp ¶

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.68 2003-04-11 14:22:05 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.69 2003-05-16 10:59:26 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -324 +324 @@
     {
         filtermin = TranslateWinMsg(uMsgFilterMin, TRUE);
-            filtermax = TranslateWinMsg(uMsgFilterMax, FALSE);
-            if(filtermin > filtermax) {
-                ULONG tmp = filtermin;
-                    filtermin = filtermax;
-                    filtermax = filtermin;
-            }
-        do {
-                eaten = FALSE;
-                rc = WinGetMsg(teb->o.odin.hab, &os2msg, 0, filtermin, filtermax);
-                if (os2msg.msg == WM_TIMER)
-                    eaten = TIMER_HandleTimer(&os2msg);
-                if (os2msg.msg == WM_QUIT && ((ULONG)os2msg.mp2 != 0) ) {
-                    // Don't return FALSE when the window list sends us
-                    // a WM_QUIT message, improper killing can lead to
-                    // application crashes.
-                    // In the WM_QUIT handler in pmwindow we send a WM_CLOSE
-                    // in this case. When the app calls PostQuitMessage (mp2 == 0),
-                    // then we handle it the normal way
-                    rc = 1;
-                }
-            }
-        while (eaten);
+        filtermax = TranslateWinMsg(uMsgFilterMax, FALSE);
+        if(filtermin > filtermax) {
+            ULONG tmp = filtermin;
+            filtermin = filtermax;
+            filtermax = filtermin;
+        }
+        rc = WinGetMsg(teb->o.odin.hab, &os2msg, 0, filtermin, filtermax);
+        if (os2msg.msg == WM_QUIT && ((ULONG)os2msg.mp2 != 0) ) {
+            // Don't return FALSE when the window list sends us
+            // a WM_QUIT message, improper killing can lead to
+            // application crashes.
+            // In the WM_QUIT handler in pmwindow we send a WM_CLOSE
+            // in this case. When the app calls PostQuitMessage (mp2 == 0),
+            // then we handle it the normal way
+            rc = 1;
+        }
     }
     if(OS2ToWinMsgTranslate((PVOID)teb, &os2msg, pMsg, isUnicode, MSG_REMOVE) == FALSE) {
@@ -483 +477 @@
             if(ulPMFilter) {
                 do {
-                    eaten = FALSE;
-
                     rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, ulPMFilter, ulPMFilter,
                                     (fRemove & PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
@@ -492 +484 @@
                        rc = 0;
                     }
-                    if (rc && (fRemove & PM_REMOVE_W) && os2msg.msg == WM_TIMER) {
-                        eaten = TIMER_HandleTimer(&os2msg);
-                    }
                 }
-                while (eaten && rc);
+                while (rc);
             }
             if(rc) {
@@ -504 +493 @@
     }
     else {
-        do {
-            eaten = FALSE;
-
-            rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, 0, 0, (fRemove & PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
-
-            if (rc && (fRemove & PM_REMOVE_W) && os2msg.msg == WM_TIMER) {
-                eaten = TIMER_HandleTimer(&os2msg);
-            }
-        }
-        while (eaten && rc);
+        rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, 0, 0, (fRemove & PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
     }
     if(rc == FALSE) {

trunk/src/user32/oslibmsgtranslate.cpp ¶

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.109 2003-04-11 17:26:11 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.110 2003-05-16 10:59:27 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -929 +929 @@
 //        {
           BOOL sys;
-          ULONG id;
-
-          if (TIMER_GetTimerInfo(os2Msg->hwnd,(ULONG)os2Msg->mp1,&sys,&id))
+          ULONG id, proc;
+
+          if (TIMER_GetTimerInfo(os2Msg->hwnd,(ULONG)os2Msg->mp1,&sys,&id, &proc))
           {
                 winMsg->wParam = (WPARAM)id;
+                winMsg->lParam = (LPARAM)proc;
                 winMsg->message= (sys) ? WINWM_SYSTIMER : WINWM_TIMER;
                 break;

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 */

trunk/src/user32/timer.h ¶

@@ -1 @@
-/* $Id: timer.h,v 1.5 2000-01-18 20:08:14 sandervl Exp $ */
+/* $Id: timer.h,v 1.6 2003-05-16 10:59:28 sandervl Exp $ */
 /*
  * public timer functions
@@ -14 +14 @@
 
 #ifndef INCL_TIMERWIN32
-extern BOOL TIMER_GetTimerInfo(HWND PMhwnd,ULONG PMid,PBOOL sys,PULONG id);
+extern BOOL TIMER_GetTimerInfo(HWND PMhwnd,ULONG PMid,PBOOL sys,PULONG id, PULONG proc);
 extern BOOL TIMER_HandleTimer (PQMSG pMsg);
 #endif
+extern BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, ULONG proc );
 extern VOID TIMER_KillTimerFromWindow(HWND hwnd);
 

trunk/src/user32/windowmsg.cpp ¶

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.41 2003-03-20 09:15:31 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.42 2003-05-16 10:59:28 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -32 +32 @@
 #include "oslibmsg.h"
 #include "hook.h"
+#define INCL_TIMERWIN32
+#include "timer.h"
 
 #define DBG_LOCALLOG    DBG_windowmsg
@@ -44 +46 @@
 {
     dprintf2(("DispatchMessageA %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
+
+    /* Process timer messages */
+    if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
+    {
+        if (msg->lParam)
+        {
+/*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
+
+            /* before calling window proc, verify whether timer is still valid;
+               there's a slim chance that the application kills the timer
+               between GetMessage and DispatchMessage API calls */
+            if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
+                return 0; /* invalid winproc */
+
+            return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
+                                   msg->message, msg->wParam, GetTickCount() );
+        }
+    }
+
     return OSLibWinDispatchMsg((MSG *)msg);
 }
@@ -51 +72 @@
 {
     dprintf2(("DispatchMessageW %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
+
+    /* Process timer messages */
+    if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
+    {
+        if (msg->lParam)
+        {
+/*            HOOK_CallHooks32A( WH_CALLWNDPROC, HC_ACTION, 0, FIXME ); */
+
+            /* before calling window proc, verify whether timer is still valid;
+               there's a slim chance that the application kills the timer
+               between GetMessage and DispatchMessage API calls */
+            if (!TIMER_IsTimerValid(msg->hwnd, (UINT) msg->wParam, msg->lParam))
+                return 0; /* invalid winproc */
+
+            return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
+                                   msg->message, msg->wParam, GetTickCount() );
+        }
+    }
     return OSLibWinDispatchMsg((MSG *)msg, TRUE);
 }