Changeset 74526 in vbox for trunk/src

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

Files:

• Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (1 diff)
• Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (2 diffs)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (10 diffs)
• GuestHost/DragAndDrop/DnDDroppedFiles.cpp (modified) (4 diffs)
• GuestHost/DragAndDrop/DnDURIList.cpp (modified) (15 diffs)
• GuestHost/DragAndDrop/DnDURIObject.cpp (modified) (14 diffs)
• Main/include/GuestDnDPrivate.h (modified) (7 diffs)
• Main/src-client/GuestDnDSourceImpl.cpp (modified) (2 diffs)
• Main/src-client/GuestDnDTargetImpl.cpp (modified) (3 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,

trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2017 Oracle Corporation
+ * Copyright (C) 2014-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
     , m_hDir(NULL) { }
 
-DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, uint32_t fFlags)
+DnDDroppedFiles::DnDDroppedFiles(const char *pszPath, DNDURIDROPPEDFILEFLAGS fFlags /* = DNDURIDROPPEDFILE_FLAGS_NONE */)
     : m_fOpen(0)
     , m_hDir(NULL)
@@ -101 +101 @@
 }
 
-int DnDDroppedFiles::OpenEx(const char *pszPath, uint32_t fFlags)
+int DnDDroppedFiles::OpenEx(const char *pszPath, DNDURIDROPPEDFILEFLAGS fFlags /* = DNDURIDROPPEDFILE_FLAGS_NONE */)
 {
     AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
@@ -168 +168 @@
 }
 
-int DnDDroppedFiles::OpenTemp(uint32_t fFlags)
+int DnDDroppedFiles::OpenTemp(DNDURIDROPPEDFILEFLAGS fFlags /* = DNDURIDROPPEDFILE_FLAGS_NONE */)
 {
     AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER); /* Flags not supported yet. */

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2017 Oracle Corporation
+ * Copyright (C) 2014-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
 }
 
-int DnDURIList::addEntry(const char *pcszSource, const char *pcszTarget, uint32_t fFlags)
+int DnDURIList::addEntry(const char *pcszSource, const char *pcszTarget, DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pcszSource, VERR_INVALID_POINTER);
@@ -64 +64 @@
                          pcszSource, pcszTarget, (uint64_t)objInfo.cbObject, objInfo.Attr.fMode));
 
-            DnDURIObject *pObjFile = new DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget);
+            DnDURIObject *pObjFile = new DnDURIObject(DnDURIObject::Type_File, pcszSource, pcszTarget);
             if (pObjFile)
             {
@@ -70 +70 @@
                 {
                     /** @todo Add a standard fOpen mode for this list. */
-                    rc = pObjFile->Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, objInfo.Attr.fMode);
+                    rc = pObjFile->Open(DnDURIObject::View_Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, objInfo.Attr.fMode);
                 }
 
@@ -90 +90 @@
             LogFlowFunc(("Directory '%s' -> '%s' (file mode 0x%x)\n", pcszSource, pcszTarget, objInfo.Attr.fMode));
 
-            DnDURIObject *pObjDir = new DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget,
+            DnDURIObject *pObjDir = new DnDURIObject(DnDURIObject::Type_Directory, pcszSource, pcszTarget,
                                                      objInfo.Attr.fMode, 0 /* Size */);
             if (pObjDir)
@@ -112 +112 @@
 
 int DnDURIList::appendPathRecursive(const char *pcszSrcPath,
-                                    const char *pcszDstPath, const char *pcszDstBase, size_t cchDstBase, uint32_t fFlags)
+                                    const char *pcszDstPath, const char *pcszDstBase, size_t cchDstBase,
+                                    DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pcszSrcPath, VERR_INVALID_POINTER);
@@ -118 +119 @@
     AssertPtrReturn(pcszDstPath, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("pcszSrcPath=%s, pcszDstPath=%s, pcszDstBase=%s, cchDstBase=%zu\n",
-                 pcszSrcPath, pcszDstPath, pcszDstBase, cchDstBase));
+    LogFlowFunc(("pcszSrcPath=%s, pcszDstPath=%s, pcszDstBase=%s, cchDstBase=%zu, fFlags=0x%x\n",
+                 pcszSrcPath, pcszDstPath, pcszDstBase, cchDstBase, fFlags));
 
     RTFSOBJINFO objInfo;
