Changeset 78020 in vbox for trunk/src

Timestamp:

Apr 5, 2019 8:23:13 AM (6 years ago)

Author:

vboxsync

Message:

DnD/DnDURIObject: Got rid of internal m_fIsOpen member, which is superfluous.

File:

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

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

@@ -36 +36 @@
     : m_enmType(Type_Unknown)
     , m_enmView(View_Unknown)
-    , m_fIsOpen(false)
 {
     RT_ZERO(u);
@@ -48 +47 @@
     , m_strSrcPathAbs(strSrcPathAbs)
     , m_strTgtPathAbs(strDstPathAbs)
-    , m_fIsOpen(false)
 {
     RT_ZERO(u);
@@ -65 +63 @@
 {
     LogFlowThisFuncEnter();
-
-    if (!m_fIsOpen)
-        return;
 
     switch (m_enmType)
@@ -90 +85 @@
             break;
     }
-
-    m_fIsOpen = false;
 }
 
@@ -190 +183 @@
 bool DnDURIObject::IsOpen(void) const
 {
-    return m_fIsOpen;
+    switch (m_enmType)
+    {
+        case Type_File:      return RTFileIsValid(u.File.hFile);
+        case Type_Directory: return RTDirIsValid(u.Dir.hDir);
+        default:             break;
+    }
+
+    return false;
 }
 
@@ -223 +223 @@
     AssertReturn(!(fFlags & ~DNDURIOBJECT_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
     RT_NOREF1(fFlags);
-
-    if (m_fIsOpen)
-        return VINF_SUCCESS;
 
     int rc = VINF_SUCCESS;
@@ -301 +298 @@
     {
         m_enmView = enmView;
-        m_fIsOpen = true;
     }
 
@@ -312 +308 @@
  *
  * @return  IPRT status code.
- * @param   enmView             View to use for querying information.
+ * @param   enmView             View to use for querying information. Currently ignored.
  */
 int DnDURIObject::queryInfoInternal(View enmView)
@@ -323 +319 @@
     {
         case Type_File:
+            AssertMsgReturn(RTFileIsValid(u.File.hFile), ("Object has invalid file handle\n"), VERR_INVALID_STATE);
             rc = RTFileQueryInfo(u.File.hFile, &u.File.objInfo, RTFSOBJATTRADD_NOTHING);
             break;
 
         case Type_Directory:
+            AssertMsgReturn(RTDirIsValid(u.Dir.hDir), ("Object has invalid directory handle\n"), VERR_INVALID_STATE);
             rc = RTDirQueryInfo(u.Dir.hDir, &u.Dir.objInfo, RTFSOBJATTRADD_NOTHING);
             break;
@@ -429 +427 @@
     /* pcbRead is optional. */
 
-    AssertMsgReturn(m_fIsOpen, ("Object not in open state\n"), VERR_INVALID_STATE);
     AssertMsgReturn(m_enmView == View_Source, ("Cannot write to an object which is not in target view\n"),
                     VERR_INVALID_STATE);
@@ -526 +523 @@
     /* pcbWritten is optional. */
 
-    AssertMsgReturn(m_fIsOpen, ("Object not in open state\n"), VERR_INVALID_STATE);
     AssertMsgReturn(m_enmView == View_Target, ("Cannot write to an object which is not in target view\n"),
                     VERR_INVALID_STATE);