Changeset 82875 in vbox

Timestamp:

Jan 27, 2020 1:31:54 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Use NIL_SHCLEVENTID everywhere.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-common.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (13 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -196 +196 @@
  * Generates a new event ID for a specific event source and registers it.
  *
- * @returns New event ID generated, or 0 on error.
+ * @returns New event ID generated, or NIL_SHCLEVENTID on error.
  * @param   pSource             Event source to generate event for.
  */
 SHCLEVENTID ShClEventIdGenerateAndRegister(PSHCLEVENTSOURCE pSource)
 {
-    AssertPtrReturn(pSource, 0);
+    AssertPtrReturn(pSource, NIL_SHCLEVENTID);
 
     /*
@@ -207 +207 @@
      */
     PSHCLEVENT pEvent = (PSHCLEVENT)RTMemAllocZ(sizeof(SHCLEVENT));
-    AssertReturn(pEvent, 0);
+    AssertReturn(pEvent, NIL_SHCLEVENTID);
     int rc = RTSemEventMultiCreate(&pEvent->hEvtMulSem);
-    AssertRCReturnStmt(rc, RTMemFree(pEvent), 0);
+    AssertRCReturnStmt(rc, RTMemFree(pEvent), NIL_SHCLEVENTID);
 
     /*
@@ -237 +237 @@
 
     RTMemFree(pEvent);
-    return 0;
+    return NIL_SHCLEVENTID;
 }
 

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

@@ -126 +126 @@
     {
         SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsgHdr->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -163 +163 @@
 
                                     idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-                                    if (idEvent)
+                                    if (idEvent != NIL_SHCLEVENTID)
                                     {
                                         HGCMSvcSetU64(&pMsgEntry->aParms[0],
@@ -218 +218 @@
             ShClEventUnregister(&pCtx->pTransfer->Events, idEvent);
         }
+        else
+            rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
     }
     else
@@ -241 +243 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             pMsg->idCtx = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
@@ -300 +302 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             pMsg->idCtx = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
@@ -347 +349 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -409 +411 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -470 +472 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             LogFlowFunc(("pszPath=%s, fCreate=0x%x\n", pCreateParms->pszPath, pCreateParms->fCreate));
@@ -533 +535 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -588 +590 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -648 +650 @@
     {
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pCtx->pTransfer->Events);
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -1994 +1996 @@
 
     const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pTransfer->Events);
-    if (idEvent)
+    if (idEvent != NIL_SHCLEVENTID)
     {
         HGCMSvcSetU64(&pMsgReadData->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -2021 +2023 @@
             ShClEventUnregister(&pTransfer->Events, idEvent);
     }
+    else
+        rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
 
     LogFlowFuncLeaveRC(rc);

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

@@ -194 +194 @@
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
         pReq->idEvent    = idEvent;
-        if (idEvent)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             rc = ShClX11ReadDataFromX11(&pClient->State.pCtx->X11, pData->uFormat, pReq);
@@ -392 +392 @@
 
     SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
-    if (idEvent)
+    if (idEvent != NIL_SHCLEVENTID)
     {
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)RTMemAllocZ(sizeof(CLIPREADCBREQ));

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

@@ -1216 +1216 @@
 
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
-        if (idEvent != 0)
+        if (idEvent != NIL_SHCLEVENTID)
         {
             LogFlowFunc(("fFormat=%#x idEvent=%#x\n", fFormat, idEvent));