Additions

Timestamp:

Jul 3, 2012 5:19:38 PM (12 years ago)

Author:

vboxsync

Message:

vbgl: close driver only when openned on uninit

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

-              r41852
+              r42004
     vbglTerminateCommon ();
+    vbglDriverClose(&g_vbgldata.driver);
+    /* driver open could fail, which does not prevent VbglInit from succeeding,
+     * close the driver only if it is opened */
+    if (vbglDriverIsOpened(&g_vbgldata.driver))
+        vbglDriverClose(&g_vbgldata.driver);
     RTSemFastMutexDestroy(g_vbgldata.mutexDriverInit);
     g_vbgldata.mutexDriverInit = NIL_RTSEMFASTMUTEX;

-              r33540
+              r42004
 # endif
+bool vbglDriverIsOpened (VBGLDRIVER *pDriver)
+{
+# ifdef RT_OS_WINDOWS
+    return pDriver->pFileObject != NULL;
+# elif defined (RT_OS_OS2)
+    return pDriver->u32Session != UINT32_MAX;
+# else
+    return pDriver->pvOpaque != NULL;
+# endif
+}
 int vbglDriverOpen (VBGLDRIVER *pDriver)
+{

-              r41430
+              r42004
 /**
+ * Answers whether the VBoxGuest driver is opened
+ *
+ * @param pDriver      Pointer to the driver structure.
+ *
+ * @return true - if opened, false - otherwise
+ */
+bool vbglDriverIsOpened (VBGLDRIVER *pDriver);
+/**
  * Call VBoxGuest driver.
+ *

Note: See TracChangeset for help on using the changeset viewer.