Changeset 100522 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2023 4:52:03 PM (20 months ago)

Author:

vboxsync

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

158325

Message:

Shared Clipboard: Resolved a @todo: Removed SHCLOBJHANDLEINFO and only use SHCLTRANSFEROBJ instead, as both structures almost were the same. bugref:9437

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-transfers-provider-local.cpp (modified) (6 diffs)
• clipboard-transfers.cpp (modified) (5 diffs)

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

@@ -555 +555 @@
     AssertPtr(pTransfer);
 
-    PSHCLOBJHANDLEINFO pInfo = (PSHCLOBJHANDLEINFO)RTMemAllocZ(sizeof(SHCLOBJHANDLEINFO));
+    PSHCLTRANSFEROBJ pInfo = (PSHCLTRANSFEROBJ)RTMemAllocZ(sizeof(SHCLTRANSFEROBJ));
     if (pInfo)
     {
-        rc = ShClTransferObjHandleInfoInit(pInfo);
+        rc = ShClTransferObjInit(pInfo);
         if (RT_SUCCESS(rc))
         {
@@ -592 +592 @@
         else
         {
-            ShClTransferObjHandleInfoDestroy(pInfo);
+            ShClTransferObjDestroy(pInfo);
             RTMemFree(pInfo);
         }
@@ -613 +613 @@
     AssertPtr(pTransfer);
 
-    PSHCLOBJHANDLEINFO pInfo = ShClTransferObjGet(pTransfer, hObj);
+    PSHCLTRANSFEROBJ pInfo = ShClTransferObjGet(pTransfer, hObj);
     if (pInfo)
     {
@@ -656 +656 @@
         pTransfer->cObjHandles--;
 
-        ShClTransferObjHandleInfoDestroy(pInfo);
+        ShClTransferObjDestroy(pInfo);
 
         RTMemFree(pInfo);
@@ -682 +682 @@
     AssertPtr(pTransfer);
 
-    PSHCLOBJHANDLEINFO pInfo = ShClTransferObjGet(pTransfer, hObj);
+    PSHCLTRANSFEROBJ pInfo = ShClTransferObjGet(pTransfer, hObj);
     if (pInfo)
     {
@@ -725 +725 @@
     AssertPtr(pTransfer);
 
-    PSHCLOBJHANDLEINFO pInfo = ShClTransferObjGet(pTransfer, hObj);
+    PSHCLTRANSFEROBJ pInfo = ShClTransferObjGet(pTransfer, hObj);
     if (pInfo)
     {

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

@@ -729 +729 @@
 
 /**
- * Initializes an object handle info structure.
- *
- * @returns VBox status code.
- * @param   pInfo               Object handle info structure to initialize.
- */
-int ShClTransferObjHandleInfoInit(PSHCLOBJHANDLEINFO pInfo)
-{
-    AssertPtrReturn(pInfo, VERR_INVALID_POINTER);
-
-    pInfo->hObj    = NIL_SHCLOBJHANDLE;
-    pInfo->enmType = SHCLOBJTYPE_INVALID;
-
-    pInfo->pszPathLocalAbs = NULL;
-
-    RT_ZERO(pInfo->u);
+ * Initializes a transfer object structure.
+ *
+ * @returns VBox status code.
+ * @param   pObj                Object structure to initialize.
+ */
+int ShClTransferObjInit(PSHCLTRANSFEROBJ pObj)
+{
+    AssertPtrReturn(pObj, VERR_INVALID_POINTER);
+
+    pObj->hObj    = NIL_SHCLOBJHANDLE;
+    pObj->enmType = SHCLOBJTYPE_INVALID;
+
+    pObj->pszPathLocalAbs = NULL;
+
+    RT_ZERO(pObj->u);
 
     return VINF_SUCCESS;
@@ -749 +749 @@
 
 /**
- * Destroys an object handle info structure.
- *
- * @param   pInfo               Object handle info structure to destroy.
- */
-void ShClTransferObjHandleInfoDestroy(PSHCLOBJHANDLEINFO pInfo)
-{
-    if (!pInfo)
+ * Destroys a transfer object structure.
+ *
+ * @param   pObj                Object structure to destroy.
+ */
+void ShClTransferObjDestroy(PSHCLTRANSFEROBJ pObj)
+{
+    if (!pObj)
         return;
 
-    if (pInfo->pszPathLocalAbs)
-    {
-        RTStrFree(pInfo->pszPathLocalAbs);
-        pInfo->pszPathLocalAbs = NULL;
+    if (pObj->pszPathLocalAbs)
+    {
+        RTStrFree(pObj->pszPathLocalAbs);
+        pObj->pszPathLocalAbs = NULL;
     }
 }
@@ -841 +841 @@
 
 /**
- * Returns a specific object handle info of a transfer.
- *
- * @returns Pointer to object handle info if found, or NULL if not found.
- * @param   pTransfer           Clipboard transfer to get object handle info from.
+ * Returns a specific transfer object of a transfer.
+ *
+ * @returns Pointer to transfer object if found, or NULL if not found.
+ * @param   pTransfer           Clipboard transfer to get transfer object from.
  * @param   hObj                Object handle of the object to get handle info for.
  */
-PSHCLOBJHANDLEINFO ShClTransferObjGet(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj)
-{
-    PSHCLOBJHANDLEINFO pIt;
-    RTListForEach(&pTransfer->lstObj, pIt, SHCLOBJHANDLEINFO, Node) /** @todo Slooow ...but works for now. */
+PSHCLTRANSFEROBJ ShClTransferObjGet(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj)
+{
+    PSHCLTRANSFEROBJ pIt;
+    RTListForEach(&pTransfer->lstObj, pIt, SHCLTRANSFEROBJ, Node) /** @todo Slooow ...but works for now. */
     {
         if (pIt->hObj == hObj)
@@ -1390 +1390 @@
 
 /**
- * Returns the current transfer object of a transfer list.
+ * Returns the a transfer object of a transfer list.
  *
  * Currently not implemented and wil return NULL.
@@ -1665 +1665 @@
     }
 
-    PSHCLOBJHANDLEINFO pItObj, pItObjNext;
-    RTListForEachSafe(&pTransfer->lstObj, pItObj, pItObjNext, SHCLOBJHANDLEINFO, Node)
-    {
-        ShClTransferObjHandleInfoDestroy(pItObj);
+    PSHCLTRANSFEROBJ pItObj, pItObjNext;
+    RTListForEachSafe(&pTransfer->lstObj, pItObj, pItObjNext, SHCLTRANSFEROBJ, Node)
+    {
+        ShClTransferObjDestroy(pItObj);
 
         RTListNodeRemove(&pItObj->Node);