Changeset 100609 in vbox for trunk/src/VBox

Timestamp:

Jul 17, 2023 4:45:11 PM (20 months ago)

Author:

vboxsync

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

158439

Message:

Shared Clipboard/Main + FE/Qt: Added clipboard error propagation from the host service via a newly added ClipboardErrorEvent. For that we now have a generic (private) Shared Clipboard handling class within Main, which does the HGCM service callback dispatching. The VRDP console object, which was in charge for this before, now is daisy-chained to this new class as a service extension. FE/QT in turn then shows the error(s) via the notification center [build fix]. bugref:9437

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/GuestShClPrivate.cpp (modified) (7 diffs)

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

@@ -1192 +1192 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD
-# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
     /* Service extension for the Shared Clipboard HGCM service. */
     HGCMSVCEXTHANDLE                    m_hHgcmSvcExtShCl;
-# endif
 #endif
 

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

@@ -91 +91 @@
 int GuestShCl::lock(void)
 {
-    int rc = RTCritSectEnter(&m_CritSect);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectEnter(&m_CritSect);
+    AssertRC(vrc);
+    return vrc;
 }
 
@@ -103 +103 @@
 int GuestShCl::unlock(void)
 {
-    int rc = RTCritSectLeave(&m_CritSect);
-    AssertRC(rc);
-    return rc;
+    int vrc = RTCritSectLeave(&m_CritSect);
+    AssertRC(vrc);
+    return vrc;
 }
 
@@ -117 +117 @@
 int GuestShCl::RegisterServiceExtension(PFNHGCMSVCEXT pfnExtension, void *pvExtension)
 {
+    AssertPtrReturn(pfnExtension, VERR_INVALID_POINTER);
+
     lock();
 
@@ -139 +141 @@
 int GuestShCl::UnregisterServiceExtension(PFNHGCMSVCEXT pfnExtension)
 {
+    AssertPtrReturn(pfnExtension, VERR_INVALID_POINTER);
+
     lock();
 
     PSHCLSVCEXT pExt = &this->m_SvcExtVRDP; /* Currently we only have one extension only. */
 
-    Assert(pExt->pfnExt);
-    Assert(pExt->pfnExt == pfnExtension);
+    AssertReturnStmt(pExt->pfnExt == pfnExtension, unlock(), VERR_INVALID_PARAMETER);
+    AssertPtr(pExt->pfnExt);
 
     RT_BZERO(pExt, sizeof(SHCLSVCEXT));
@@ -228 +232 @@
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     switch (u32Function)
@@ -235 +239 @@
         case VBOX_SHCL_GUEST_FN_REPLY:
         {
-            rc = pThis->reportError("foo", VERR_ADDRESS_CONFLICT, "bar");
+            vrc = pThis->reportError("foo", VERR_ADDRESS_CONFLICT, "bar");
             break;
         }
 # endif
         case VBOX_SHCL_GUEST_FN_ERROR:
-            rc = pThis->reportError("foo", VERR_ADDRESS_CONFLICT, "bar");
+            vrc = pThis->reportError("foo", VERR_ADDRESS_CONFLICT, "bar");
             break;
 
@@ -251 +255 @@
     if (pExt->pfnExt)
     {
-        int rc2 = pExt->pfnExt(pExt->pvExt, u32Function, pvParms, cbParms);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
+        int vrc2 = pExt->pfnExt(pExt->pvExt, u32Function, pvParms, cbParms);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc; /* Goes back to host service. */
+    LogFlowFuncLeaveRC(vrc);
+    return vrc; /* Goes back to host service. */
 }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD */