Changeset 74526 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 28, 2018 3:08:24 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Renaming for DnDURIObject / DnDURIList classes, some typedefs to distinguish flags better. No functional changes.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (1 diff)
• WINNT/VBoxTray/VBoxTray.cpp (modified) (2 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (10 diffs)

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

@@ -485 +485 @@
                             if (RT_SUCCESS(rc))
                             {
-                                RTCString strRoot = lstURI.RootToString();
+                                RTCString strRoot = lstURI.GetRootEntries();
                                 size_t cbRoot = strRoot.length() + 1; /* Include termination */
 

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

@@ -562 +562 @@
     int rc = RTLogCreateEx(&g_pLoggerRelease, fFlags,
 #ifdef DEBUG
-                           "all.e.l.f",
+                           "all.e.l.l2.l3.f",
                            "VBOXTRAY_LOG",
 #else
@@ -568 +568 @@
                            "VBOXTRAY_RELEASE_LOG",
 #endif
-                           RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT,
+                           RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT | RTLOGDEST_USER,
                            vboxTrayLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
                            RTErrInfoInitStatic(&ErrInfo), pszLogFile);

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

@@ -410 +410 @@
      * Enter the main loop of retieving files + directories.
      */
-    DnDURIObject objFile(DnDURIObject::File);
+    DnDURIObject objFile(DnDURIObject::Type_File);
 
     char szPathName[RTPATH_MAX] = { 0 };
@@ -510 +510 @@
                                 uint32_t fCreationMode = (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR;
 #endif
-                                rc = objFile.OpenEx(strPathAbs, DnDURIObject::File, DnDURIObject::Target, fOpen, fCreationMode);
+                                rc = objFile.OpenEx(strPathAbs, DnDURIObject::Type_File, DnDURIObject::View_Target, fOpen, fCreationMode);
                                 if (RT_SUCCESS(rc))
                                 {
@@ -866 +866 @@
             Assert(cbData);
 
-            rc = lstURI.RootFromURIData(pvData, cbData, 0 /* fFlags */);
+            rc = lstURI.SetFromURIData(pvData, cbData, 0 /* fFlags */);
             if (RT_SUCCESS(rc))
                 rc = vbglR3DnDHGRecvURIData(pCtx, &dataHdr, &droppedFiles);
@@ -879 +879 @@
                 }
 
-                RTCString strData = lstURI.RootToString(droppedFiles.GetDirAbs());
+                RTCString strData = lstURI.GetRootEntries(droppedFiles.GetDirAbs());
                 Assert(!strData.isEmpty());
 
@@ -1562 +1562 @@
 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);
+    AssertPtrReturn(pObj,                                         VERR_INVALID_POINTER);
+    AssertPtrReturn(pCtx,                                             VERR_INVALID_POINTER);
+    AssertReturn(pObj->GetType() == DnDURIObject::Type_Directory, VERR_INVALID_PARAMETER);
 
     RTCString strPath = pObj->GetDestPath();
@@ -1598 +1598 @@
 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);
+    AssertPtrReturn(pCtx,                                    VERR_INVALID_POINTER);
+    AssertPtrReturn(pObj,                                    VERR_INVALID_POINTER);
+    AssertReturn(pObj->GetType() == DnDURIObject::Type_File, VERR_INVALID_PARAMETER);
+    AssertReturn(pObj->IsOpen(),                             VERR_INVALID_STATE);
 
     uint32_t cbBuf = _64K;           /** @todo Make this configurable? */
@@ -1700 +1700 @@
     switch (pObj->GetType())
     {
-        case DnDURIObject::Directory:
+        case DnDURIObject::Type_Directory:
             rc = vbglR3DnDGHSendDir(pCtx, pObj);
             break;
 
-        case DnDURIObject::File:
+        case DnDURIObject::Type_File:
             rc = vbglR3DnDGHSendFile(pCtx, pObj);
             break;
@@ -1771 +1771 @@
          * URI list the host needs to know upfront to set up the drag'n drop operation.
          */
-        RTCString strRootDest = lstURI.RootToString();
+        RTCString strRootDest = lstURI.GetRootEntries();
         if (strRootDest.isNotEmpty())
         {
@@ -1779 +1779 @@
             /* The total size also contains the size of the meta data. */
             uint64_t cbTotal  = cbURLIist;
-                     cbTotal += lstURI.TotalBytes();
+                     cbTotal += lstURI.GetTotalBytes();
 
             /* We're going to send an URI list in text format. */
@@ -1791 +1791 @@
             dataHdr.pvMetaFmt = (void *)szMetaFmt;
             dataHdr.cbMetaFmt = cbMetaFmt;
-            dataHdr.cObjects  = lstURI.TotalCount();
+            dataHdr.cObjects  = lstURI.GetTotalCount();
 
             rc = vbglR3DnDGHSendDataInternal(pCtx,