Changeset 59854 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Feb 26, 2016 3:41:01 PM (9 years ago)

Author:

vboxsync

Message:

Backed out r105750, as exception handling is disabled.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2016 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
     if (RT_SUCCESS(rc))
     {
-        try
-        {
-            DnDURIObject *pObj = NULL;
-
-            if (RTFS_IS_FILE(objInfo.Attr.fMode))
-            {
-                LogFlowFunc(("File '%s' -> '%s' (%RU64 bytes, file mode 0x%x)\n",
-                             pcszSource, pcszTarget, (uint64_t)objInfo.cbObject, objInfo.Attr.fMode));
-
-                pObj = new DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget);
-
+        if (RTFS_IS_FILE(objInfo.Attr.fMode))
+        {
+            LogFlowFunc(("File '%s' -> '%s' (%RU64 bytes, file mode 0x%x)\n",
+                         pcszSource, pcszTarget, (uint64_t)objInfo.cbObject, objInfo.Attr.fMode));
+
+            DnDURIObject *pObjFile = new DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget);
+            if (pObjFile)
+            {
                 if (fFlags & DNDURILIST_FLAGS_KEEP_OPEN) /* Shall we keep the file open while being added to this list? */
                 {
                     /** @todo Add a standard fOpen mode for this list. */
-                    rc = pObj->Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE,
-                                    objInfo.Attr.fMode);
+                    rc = pObjFile->Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, objInfo.Attr.fMode);
                 }
 
                 if (RT_SUCCESS(rc))
                 {
-                    m_lstTree.append(pObj);
+                    m_lstTree.append(pObjFile);
 
                     m_cTotal++;
-                    m_cbTotal += pObj->GetSize();
+                    m_cbTotal += pObjFile->GetSize();
                 }
-            }
-            else if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
-            {
-                LogFlowFunc(("Directory '%s' -> '%s' (file mode 0x%x)\n", pcszSource, pcszTarget, objInfo.Attr.fMode));
-
-                pObj = new DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget, objInfo.Attr.fMode, 0 /* Size */);
-                m_lstTree.append(pObj);
+                else
+                    delete pObjFile;
+            }
+            else
+                rc = VERR_NO_MEMORY;
+        }
+        else if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
+        {
+            LogFlowFunc(("Directory '%s' -> '%s' (file mode 0x%x)\n", pcszSource, pcszTarget, objInfo.Attr.fMode));
+
+            DnDURIObject *pObjDir = new DnDURIObject(DnDURIObject::Directory, pcszSource, pcszTarget,
+                                                     objInfo.Attr.fMode, 0 /* Size */);
+            if (pObjDir)
+            {
+                m_lstTree.append(pObjDir);
 
                 /** @todo Add DNDURILIST_FLAGS_KEEP_OPEN handling? */
                 m_cTotal++;
             }
-            /* Note: Symlinks already should have been resolved at this point. */
             else
-                rc = VERR_NOT_SUPPORTED;
-
-            if (RT_FAILURE(rc))
-            {
-                if (pObj)
-                    delete pObj;
-            }
-        }
-        catch (std::bad_alloc &)
-        {
-            rc = VERR_NO_MEMORY;
-        }
+                rc = VERR_NO_MEMORY;
+        }
+        /* Note: Symlinks already should have been resolved at this point. */
+        else
+            rc = VERR_NOT_SUPPORTED;
     }