Changeset 59828 in vbox for trunk/src/VBox/GuestHost/DragAndDrop

Timestamp:

Feb 26, 2016 9:51:24 AM (9 years ago)

Author:

vboxsync

Message:

DnD/DnDURIObject: Use a dedicated flag for indicating the opening status.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp (modified) (5 diffs)

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

@@ -53 +53 @@
     , m_strTgtPath(strDstPath)
     , m_fMode(fMode)
+    , m_fOpen(false)
     , m_cbSize(cbSize)
     , m_cbProcessed(0)
 {
+}
+
+DnDURIObject::~DnDURIObject(void)
+{
+    closeInternal();
+}
+
+void DnDURIObject::closeInternal(void)
+{
+    LogFlowThisFuncEnter();
+
+    if (!m_fOpen)
+        return;
+
     switch (m_Type)
     {
         case File:
+        {
+            RTFileClose(u.m_hFile);
             u.m_hFile = NIL_RTFILE;
             break;
+        }
 
         case Directory:
@@ -68 +86 @@
             break;
     }
-}
-
-DnDURIObject::~DnDURIObject(void)
-{
-    closeInternal();
-}
-
-void DnDURIObject::closeInternal(void)
-{
-    LogFlowThisFuncEnter();
-    switch (m_Type)
-    {
-        case File:
-        {
-            if (u.m_hFile != NIL_RTFILE)
-            {
-                int rc2 = RTFileClose(u.m_hFile);
-                AssertRC(rc2);
-
-                u.m_hFile = NIL_RTFILE;
-            }
-            break;
-        }
-
-        case Directory:
-            break;
-
-        default:
-            break;
-    }
+
+    m_fOpen = false;
 }
 
@@ -130 +120 @@
 bool DnDURIObject::IsOpen(void) const
 {
-    bool fIsOpen;
-
-    switch (m_Type)
-    {
-        case File:
-            fIsOpen = u.m_hFile != NIL_RTFILE;
-            break;
-
-        case Directory:
-            fIsOpen = true;
-            break;
-
-        default:
-            fIsOpen = false;
-            break;
-    }
-
-    return fIsOpen;
+    return m_fOpen;
 }
 
@@ -180 +153 @@
         && fOpen) /* Opening mode specified? */
     {
-        LogFlowThisFunc(("strPath=%s, fOpen=0x%x, enmType=%RU32, enmDest=%RU32\n",
-                         strPath.c_str(), fOpen, enmType, enmDest));
+        LogFlowThisFunc(("enmType=%RU32, strPath=%s, fOpen=0x%x, enmType=%RU32, enmDest=%RU32\n",
+                         enmType, strPath.c_str(), fOpen, enmType, enmDest));
         switch (enmType)
         {
             case File:
             {
-                if (u.m_hFile == NIL_RTFILE)
+                if (!m_fOpen)
                 {
                     /*
@@ -243 +216 @@
 
     if (RT_SUCCESS(rc))
-        m_Type = enmType;
+    {
+        m_Type  = enmType;
+        m_fOpen = true;
+    }
 
     LogFlowFuncLeaveRC(rc);