Changeset 56909 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 10, 2015 6:09:14 AM (10 years ago)

Author:

vboxsync

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

101596

Message:

DnD: Changed DnDURIList's allocation scheme for stored DnDURIObject objects.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1231 +1231 @@
 }
 
-static int vbglR3DnDGHSendDir(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
-{
-    AssertPtrReturn(pCtx,                                  VERR_INVALID_POINTER);
-    AssertReturn(obj.GetType() == DnDURIObject::Directory, VERR_INVALID_PARAMETER);
+static int vbglR3DnDGHSendDir(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject *pObj)
+{
+    AssertPtrReturn(pObj,                                    VERR_INVALID_POINTER);
+    AssertPtrReturn(pCtx,                                    VERR_INVALID_POINTER);
+    AssertReturn(pObj->GetType() == DnDURIObject::Directory, VERR_INVALID_PARAMETER);
 
     DragAndDropSvc::VBOXDNDGHSENDDIRMSG Msg;
@@ -1243 +1244 @@
     Msg.hdr.cParms      = 3;
 
-    RTCString strPath = obj.GetDestPath();
+    RTCString strPath = pObj->GetDestPath();
     LogFlowFunc(("strDir=%s (%zu), fMode=0x%x\n",
-                 strPath.c_str(), strPath.length(), obj.GetMode()));
+                 strPath.c_str(), strPath.length(), pObj->GetMode()));
 
     Msg.pvName.SetPtr((void *)strPath.c_str(), (uint32_t)(strPath.length() + 1));
     Msg.cbName.SetUInt32((uint32_t)(strPath.length() + 1));
-    Msg.fMode.SetUInt32(obj.GetMode());
+    Msg.fMode.SetUInt32(pObj->GetMode());
 
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
@@ -1259 +1260 @@
 }
 
-static int vbglR3DnDGHSendFile(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
-{
-    AssertPtrReturn(pCtx,                             VERR_INVALID_POINTER);
-    AssertReturn(obj.GetType() == DnDURIObject::File, VERR_INVALID_PARAMETER);
-    AssertReturn(obj.IsOpen(),                        VERR_INVALID_STATE);
+static int vbglR3DnDGHSendFile(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject *pObj)
+{
+    AssertPtrReturn(pCtx,                               VERR_INVALID_POINTER);
+    AssertPtrReturn(pObj,                               VERR_INVALID_POINTER);
+    AssertReturn(pObj->GetType() == DnDURIObject::File, VERR_INVALID_PARAMETER);
+    AssertReturn(pObj->IsOpen(),                        VERR_INVALID_STATE);
 
     uint32_t cbBuf = _64K;           /** @todo Make this configurable? */
@@ -1272 +1274 @@
     int rc;
 
-    RTCString strPath = obj.GetDestPath();
-
-    LogFlowFunc(("strFile=%s (%zu), cbSize=%RU64, fMode=0x%x\n", strPath.c_str(), strPath.length(), obj.GetSize(), obj.GetMode()));
+    RTCString strPath = pObj->GetDestPath();
+
+    LogFlowFunc(("strFile=%s (%zu), cbSize=%RU64, fMode=0x%x\n", strPath.c_str(), strPath.length(),
+                 pObj->GetSize(), pObj->GetMode()));
     LogFlowFunc(("uProtocol=%RU32, uClientID=%RU32\n", pCtx->uProtocol, pCtx->uClientID));
 
@@ -1290 +1293 @@
         MsgHdr.cbName.SetUInt32((uint32_t)(strPath.length() + 1));
         MsgHdr.uFlags.SetUInt32(0);                                                      /* Flags; unused at the moment. */
-        MsgHdr.fMode.SetUInt32(obj.GetMode());                                           /* File mode */
-        MsgHdr.cbTotal.SetUInt64(obj.GetSize());                                         /* File size (in bytes). */
+        MsgHdr.fMode.SetUInt32(pObj->GetMode());                                         /* File mode */
+        MsgHdr.cbTotal.SetUInt64(pObj->GetSize());                                       /* File size (in bytes). */
 
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(MsgHdr)), &MsgHdr, sizeof(MsgHdr));
@@ -1319 +1322 @@
             Msg.u.v1.pvName.SetPtr((void *)strPath.c_str(), (uint32_t)(strPath.length() + 1));
             Msg.u.v1.cbName.SetUInt32((uint32_t)(strPath.length() + 1));
-            Msg.u.v1.fMode.SetUInt32(obj.GetMode());
+            Msg.u.v1.fMode.SetUInt32(pObj->GetMode());
         }
         else
@@ -1329 +1332 @@
         }
 
-        uint64_t cbToReadTotal  = obj.GetSize();
+        uint64_t cbToReadTotal  = pObj->GetSize();
         uint64_t cbWrittenTotal = 0;
         while (cbToReadTotal)
@@ -1336 +1339 @@
             uint32_t cbRead   = 0;
             if (cbToRead)
-                rc = obj.Read(pvBuf, cbToRead, &cbRead);
+                rc = pObj->Read(pvBuf, cbToRead, &cbRead);
 
             LogFlowFunc(("cbToReadTotal=%RU64, cbToRead=%RU32, cbRead=%RU32, rc=%Rrc\n",
@@ -1370 +1373 @@
             cbWrittenTotal += cbRead;
 
-            LogFlowFunc(("%RU64/%RU64 -- %RU8%%\n", cbWrittenTotal, obj.GetSize(), cbWrittenTotal * 100 / obj.GetSize()));
+            LogFlowFunc(("%RU64/%RU64 -- %RU8%%\n", cbWrittenTotal, pObj->GetSize(), cbWrittenTotal * 100 / pObj->GetSize()));
         };
     }
@@ -1380 +1383 @@
 }
 
-static int vbglR3DnDGHSendURIObject(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
+static int vbglR3DnDGHSendURIObject(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject *pObj)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pObj, VERR_INVALID_POINTER);
 
     int rc;
 
-    switch (obj.GetType())
+    switch (pObj->GetType())
     {
         case DnDURIObject::Directory:
-            rc = vbglR3DnDGHSendDir(pCtx, obj);
+            rc = vbglR3DnDGHSendDir(pCtx, pObj);
             break;
 
         case DnDURIObject::File:
-            rc = vbglR3DnDGHSendFile(pCtx, obj);
+            rc = vbglR3DnDGHSendFile(pCtx, pObj);
             break;
 
         default:
-            AssertMsgFailed(("URI type %ld not implemented\n", obj.GetType()));
+            AssertMsgFailed(("Object type %ld not implemented\n", pObj->GetType()));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -1441 +1445 @@
         while (!lstURI.IsEmpty())
         {
-            DnDURIObject &nextObj = lstURI.First();
-
-            rc = vbglR3DnDGHSendURIObject(pCtx, nextObj);
+            DnDURIObject *pNextObj = lstURI.First();
+
+            rc = vbglR3DnDGHSendURIObject(pCtx, pNextObj);
             if (RT_FAILURE(rc))
                 break;