Changeset 97282 in vbox for trunk/src/VBox

Timestamp:

Oct 24, 2022 4:24:15 PM (2 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Service: Factored out and renamed vboxClipboardSvcWinDataSet() into common Shared Clipboard Windows code to SharedClipboardWinDataWrite(), to also make use of such basic functionality in i.e. the unit tests.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (2 diffs)

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

@@ -937 +937 @@
 }
 
+/**
+ * Writes (places) clipboard data into the Windows clipboard.
+ *
+ * @returns VBox status code.
+ * @param   cfFormat            Windows clipboard format to write data for.
+ * @param   pvData              Pointer to actual clipboard data to write.
+ * @param   cbData              Size (in bytes) of actual clipboard data to write.
+ *
+ * @note    ASSUMES that the clipboard has already been opened.
+ */
+int SharedClipboardWinDataWrite(UINT cfFormat, void *pvData, uint32_t cbData)
+{
+    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
+    AssertReturn   (cbData, VERR_INVALID_PARAMETER);
+
+    int rc = VINF_SUCCESS;
+
+    HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, cbData);
+
+    LogFlowFunc(("hMem=%p\n", hMem));
+
+    if (hMem)
+    {
+        void *pMem = GlobalLock(hMem);
+
+        LogFlowFunc(("pMem=%p, GlobalSize=%zu\n", pMem, GlobalSize(hMem)));
+
+        if (pMem)
+        {
+            LogFlowFunc(("Setting data\n"));
+
+            memcpy(pMem, pvData, cbData);
+
+            /* The memory must be unlocked before inserting to the Clipboard. */
+            GlobalUnlock(hMem);
+
+            /* 'hMem' contains the host clipboard data.
+             * size is 'cb' and format is 'format'.
+             */
+            HANDLE hClip = SetClipboardData(cfFormat, hMem);
+
+            LogFlowFunc(("hClip=%p\n", hClip));
+
+            if (hClip)
+            {
+                /* The hMem ownership has gone to the system. Nothing to do. */
+            }
+            else
+                rc = RTErrConvertFromWin32(GetLastError());
+        }
+        else
+            rc = VERR_ACCESS_DENIED;
+
+        GlobalFree(hMem);
+    }
+    else
+        rc = RTErrConvertFromWin32(GetLastError());
+
+    if (RT_FAILURE(rc))
+        LogFunc(("Setting clipboard data failed with %Rrc\n", rc));
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 

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

@@ -152 +152 @@
 }
 
-/**
- * Sets (places) clipboard data into the Windows clipboard.
- *
- * @returns VBox status code.
- * @param   pCtx                Shared Clipboard context to use.
- * @param   cfFormat            Windows clipboard format to set data for.
- * @param   pvData              Pointer to actual clipboard data to set.
- * @param   cbData              Size (in bytes) of actual clipboard data to set.
- * @note
- */
-static int vboxClipboardSvcWinDataSet(PSHCLCONTEXT pCtx, UINT cfFormat, void *pvData, uint32_t cbData)
-{
-    AssertPtrReturn(pCtx,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
-    AssertReturn   (cbData, VERR_INVALID_PARAMETER);
-
-    int rc = VINF_SUCCESS;
-
-    HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, cbData);
-
-    LogFlowFunc(("hMem=%p\n", hMem));
-
-    if (hMem)
-    {
-        void *pMem = GlobalLock(hMem);
-
-        LogFlowFunc(("pMem=%p, GlobalSize=%zu\n", pMem, GlobalSize(hMem)));
-
-        if (pMem)
-        {
-            LogFlowFunc(("Setting data\n"));
-
-            memcpy(pMem, pvData, cbData);
-
-            /* The memory must be unlocked before inserting to the Clipboard. */
-            GlobalUnlock(hMem);
-
-            /* 'hMem' contains the host clipboard data.
-             * size is 'cb' and format is 'format'.
-             */
-            HANDLE hClip = SetClipboardData(cfFormat, hMem);
-
-            LogFlowFunc(("hClip=%p\n", hClip));
-
-            if (hClip)
-            {
-                /* The hMem ownership has gone to the system. Nothing to do. */
-            }
-            else
-                rc = RTErrConvertFromWin32(GetLastError());
-        }
-        else
-            rc = VERR_ACCESS_DENIED;
-
-        GlobalFree(hMem);
-    }
-    else
-        rc = RTErrConvertFromWin32(GetLastError());
-
-    if (RT_FAILURE(rc))
-        LogRel(("Shared Clipboard: Setting clipboard data for Windows host failed with %Rrc\n", rc));
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
 static int vboxClipboardSvcWinDataRead(PSHCLCONTEXT pCtx, UINT uFormat, void **ppvData, uint32_t *pcbData)
 {
@@ -384 +318 @@
                     }
 
-                    rc = vboxClipboardSvcWinDataSet(pCtx, uFormat, pvData, cbData);
+                    rc = SharedClipboardWinDataWrite(uFormat, pvData, cbData);
+                    if (RT_FAILURE(rc))
+                        LogRel(("Shared Clipboard: Setting clipboard data for Windows host failed with %Rrc\n", rc));
 
                     RTMemFree(pvData);