Changeset 31604 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 12, 2010 3:17:54 PM (14 years ago)

Author:

vboxsync

Message:

waitForEvents: Don't return None, another test.

File:

• trunk/src/VBox/Main/glue/vboxapi.py (modified) (3 diffs)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -271 +271 @@
     def waitForEvents(self, timeout):
         from win32api import GetCurrentThreadId
+        from win32con import INFINITE
         from win32event import MsgWaitForMultipleObjects, \
                                QS_ALLINPUT, WAIT_TIMEOUT, WAIT_OBJECT_0
         from pythoncom import PumpWaitingMessages
-
+        import types
+
+        if not isinstance(timeout, types.IntType):
+            raise TypeError("The timeout argument is not an integer")
         if (self.tid != GetCurrentThreadId()):
             raise Exception("wait for events from the same thread you inited!")
 
-        rc = MsgWaitForMultipleObjects(self.handles, 0, timeout, QS_ALLINPUT)
+        if timeout < 0:     cMsTimeout = INFINITE
+        else:               cMsTimeout = timeout
+        rc = MsgWaitForMultipleObjects(self.handles, 0, cMsTimeout, QS_ALLINPUT)
         if rc >= WAIT_OBJECT_0 and rc < WAIT_OBJECT_0+len(self.handles):
             # is it possible?
@@ -559 +565 @@
         Returns 1 if timed out or interrupted in some way.
         Returns 2 on error (like not supported for web services).
-        Returns None or raises an exception if called on the wrong thread or if
-        the timeout is not an integer value.
+
+        Raises an exception if the calling thread is not the main thread (the one
+        that initialized VirtualBoxManager) or if the time isn't an integer.
         """
         return self.platform.waitForEvents(timeout)
@@ -566 +573 @@
     def interruptWaitEvents(self):
         """
-
-
+        Interrupt a waitForEvents call.
+        This is normally called from a worker thread.
+
+        Returns True on success, False on failure.
         """
         return self.platform.interruptWaitEvents()