Changeset 20923 in vbox for trunk

Timestamp:

Jun 25, 2009 11:21:35 AM (16 years ago)

Author:

vboxsync

Message:

semevent*-r0drv-nt.cpp: we've agreed that only the object is subject to the stack/swap warning when waiting in UserMode. The driver verifier concurs.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• semevent-r0drv-nt.cpp (modified) (2 diffs)
• semeventmulti-r0drv-nt.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp

@@ -136 +136 @@
     }
 
-#if 1
     /*
      * Wait for it.
@@ -151 +150 @@
         rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, WaitMode, fInterruptible, &Timeout);
     }
-#else
-    /*
-     * Wait for it.
-     *
-     * We default to UserMode here as the waits might be aborted due to process termination.
-     * @todo As far as I can tell this is currently safe as all calls are made on behalf of user threads.
-     */
-    NTSTATUS rcNt;
-    if (cMillies == RT_INDEFINITE_WAIT)
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, UserMode, fInterruptible, NULL);
-    else
-    {
-        /* Can't use the stack here as the wait is UserMode. */
-        PLARGE_INTEGER pTimeout = (PLARGE_INTEGER)RTMemAlloc(sizeof(*pTimeout));
-        if (!pTimeout)
-            return VERR_NO_MEMORY;
-
-        pTimeout->QuadPart = -(int64_t)cMillies * 10000;
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, UserMode, fInterruptible, pTimeout);
-        RTMemFree(pTimeout);
-    }
-#endif
     switch (rcNt)
     {

trunk/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp

@@ -143 +143 @@
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENTMULTI_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
 
-#if 1
     /*
      * Wait for it.
@@ -158 +157 @@
         rcNt = KeWaitForSingleObject(&pThis->Event, Executive, WaitMode, fInterruptible, &Timeout);
     }
-#else
-    /*
-     * Wait for it.
-     *
-     * We default to UserMode here as the waits might be aborted due to process termination.
-     * @todo As far as I can tell this is currently safe as all calls are made on behalf of user threads.
-     */
-    NTSTATUS rcNt;
-    if (cMillies == RT_INDEFINITE_WAIT)
-        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, UserMode, fInterruptible, NULL);
-    else
-    {
-        /* Can't use the stack here as the wait is UserMode. */
-        PLARGE_INTEGER pTimeout = (PLARGE_INTEGER)RTMemAlloc(sizeof(*pTimeout));
-        if (!pTimeout)
-            return VERR_NO_MEMORY;
-
-        pTimeout->QuadPart = -(int64_t)cMillies * 10000;
-        rcNt = KeWaitForSingleObject(&pThis->Event, Executive, UserMode, fInterruptible, pTimeout);
-        RTMemFree(pTimeout);
-    }
-#endif
     switch (rcNt)
     {