Changeset 100205 in vbox for trunk

Timestamp:

Jun 19, 2023 10:25:09 AM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Unified root list entry code to also use the generic list entry code, a lot of updates for the cross OS transfer handling code, more updates for HTTP server transfer handling. This also changed the handling of how that transfers are being initiated, as we needed to have this for X11: Before, transfers were initiated as soon as on side announced the URI list format -- now we postpone initiating the transfer until the receiving side requests the data as URI list [build fix]. ​bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (3 diffs)
• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)
• src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (4 diffs)
• src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (2 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -823 +823 @@
  * All callbacks are optional (hence all returning void).
  */
-typedef struct _SHCLTRANSFERCALLBACKTABLE
+typedef struct _SHCLTRANSFERCALLBACKS
 {
     /**
@@ -877 +877 @@
     /** Size (in bytes) of data pointer at \a pvUser. */
     size_t cbUser;
-} SHCLTRANSFERCALLBACKTABLE;
+} SHCLTRANSFERCALLBACKS;
 /** Pointer to a Shared Clipboard transfer callback table. */
-typedef SHCLTRANSFERCALLBACKTABLE *PSHCLTRANSFERCALLBACKS;
+typedef SHCLTRANSFERCALLBACKS *PSHCLTRANSFERCALLBACKS;
 
 /**
@@ -945 +945 @@
     SHCLTRANSFERCALLBACKCTX   CallbackCtx;
     /** The transfer's callback table. */
-    SHCLTRANSFERCALLBACKTABLE Callbacks;
+    SHCLTRANSFERCALLBACKS     Callbacks;
     /** Opaque pointer to implementation-specific parameters. */
     void                     *pvUser;

trunk/include/VBox/VBoxGuestLib.h

@@ -605 +605 @@
     uint32_t                    cbMaxChunkSize;
     /** Optional callbacks to invoke. */
-    SHCLTRANSFERCALLBACKTABLE   Callbacks;
+    SHCLTRANSFERCALLBACKS       Callbacks;
 } VBGLR3SHCLTRANSFERCTX;
 /** Pointer to a Shared Clipboard transfer context. */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -218 +218 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnStart
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnStart
  *
  * Called from VbglR3 (main thread) to notify the IDataObject.
@@ -268 +268 @@
 }
 
-/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnCompleted */
+/** @copydoc SHCLTRANSFERCALLBACKS::pfnOnCompleted */
 static DECLCALLBACK(void) vbtrShClTransferCompletedCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx, int rcCompletion)
 {
@@ -280 +280 @@
 }
 
-/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnError */
+/** @copydoc SHCLTRANSFERCALLBACKS::pfnOnError */
 static DECLCALLBACK(void) vbtrShClTransferErrorCallback(PSHCLTRANSFERCALLBACKCTX pCbCtx, int rcError)
 {
@@ -647 +647 @@
                     rc = SharedClipboardWinTransferCreateAndSetDataObject(pWinCtx, pCtx, &Callbacks);
                 }
+#else
+                RT_NOREF(rc);
 #endif
             }

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp

@@ -105 +105 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnRegistered
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnRegistered
  *
  * This starts the HTTP server if not done yet and registers the transfer with it.
@@ -166 +166 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnUnregistered
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnUnregistered
  *
  * Unregisters a (now) unregistered transfer from the HTTP server.
@@ -179 +179 @@
 
 /**
- * @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnCompleted
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnCompleted
  *
  * Unregisters a complete transfer from the HTTP server.
@@ -191 +191 @@
 }
 
-/** @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnError
+/** @copydoc SHCLTRANSFERCALLBACKS::pfnOnError
  *
  * Unregisters a failed transfer from the HTTP server.

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -41 +41 @@
 
 #include <iprt/asm.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h>
 #include <iprt/path.h>
 #include <iprt/semaphore.h>
@@ -1173 +1173 @@
     return rc2;
 }
-

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -1440 +1440 @@
     }
     else /* Unset */
-        RT_BZERO(pCallbacksDst, sizeof(SHCLTRANSFERCALLBACKTABLE));
+        RT_BZERO(pCallbacksDst, sizeof(SHCLTRANSFERCALLBACKS));
 }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -187 +187 @@
     SHCLTRANSFERCTX             Ctx;
     /** Transfers callbacks to use. */
-    SHCLTRANSFERCALLBACKTABLE   Callbacks;
+    SHCLTRANSFERCALLBACKS       Callbacks;
 } SHCLIENTTRANSFERS, *PSHCLIENTTRANSFERS;
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -228 +228 @@
 }
 
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 /**
- * @copydoc SHCLTRANSFERCALLBACKTABLE::pfnOnStart
+ * @copydoc SHCLTRANSFERCALLBACKS::pfnOnStart
  *
  * Called on transfer start to notify the "in-flight" IDataObject about a started transfer.
@@ -271 +273 @@
     LogFlowFunc(("LEAVE: idTransfer=%RU32, rc=%Rrc\n", ShClTransferGetID(pTransfer), rc));
 }
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
 static LRESULT CALLBACK vboxClipboardSvcWinWndProcMain(PSHCLCONTEXT pCtx,
@@ -1004 +1007 @@
 }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
-