@@ -278 +279 @@
 }
 
-int DnDURIList::AppendNativePath(const char *pszPath, uint32_t fFlags)
+int DnDURIList::AppendNativePath(const char *pszPath, DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
@@ -307 +308 @@
 
 int DnDURIList::AppendNativePathsFromList(const char *pszNativePaths, size_t cbNativePaths,
-                                          uint32_t fFlags)
+                                          DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pszNativePaths, VERR_INVALID_POINTER);
@@ -318 +319 @@
 
 int DnDURIList::AppendNativePathsFromList(const RTCList<RTCString> &lstNativePaths,
-                                          uint32_t fFlags)
+                                          DNDURILISTFLAGS fFlags)
 {
     int rc = VINF_SUCCESS;
@@ -334 +335 @@
 }
 
-int DnDURIList::AppendURIPath(const char *pszURI, uint32_t fFlags)
+int DnDURIList::AppendURIPath(const char *pszURI, DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pszURI, VERR_INVALID_POINTER);
@@ -385 +386 @@
 
 int DnDURIList::AppendURIPathsFromList(const char *pszURIPaths, size_t cbURIPaths,
-                                       uint32_t fFlags)
+                                       DNDURILISTFLAGS fFlags)
 {
     AssertPtrReturn(pszURIPaths, VERR_INVALID_POINTER);
@@ -396 +397 @@
 
 int DnDURIList::AppendURIPathsFromList(const RTCList<RTCString> &lstURI,
-                                       uint32_t fFlags)
+                                       DNDURILISTFLAGS fFlags)
 {
     int rc = VINF_SUCCESS;
@@ -447 +448 @@
 }
 
-int DnDURIList::RootFromURIData(const void *pvData, size_t cbData, uint32_t fFlags)
+int DnDURIList::SetFromURIData(const void *pvData, size_t cbData, DNDURILISTFLAGS fFlags)
 {
     Assert(fFlags == 0); RT_NOREF1(fFlags);
@@ -493 +494 @@
 }
 
