Changeset 100547 in vbox for trunk/src/VBox

Timestamp:

Jul 12, 2023 12:05:33 PM (20 months ago)

Author:

vboxsync

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

158367

Message:

Shared Clipboard: Renaming (SHCLTRANSFERSTATUS_STOPPED -> SHCLTRANSFERSTATUS_COMPLETED). bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (2 diffs)
• GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (2 diffs)

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

@@ -372 +372 @@
 
         case VINF_SUCCESS:
-            enmSts = SHCLTRANSFERSTATUS_STOPPED;
+            enmSts = SHCLTRANSFERSTATUS_COMPLETED;
             break;
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -2252 +2252 @@
     int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
                                                    RT_SUCCESS(rc)
-                                                 ? SHCLTRANSFERSTATUS_STOPPED : SHCLTRANSFERSTATUS_ERROR, rc);
+                                                 ? SHCLTRANSFERSTATUS_COMPLETED : SHCLTRANSFERSTATUS_ERROR, rc);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2388 +2388 @@
                         }
 
-                        case SHCLTRANSFERSTATUS_STOPPED:
+                        case SHCLTRANSFERSTATUS_COMPLETED:
                             RT_FALL_THROUGH();
                         case SHCLTRANSFERSTATUS_CANCELED:

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

@@ -2172 +2172 @@
                         shClTransferUnlock(pTransfer), VERR_WRONG_ORDER);
 
-    int rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_STOPPED);
+    int rc = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_COMPLETED);
 
     shClTransferUnlock(pTransfer);
@@ -3211 +3211 @@
         RT_CASE_RET_STR(SHCLTRANSFERSTATUS_UNINITIALIZED);
         RT_CASE_RET_STR(SHCLTRANSFERSTATUS_STARTED);
-        RT_CASE_RET_STR(SHCLTRANSFERSTATUS_STOPPED);
+        RT_CASE_RET_STR(SHCLTRANSFERSTATUS_COMPLETED);
         RT_CASE_RET_STR(SHCLTRANSFERSTATUS_CANCELED);
         RT_CASE_RET_STR(SHCLTRANSFERSTATUS_KILLED);

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

@@ -1500 +1500 @@
                             }
 
-                            case SHCLTRANSFERSTATUS_STOPPED:
+                            case SHCLTRANSFERSTATUS_COMPLETED:
                             {
                                 LogRel(("Shared Clipboard: Guest has stopped transfer %RU32\n", pTransfer->State.uID));
@@ -2446 +2446 @@
     PSHCLEVENT pEvent;
     int rc = shClSvcTransferSendStatusAsync(pClient, pTransfer,
-                                            SHCLTRANSFERSTATUS_STOPPED, VINF_SUCCESS, &pEvent);
+                                            SHCLTRANSFERSTATUS_COMPLETED, VINF_SUCCESS, &pEvent);
     if (   RT_SUCCESS(rc)
         && fWaitForGuest)