Changeset 100619 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 18, 2023 8:06:24 AM (20 months ago)

Author:

vboxsync

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

158450

Message:

Shared Clipboard: Made the Main host service dispatcher a bit more flexible so that it returns VERR_NOT_SUPPORTED if certain commands are not being handled. See comment(s) for details. bugref:9437

File:

• trunk/src/VBox/Main/src-client/GuestShClPrivate.cpp (modified) (4 diffs)

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

@@ -221 +221 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_SUPPORTED if the extension didn't handle the requested function. This will invoke the regular backend then.
  * @param   pvExtension         Pointer to service extension.
  * @param   u32Function         Callback HGCM message ID.
@@ -239 +240 @@
     /* pParms might be NULL, depending on the message. */
 
-    int vrc = VINF_SUCCESS;
+    int vrc;
 
     switch (u32Function)
@@ -250 +251 @@
 
         default:
+            vrc = VERR_NOT_SUPPORTED;
             break;
     }
@@ -255 +257 @@
     PSHCLSVCEXT const pExt = &pThis->m_SvcExtVRDP; /* Currently we have one extension only. */
 
-    if (pExt->pfnExt)
-    {
-        int vrc2 = pExt->pfnExt(pExt->pvExt, u32Function, pvParms, cbParms);
-        if (RT_SUCCESS(vrc))
-            vrc = vrc2;
-    }
+    if (pExt->pfnExt) /* Overwrite rc if we have an extension present. */
+        vrc = pExt->pfnExt(pExt->pvExt, u32Function, pvParms, cbParms);
 
     LogFlowFuncLeaveRC(vrc);