-RTCString DnDURIList::RootToString(const RTCString &strPathBase /* = "" */,
+RTCString DnDURIList::GetRootEntries(const RTCString &strPathBase /* = "" */,
                                    const RTCString &strSeparator /* = "\r\n" */) const
 {

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2014-2017 Oracle Corporation
+ * Copyright (C) 2014-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -37 +37 @@
 
 DnDURIObject::DnDURIObject(void)
-    : m_Type(Unknown)
+    : m_Type(Type_Unknown)
     , m_fOpen(false)
     , m_fMode(0)
@@ -46 +46 @@
 }
 
-DnDURIObject::DnDURIObject(Type type,
+DnDURIObject::DnDURIObject(Type enmType,
                            const RTCString &strSrcPath /* = 0 */,
                            const RTCString &strDstPath /* = 0 */,
                            uint32_t fMode  /* = 0 */, uint64_t cbSize  /* = 0 */)
-    : m_Type(type)
+    : m_Type(enmType)
     , m_strSrcPath(strSrcPath)
     , m_strTgtPath(strDstPath)
@@ -74 +74 @@
     switch (m_Type)
     {
-        case File:
+        case Type_File:
         {
             RTFileClose(u.m_hFile);
@@ -81 +81 @@
         }
 
-        case Directory:
+        case Type_Directory:
             break;
 
@@ -102 +102 @@
     switch (m_Type)
     {
-        case File:
+        case Type_File:
             Assert(m_cbProcessed <= m_cbSize);
             fComplete = m_cbProcessed == m_cbSize;
             break;
 
-        case Directory:
+        case Type_Directory:
             fComplete = true;
             break;
@@ -124 +124 @@
 }
 
-int DnDURIObject::Open(Dest enmDest, uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */)
-{
-    return OpenEx(  enmDest == Source
+int DnDURIObject::Open(View enmView, uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */)
+{
+    return OpenEx(  enmView == View_Source
                   ? m_strSrcPath : m_strTgtPath
-                  , m_Type, enmDest, fOpen, fMode, 0 /* fFlags */);
-}
-
-int DnDURIObject::OpenEx(const RTCString &strPath, Type enmType, Dest enmDest,
-                         uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */, uint32_t fFlags /* = 0 */)
+                  , m_Type, enmView, fOpen, fMode, 0 /* fFlags */);
+}
+
+int DnDURIObject::OpenEx(const RTCString &strPath, Type enmType, View enmView,
+                         uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */, DNDURIOBJECTFLAGS fFlags /* = DNDURIOBJECT_FLAGS_NONE */)
 {
     Assert(fFlags == 0); RT_NOREF1(fFlags);
     int rc = VINF_SUCCESS;
 
-    switch (enmDest)
-    {
-        case Source:
+    switch (enmView)
+    {
+        case View_Source:
             m_strSrcPath = strPath;
             break;
 
-        case Target:
+        case View_Target:
             m_strTgtPath = strPath;
             break;
@@ -155 +155 @@
         && fOpen) /* Opening mode specified? */
     {
-        LogFlowThisFunc(("enmType=%RU32, strPath=%s, fOpen=0x%x, enmType=%RU32, enmDest=%RU32\n",
-                         enmType, strPath.c_str(), fOpen, enmType, enmDest));
+        LogFlowThisFunc(("strPath=%s, enmType=%RU32, enmView=%RU32, fOpen=0x%x, fMode=0x%x, fFlags=0x%x\n",
+                         strPath.c_str(), enmType, enmView, fOpen, fFlags));
         switch (enmType)
         {
-            case File:
+            case Type_File:
             {
                 if (!m_fOpen)
@@ -207 +207 @@
             }
 
-            case Directory:
+            case Type_Directory:
                 rc = VINF_SUCCESS;
                 break;
@@ -294 +294 @@
     switch (m_Type)
     {
-        case File:
-        {
-            rc = OpenEx(m_strSrcPath, File, Source,
+        case Type_File:
+        {
+            rc = OpenEx(m_strSrcPath, Type_File, View_Source,
                         /* Use some sensible defaults. */
                         RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);
@@ -319 +319 @@
         }
 
-        case Directory:
+        case Type_Directory:
         {
             rc = VINF_SUCCESS;
@@ -346 +346 @@
     Close();
 
-    m_Type        = Unknown;
+    m_Type        = Type_Unknown;
     m_strSrcPath  = "";
     m_strTgtPath  = "";
@@ -365 +365 @@
     switch (m_Type)
     {
-        case File:
-        {
-            rc = OpenEx(m_strTgtPath, File, Target,
+        case Type_File:
+        {
+            rc = OpenEx(m_strTgtPath, Type_File, View_Target,
                         /* Use some sensible defaults. */
                         RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_WRITE, 0 /* fFlags */);
@@ -379 +379 @@
         }
 
-        case Directory:
+        case Type_Directory:
         {
             rc = VINF_SUCCESS;

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -166 +166 @@
     int fromURIList(const DnDURIList &lstURI)
     {
-        return fromString(lstURI.RootToString());
+        return fromString(lstURI.GetRootEntries());
     }
 
@@ -390 +390 @@
 public:
 
-    int createIntermediate(DnDURIObject::Type enmType = DnDURIObject::Unknown)
+    int createIntermediate(DnDURIObject::Type enmType = DnDURIObject::Type_Unknown)
     {
         reset();
@@ -564 +564 @@
         switch (Obj.GetType())
         {
-            case DnDURIObject::Directory:
-            case DnDURIObject::File:
+            case DnDURIObject::Type_Directory:
+            case DnDURIObject::Type_File:
                 rc = VINF_SUCCESS;
                 break;
@@ -647 +647 @@
                 rc = lstURI.AppendURIPathsFromList(lstURIOrg, DNDURILIST_FLAGS_KEEP_OPEN);
                 if (RT_SUCCESS(rc))
-                    cObjToProcess = lstURI.TotalCount();
+                    cObjToProcess = lstURI.GetTotalCount();
             }
         }
@@ -659 +659 @@
         LogFlowFuncEnter();
 
-        int rc = lstURI.RootFromURIData(Data.getData(), Data.getSize(), 0 /* uFlags */);
+        int rc = lstURI.SetFromURIData(Data.getData(), Data.getSize(), 0 /* uFlags */);
         if (RT_SUCCESS(rc))
         {
-            const size_t cRootCount = lstURI.RootCount();
+            const size_t cRootCount = lstURI.GetRootCount();
             LogFlowFunc(("cRootCount=%zu, cObjToProcess=%RU64\n", cRootCount, cObjToProcess));
             if (cRootCount > cObjToProcess)
@@ -675 +675 @@
         const char *pszDroppedFilesDir = droppedFiles.GetDirAbs();
 
-        Utf8Str strURIs = lstURI.RootToString(RTCString(pszDroppedFilesDir));
+        Utf8Str strURIs = lstURI.GetRootEntries(RTCString(pszDroppedFilesDir));
         size_t cbData = strURIs.length();
 
-        LogFlowFunc(("%zu root URIs (%zu bytes)\n", lstURI.RootCount(), cbData));
+        LogFlowFunc(("%zu root URIs (%zu bytes)\n", lstURI.GetRootCount(), cbData));
 
         int rc;

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -693 +693 @@
     GuestDnDURIObjCtx &objCtx = pCtx->mURI.getObj(0); /** @todo Fill in context ID. */
 
-    rc = objCtx.createIntermediate(DnDURIObject::Directory);
+    rc = objCtx.createIntermediate(DnDURIObject::Type_Directory);
     if (RT_FAILURE(rc))
         return rc;
@@ -827 +827 @@
 
             /** @todo Add sparse file support based on fFlags? (Use Open(..., fFlags | SPARSE). */
-            rc = pObj->OpenEx(pszPathAbs, DnDURIObject::File, DnDURIObject::Target,
+            rc = pObj->OpenEx(pszPathAbs, DnDURIObject::Type_File, DnDURIObject::View_Target,
                               RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE,
                               (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -944 +944 @@
     {
         LogRel2(("DnD: Opening host file for transferring to guest: %s\n", strPathSrc.c_str()));
-        rc = pObj->OpenEx(strPathSrc, DnDURIObject::File, DnDURIObject::Source,
+        rc = pObj->OpenEx(strPathSrc, DnDURIObject::Type_File, DnDURIObject::View_Source,
                           RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);
         if (RT_FAILURE(rc))
@@ -1341 +1341 @@
 
         LogFlowFunc(("URI root objects: %zu, total bytes (raw data to transfer): %zu\n",
-                     pURI->getURIList().RootCount(), pURI->getURIList().TotalBytes()));
+                     pURI->getURIList().GetRootCount(), pURI->getURIList().GetTotalBytes()));
 
         /*
@@ -1355 +1355 @@
          */
         const uint32_t cbMeta = pData->getMeta().getSize();
-        pData->setEstimatedSize(pURI->getURIList().TotalBytes() + cbMeta /* cbTotal */,
-                                                                  cbMeta /* cbMeta  */);
+        pData->setEstimatedSize(pURI->getURIList().GetTotalBytes() + cbMeta /* cbTotal */,
+                                                                     cbMeta /* cbMeta  */);
 
         /*