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

Timestamp:

Feb 22, 2016 4:44:07 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105652

Message:

DnDURIObject.cpp: Use NIL_RTFILE for file objects.

File:

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

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2014-2015 Oracle Corporation
+ * Copyright (C) 2014-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
     {
         case File:
-            u.m_hFile = NULL;
+            u.m_hFile = NIL_RTFILE;
             break;
 
@@ -77 +77 @@
 void DnDURIObject::closeInternal(void)
 {
-    switch (m_Type)
-    {
-        case File:
-        {
-            if (u.m_hFile)
+    LogFlowThisFuncEnter();
+    switch (m_Type)
+    {
+        case File:
+        {
+            if (u.m_hFile != NIL_RTFILE)
             {
                 int rc2 = RTFileClose(u.m_hFile);
                 AssertRC(rc2);
 
-                u.m_hFile = NULL;
+                u.m_hFile = NIL_RTFILE;
             }
             break;
@@ -97 +98 @@
             break;
     }
-
-    LogFlowThisFuncLeave();
 }
 
@@ -136 +135 @@
     {
         case File:
-            fIsOpen = u.m_hFile != NULL;
+            fIsOpen = u.m_hFile != NIL_RTFILE;
             break;
 
@@ -181 +180 @@
         && fOpen) /* Opening mode specified? */
     {
+        LogFlowThisFunc(("strPath=%s, fOpen=0x%x, enmType=%RU32, enmDest=%RU32\n",
+                         strPath.c_str(), fOpen, enmType, enmDest));
         switch (enmType)
         {
             case File:
             {
-                if (!u.m_hFile)
+                if (u.m_hFile == NIL_RTFILE)
                 {
                     /*
@@ -192 +193 @@
                      * it over.
                      */
+                    LogFlowThisFunc(("Opening ...\n"));
                     rc = RTFileOpen(&u.m_hFile, strPath.c_str(), fOpen);
-                    LogFlowThisFunc(("strPath=%s, fOpen=0x%x, enmType=%RU32, enmDest=%RU32, rc=%Rrc\n",
-                                     strPath.c_str(), fOpen, enmType, enmDest, rc));
                     if (RT_SUCCESS(rc))
                         rc = RTFileGetSize(u.m_hFile, &m_cbSize);
@@ -364 +364 @@
 void DnDURIObject::Reset(void)
 {
+    LogFlowThisFuncEnter();
+
     Close();
 
@@ -396 +398 @@
                     m_cbProcessed += cbWritten;
             }
-
             break;
         }
@@ -417 +418 @@
     }
 
-    LogFlowFunc(("Returning strSourcePath=%s, cbWritten=%zu, rc=%Rrc\n", m_strSrcPath.c_str(), cbWritten, rc));
+    LogFlowThisFunc(("Returning strSourcePath=%s, cbWritten=%zu, rc=%Rrc\n", m_strSrcPath.c_str(), cbWritten, rc));
     return rc;
 }