Changeset 100430 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2023 10:12:31 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Simplified the VBOX_SHCL_HOST_MSG_TRANSFER_LIST_ENTRY_READ case a bit in VbglR3ClipboardEventGetNextEx(). ​​bugref:9437

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)

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

@@ -2504 +2504 @@
                 LogFlowFunc(("VBOX_SHCL_HOST_MSG_TRANSFER_LIST_ENTRY_READ\n"));
 
-                SHCLLISTENTRY entryList;
-                rc = ShClTransferListEntryInit(&entryList);
+                SHCLLISTHANDLE hList;
+                uint32_t       fInfo;
+                rc = VbglR3ClipboardTransferListEntryReadRecvReq(pCmdCtx, &hList, &fInfo);
                 if (RT_SUCCESS(rc))
                 {
-                    SHCLLISTHANDLE hList;
-                    uint32_t       fInfo;
-                    rc = VbglR3ClipboardTransferListEntryReadRecvReq(pCmdCtx, &hList, &fInfo);
+                    PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransferById(pTransferCtx,
+                                                                             VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->idContext));
+                    AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
+
+                    SHCLLISTENTRY entryList;
+                    rc = ShClTransferListRead(pTransfer, hList, &entryList);
                     if (RT_SUCCESS(rc))
                     {
-                        PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransferById(pTransferCtx,
-                                                                                 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->idContext));
-                        AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
-
-                        rc = ShClTransferListRead(pTransfer, hList, &entryList);
-                        if (RT_SUCCESS(rc))
-                        {
-                            PSHCLFSOBJINFO pObjInfo = (PSHCLFSOBJINFO)entryList.pvInfo;
-                            Assert(entryList.cbInfo == sizeof(SHCLFSOBJINFO));
-
-                            RT_NOREF(pObjInfo);
-
-                            LogFlowFunc(("\t%s (%RU64 bytes)\n", entryList.pszName, pObjInfo->cbObject));
-
-                            rc = VbglR3ClipboardTransferListEntryWrite(pCmdCtx, hList, &entryList);
-                        }
+                        PSHCLFSOBJINFO pObjInfo = (PSHCLFSOBJINFO)entryList.pvInfo;
+                        Assert(entryList.cbInfo == sizeof(SHCLFSOBJINFO));
+
+                        RT_NOREF(pObjInfo);
+
+                        LogFlowFunc(("\t%s (%RU64 bytes)\n", entryList.pszName, pObjInfo->cbObject));
+
+                        rc = VbglR3ClipboardTransferListEntryWrite(pCmdCtx, hList, &entryList);
+
+                        ShClTransferListEntryDestroy(&entryList);
                     }
-
-                    ShClTransferListEntryDestroy(&entryList);
                 }