Changeset 6933 for trunk/src/winmm/time.cpp

Timestamp:

Oct 3, 2001, 3:47:59 PM (24 years ago)

Author:

sandervl

Message:

prevent multiple delete actions for the same timer

File:

• trunk/src/winmm/time.cpp (modified) (6 diffs)

trunk/src/winmm/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.13 2001-09-16 19:27:25 phaller Exp $ */
+/* $Id: time.cpp,v 1.14 2001-10-03 13:47:59 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include <odinwrap.h>
 #include <misc.h>
+#include <handlemanager.h>
 
 #include "os2timer.h"
@@ -138 +139 @@
               UINT,     IDEvent)
 {
-  dprintf(("WINMM:timeKillEvent\n"));
-
+  OS2Timer *os2timer = NULL;
+
+  if(HMHandleTranslateToOS2(IDEvent, (PULONG)&os2timer) != NO_ERROR) {
+      dprintf(("invalid timer id"));
+      return TIMERR_NOERROR; //TODO: should we return an error here??
+  }
+  HMHandleFree(IDEvent);
   // return OS2Timer::killEvent(UINT IDEvent)
 
-  delete((OS2Timer *)IDEvent);
+  delete os2timer;
   return TIMERR_NOERROR;
 }
@@ -167 +173 @@
 {
   OS2Timer *timer;
+  ULONG     timerID = 0;
 
 // @@@PH 1999/10/26 hack for RA95
@@ -200 +207 @@
       return(0);
 
+  if(HMHandleAllocate(&timerID, (ULONG)timer) != NO_ERROR) {
+      dprintf(("HMHandleAllocate failed!!"));
+      delete timer;
+      return 0;
+  }
+
+  timer->setTimerID(timerID);
   if(timer->StartTimer(wDelay, wResolution, lptc, dwUser, fuEvent) == FALSE)
   {
@@ -206 +220 @@
     return(0);
   }
-  return(MMRESULT)timer;
+  return(MMRESULT)timerID;
 }