Changeset 82875 in vbox for trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135852

Message:

Shared Clipboard: Use NIL_SHCLEVENTID everywhere.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (13 diffs)

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);