Changeset 100606 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 17, 2023 4:32:44 PM (20 months ago)

Author:

vboxsync

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

158436

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. bugref:9437

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (2 diffs)
• ConsoleVRDPServer.h (modified) (1 diff)
• GuestShClPrivate.h (added)

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

@@ -220 +220 @@
     HRESULT i_onCPUChange(ULONG aCPU, BOOL aRemove);
     HRESULT i_onCPUExecutionCapChange(ULONG aExecutionCap);
+    HRESULT i_onClipboardError(const Utf8Str &aId, const Utf8Str &aErrMsg, LONG aRc);
     HRESULT i_onClipboardModeChange(ClipboardMode_T aClipboardMode);
     HRESULT i_onClipboardFileTransferModeChange(bool aEnabled);
@@ -1190 +1191 @@
 #endif
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    /* Service extension for the Shared Clipboard HGCM service. */
+    HGCMSVCEXTHANDLE                    m_hHgcmSvcExtShCl;
+# endif
+#endif
+
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    HGCMSVCEXTHANDLE m_hHgcmSvcExtDragAndDrop;
-#endif
-
+    /* Service extension for the Drag'n Drop HGCM service. */
+    HGCMSVCEXTHANDLE                    m_hHgcmSvcExtDragAndDrop;
+#endif
     /** Pointer to the progress object of a live cancelable task.
      *

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

@@ -232 +232 @@
 
     int mcClipboardRefs;
-    HGCMSVCEXTHANDLE mhClipboard;
     PFNVRDPCLIPBOARDEXTCALLBACK mpfnClipboardCallback;