Changeset 17 for trunk/src/helpers/timer.c

Timestamp:

Dec 16, 2000, 10:09:53 PM (25 years ago)

Author:

umoeller

Message:

Miscellanous updates.

File:

• trunk/src/helpers/timer.c (modified) (6 diffs)

trunk/src/helpers/timer.c

@@ -73 +73 @@
 #define INCL_DOSMISC
 #define INCL_DOSERRORS
+
+#define INCL_WINMESSAGEMGR
 #include <os2.h>
 
@@ -151 +153 @@
     }
     else
-        brc = (DosRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT)
+        brc = (WinRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT)
                     == NO_ERROR);
     return (brc);
@@ -164 +166 @@
 {
     DosReleaseMutexSem(G_hmtxTimers);
-}
-
-/*
- *@@ tmrOnKill:
- *      on-kill proc for exception handlers.
- *
- *@@added V0.9.7 (2000-12-09) [umoeller]
- */
-
-VOID APIENTRY tmrOnKill(PEXCEPTIONREGISTRATIONRECORD2 pRegRec2)
-{
-    DosBeep(500, 500);
-    UnlockTimers();
 }
 
@@ -217 +206 @@
         ULONG ulNesting = 0;
 
+        ULONG ulTimeNow;
+
         DosSleep(ulInterval);
 
@@ -225 +216 @@
         ulInterval = 100;
 
+        DosEnterMustComplete(&ulNesting);
+
         TRY_LOUD(excpt1)
         {
-            DosEnterMustComplete(&ulNesting);
-
             fLocked = LockTimers();
             if (fLocked)
@@ -244 +235 @@
                     // we have timers:
                     BOOL      fFoundInvalid = FALSE;
+
+                    // get current time
+                    DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                                    &ulTimeNow, sizeof(ulTimeNow));
+
                     while (pTimerNode)
                     {
                         PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
-                        ULONG ulTimeNow;
-                        DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
-                                        &ulTimeNow, sizeof(ulTimeNow));
 
                         if (pTimer->ulNextFire < ulTimeNow)