Changeset 197 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jan 20, 2007 1:22:45 AM (18 years ago)

Author:

vboxsync

Message:

A stab at generic timers (untested).

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/timer-posix.cpp (modified) (2 diffs)
• win32/timer-win32.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/timer-posix.cpp

@@ -319 +319 @@
     LogFlow(("RTTimerDestroy: pTimer=%p\n", pTimer));
 
+    /* NULL is ok. */
+    if (!pTimer)
+        return VINF_SUCCESS;
+
     /*
      * Validate input.
      */
     int rc = VINF_SUCCESS;
-    if (pTimer)
+    if (VALID_PTR(pTimer))
     {
         /*
@@ -354 +358 @@
     else
     {
-        AssertMsgFailed(("An attempt was made to destroy a NULL timer!\n"));
-        rc = VERR_INVALID_POINTER;
+        AssertMsgFailed(("Bad pTimer pointer %p!\n", pTimer));
+        rc = VERR_INVALID_HANDLE;
     }
     return rc;

trunk/src/VBox/Runtime/r3/win32/timer-win32.cpp

@@ -412 +412 @@
 RTR3DECL(int)     RTTimerDestroy(PRTTIMER pTimer)
 {
+    /* NULL is ok. */
+    if (!pTimer)
+        return VINF_SUCCESS;
+
     /*
      * Validate handle first.
      */
     int rc;
-    if (pTimer && pTimer->u32Magic == RTTIMER_MAGIC)
+    if (    VALID_PTR(pTimer)
+        &&  pTimer->u32Magic == RTTIMER_MAGIC)
     {
 #ifdef USE_WINMM