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

Timestamp:

Jul 17, 2023 4:32:44 PM (21 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/src-client

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• ConsoleImplConfigX86.cpp (modified) (2 diffs)
• ConsoleVRDPServer.cpp (modified) (4 diffs)
• GuestShClPrivate.cpp (added)

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

@@ -90 +90 @@
 #ifdef VBOX_WITH_VIRT_ARMV8
 # include "ResourceStoreImpl.h"
+#endif
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# include "GuestShClPrivate.h"
 #endif
 #include "StringifyEnums.h"
@@ -5653 +5656 @@
         alock.release();
         ::FireCPUExecutionCapChangedEvent(mEventSource, aExecutionCap);
+    }
+
+    LogFlowThisFunc(("Leaving hrc=%#x\n", hrc));
+    return hrc;
+}
+
+/**
+ * Called by IInternalSessionControl::OnClipboardError().
+ *
+ * @note Locks this object for writing.
+ */
+HRESULT Console::i_onClipboardError(const Utf8Str &aId, const Utf8Str &aErrMsg, LONG aRc)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.hrc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT hrc = S_OK;
+
+    /* don't trigger the drag and drop mode change if the VM isn't running */
+    SafeVMPtrQuiet ptrVM(this);
+    if (ptrVM.isOk())
+    {
+        if (   mMachineState == MachineState_Running
+            || mMachineState == MachineState_Teleporting
+            || mMachineState == MachineState_LiveSnapshotting)
+        {
+        }
+        else
+            hrc = i_setInvalidMachineStateError();
+        ptrVM.release();
+    }
+
+    /* notify console callbacks on success */
+    if (SUCCEEDED(hrc))
+    {
+        alock.release();
+        ::FireClipboardErrorEvent(mEventSource, aId, aErrMsg, aRc);
     }
 
@@ -8945 +8989 @@
         alock.release();
 
-# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-        /** @todo Deregister area callbacks?   */
-# endif
+# ifdef VBOX_WITH_SHARED_CLIPBOARD
+        if (m_hHgcmSvcExtShCl)
+        {
+            HGCMHostUnregisterServiceExtension(m_hHgcmSvcExtShCl);
+            m_hHgcmSvcExtShCl = NULL;
+        }
+        GuestShCl::destroyInstance();
+#endif
+
 # ifdef VBOX_WITH_DRAG_AND_DROP
         if (m_hHgcmSvcExtDragAndDrop)

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

@@ -47 +47 @@
 #include "DisplayImpl.h"
 #include "NvramStoreImpl.h"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# include "GuestShClPrivate.h"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "GuestImpl.h"
@@ -3116 +3119 @@
                 AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial file transfers mode (%u): vrc=%Rrc\n",
                                                  fFileTransfersEnabled, vrc));
-
-                /** @todo Register area callbacks? (See also deregistration todo in Console::i_powerDown.) */
 # endif
+                GuestShCl::createInstance(this /* pConsole */);
+                vrc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtShCl, "VBoxSharedClipboard",
+                                                       &GuestShCl::hgcmDispatcher,
+                                                       GuestShClInst());
+                if (RT_FAILURE(vrc))
+                    Log(("Cannot register VBoxSharedClipboard extension, vrc=%Rrc\n", vrc));
             }
             else

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

@@ -32 +32 @@
 #include "ConsoleImpl.h"
 #include "DisplayImpl.h"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# include "GuestShClPrivate.h" /* For (un-)registering the service extension. */
+#endif
 #include "KeyboardImpl.h"
 #include "MouseImpl.h"
@@ -1346 +1349 @@
 
 ConsoleVRDPServer::ConsoleVRDPServer(Console *console)
-    : mhClipboard(NULL)
 {
     mConsole = console;
@@ -3412 +3414 @@
         if (mcClipboardRefs == 0)
         {
-            vrc = HGCMHostRegisterServiceExtension(&mhClipboard, "VBoxSharedClipboard", ClipboardServiceExtension, this);
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+            vrc = GuestShClInst()->RegisterServiceExtension(ClipboardServiceExtension, this /* pvExtension */);
             AssertRC(vrc);
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
         }
 
@@ -3433 +3437 @@
             mcClipboardRefs--;
 
-            if (mcClipboardRefs == 0 && mhClipboard)
-            {
-                HGCMHostUnregisterServiceExtension(mhClipboard);
-                mhClipboard = NULL;
+            if (mcClipboardRefs == 0)
+            {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+                GuestShClInst()->UnregisterServiceExtension(ClipboardServiceExtension);
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
             }
         }