Changeset 102825 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

Timestamp:

Jan 10, 2024 5:43:29 PM (12 months ago)

Author:

vboxsync

Message:

Shared Clipboard/X11: Made pcbRead in ShClX11ReadDataFromX11() optional, fixed releasing the created event. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (7 diffs)

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

@@ -2664 +2664 @@
 
 /**
- * Reads the X11 clipboard.
+ * Reads from the X11 clipboard.
  *
  * @returns VBox status code.
@@ -2675 +2675 @@
  * @param   pvBuf               Where to store the received data on success.
  * @param   cbBuf               Size (in bytes) of \a pvBuf. Also marks maximum data to read (in bytes).
- * @param   pcbRead             Where to return the read bytes on success.
+ * @param   pcbRead             Where to return the read bytes on success. Optional.
  */
 int ShClX11ReadDataFromX11(PSHCLX11CTX pCtx, PSHCLEVENTSOURCE pEventSource, RTMSINTERVAL msTimeout,
@@ -2684 +2684 @@
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
     AssertReturn(cbBuf, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcbRead, VERR_INVALID_POINTER);
+    /* pcbRead is optional. */
 
     PSHCLEVENT pEvent;
@@ -2706 +2706 @@
 
                     memcpy(pvBuf, pResp->Read.pvData, RT_MIN(cbBuf, pResp->Read.cbData));
-                    *pcbRead = pResp->Read.cbData;
+                    if (pcbRead)
+                        *pcbRead = pResp->Read.cbData;
 
                     RTMemFree(pResp->Read.pvData);
@@ -2716 +2717 @@
                 {
                     rc = VERR_NO_DATA;
-                    *pcbRead = 0;
+                    if (pcbRead)
+                        *pcbRead = 0;
                 }
             }
@@ -2722 +2724 @@
                 rc = rcEvent;
         }
+
+        ShClEventRelease(pEvent);
     }
 
@@ -2805 +2809 @@
     return rc;
 }
-