Changeset 78915 in vbox

Timestamp:

Jun 1, 2019 5:37:37 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131035

Message:

Main/src-client,Main/include: Unregister HGCM service extensions on shutdown instead of leaking the handle

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-client/VMMDevInterface.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -69 +69 @@
 #ifdef VBOX_WITH_GUEST_PROPS
 # include <VBox/HostServices/GuestPropertySvc.h>  /* For the property notification callback */
+#endif
+
+#if    defined(VBOX_WITH_GUEST_PROPS) || defined(VBOX_WITH_SHARED_CLIPBOARD) \
+    || defined(VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_DISABLED) || defined(VBOX_WITH_DRAG_AND_DROP)
+# include "HGCM.h" /** @todo It should be possible to register a service
+                    *        extension using a VMMDev callback. */
 #endif
 
@@ -1047 +1053 @@
     Bstr mstrUuid;
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_DISABLED
+    HGCMSVCEXTHANDLE m_hHgcmSvcExtShrdClipboard;
+#endif
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    HGCMSVCEXTHANDLE m_hHgcmSvcExtDragAndDrop;
+#endif
+
     /** Pointer to the progress object of a live cancelable task.
      *

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -8253 +8253 @@
         /* Leave the lock since EMT might wait for it and will call us back as addVMCaller() */
         alock.release();
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_DISABLED
+        if (m_hHgcmSvcExtShrdClipboard)
+        {
+            HGCMHostUnregisterServiceExtension(m_hHgcmSvcExtShrdClipboard);
+            m_hHgcmSvcExtShrdClipboard = NULL;
+        }
+#endif
+#ifdef VBOX_WITH_DRAG_AND_DROP
+        if (m_hHgcmSvcExtDragAndDrop)
+        {
+            HGCMHostUnregisterServiceExtension(m_hHgcmSvcExtDragAndDrop);
+            m_hHgcmSvcExtDragAndDrop = NULL;
+        }
+#endif
 
         m_pVMMDev->hgcmShutdown();

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -86 +86 @@
 # include <VBox/com/defs.h>
 # include <VBox/com/array.h>
-# include "HGCM.h" /** @todo It should be possible to register a service
-                    *        extension using a VMMDev callback. */
 # include <vector>
 #endif /* VBOX_WITH_GUEST_PROPS */
@@ -3096 +3094 @@
                 {
                     LogRel(("Shared Clipboard: Service loaded\n"));
-                    HGCMSVCEXTHANDLE hDummy;
-                    rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxSharedClipboard",
+                    rc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtShrdClipboard, "VBoxSharedClipboard",
                                                           &Console::i_sharedClipboardServiceCallback,
                                                           this /* pvExtension */);
@@ -3172 +3169 @@
             else
             {
-                HGCMSVCEXTHANDLE hDummy;
-                rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxDragAndDropSvc",
+                rc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtDragAndDrop, "VBoxDragAndDropSvc",
                                                       &GuestDnD::notifyDnDDispatcher,
                                                       GUESTDNDINST());

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -72 +72 @@
     /** Our HGCM connector interface. */
     PDMIHGCMCONNECTOR           HGCMConnector;
+#endif
+
+#ifdef VBOX_WITH_GUEST_PROPS
+    HGCMSVCEXTHANDLE            hHgcmSvcExtGstProps;
+#endif
+#ifdef VBOX_WITH_GUEST_CONTROL
+    HGCMSVCEXTHANDLE            hHgcmSvcExtGstCtrl;
 #endif
 } DRVMAINVMMDEV, *PDRVMAINVMMDEV;
@@ -728 +735 @@
 void VMMDev::hgcmShutdown(bool fUvmIsInvalid /*= false*/)
 {
+#ifdef VBOX_WITH_GUEST_PROPS
+    if (mpDrv->hHgcmSvcExtGstProps)
+    {
+        HGCMHostUnregisterServiceExtension(mpDrv->hHgcmSvcExtGstProps);
+        mpDrv->hHgcmSvcExtGstProps = NULL;
+    }
+#endif
+
+#ifdef VBOX_WITH_GUEST_CONTROL
+    if (mpDrv->hHgcmSvcExtGstCtrl)
+    {
+        HGCMHostUnregisterServiceExtension(mpDrv->hHgcmSvcExtGstCtrl);
+        mpDrv->hHgcmSvcExtGstCtrl = NULL;
+    }
+#endif
+
     if (ASMAtomicCmpXchgBool(&m_fHGCMActive, false, true))
         HGCMHostShutdown(fUvmIsInvalid);
@@ -839 +862 @@
     PDRVMAINVMMDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
     LogFlow(("VMMDev::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
+
+#ifdef VBOX_WITH_GUEST_PROPS
+    if (pThis->hHgcmSvcExtGstProps)
+    {
+        HGCMHostUnregisterServiceExtension(pThis->hHgcmSvcExtGstProps);
+        pThis->hHgcmSvcExtGstProps = NULL;
+    }
+#endif
+
+#ifdef VBOX_WITH_GUEST_CONTROL
+    if (pThis->hHgcmSvcExtGstCtrl)
+    {
+        HGCMHostUnregisterServiceExtension(pThis->hHgcmSvcExtGstCtrl);
+        pThis->hHgcmSvcExtGstCtrl = NULL;
+    }
+#endif
 
     if (pThis->pVMMDev)
@@ -1008 +1047 @@
      * Register the host notification callback
      */
-    HGCMSVCEXTHANDLE hDummy;
-    HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestPropSvc", Console::i_doGuestPropNotification, ptrConsole.m_p);
+    HGCMHostRegisterServiceExtension(&mpDrv->hHgcmSvcExtGstProps, "VBoxGuestPropSvc", Console::i_doGuestPropNotification, ptrConsole.m_p);
 
 # ifdef VBOX_WITH_GUEST_PROPS_RDONLY_GUEST
@@ -1136 +1174 @@
     if (RT_SUCCESS(rc))
     {
-        HGCMSVCEXTHANDLE hDummy;
-        rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestControlSvc",
+        rc = HGCMHostRegisterServiceExtension(&pThis->hHgcmSvcExtGstCtrl, "VBoxGuestControlSvc",
                                               &Guest::i_notifyCtrlDispatcher,
                                               pThis->pVMMDev->mParent->i_getGuest());