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

Timestamp:

Jun 30, 2020 10:38:52 AM (5 years ago)

Author:

vboxsync

Message:

DnD: More (release) logging for URIObject implementation.

File:

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

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

@@ -51 +51 @@
     LogFlowThisFuncEnter();
 
-    switch (m_enmType)
-    {
-        case Type_File:
-        {
-            RTFileClose(u.File.hFile);
-            u.File.hFile = NIL_RTFILE;
-            RT_ZERO(u.File.objInfo);
-            break;
-        }
-
-        case Type_Directory:
-        {
-            RTDirClose(u.Dir.hDir);
-            u.Dir.hDir = NIL_RTDIR;
-            RT_ZERO(u.Dir.objInfo);
-            break;
-        }
-
-        default:
-            break;
-    }
+    int rc;
+
+    switch (m_enmType)
+    {
+        case Type_File:
+        {
+            LogRel2(("DnD: Closing file '%s'\n", m_strPathAbs.c_str()));
+
+            rc = RTFileClose(u.File.hFile);
+            if (RT_SUCCESS(rc))
+            {
+                u.File.hFile = NIL_RTFILE;
+                RT_ZERO(u.File.objInfo);
+            }
+            else
+                LogRel(("DnD: Closing file '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
+            break;
+        }
+
+        case Type_Directory:
+        {
+            LogRel2(("DnD: Closing directory '%s'\n", m_strPathAbs.c_str()));
+
+            rc = RTDirClose(u.Dir.hDir);
+            if (RT_SUCCESS(rc))
+            {
+                u.Dir.hDir = NIL_RTDIR;
+                RT_ZERO(u.Dir.objInfo);
+            }
+            else
+                LogRel(("DnD: Closing directory '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
+            break;
+        }
+
+        default:
+            break;
+    }
+
+    /** @todo Return rc. */
 }
 
@@ -176 +194 @@
             m_strPathAbs = strPathAbs;
         }
+        else
+            LogRel2(("DnD: Absolute file path for guest file on the host is now '%s'\n", m_strPathAbs.c_str()));
     }
     else
@@ -253 +273 @@
             case Type_File:
             {
+                LogRel2(("DnD: Opening file '%s'\n", m_strPathAbs.c_str()));
+
                 /*
                  * Open files on the source with RTFILE_O_DENY_WRITE to prevent races
@@ -265 +287 @@
                     {
                         rc = RTFileSetMode(u.File.hFile, fMode);
+                        if (RT_FAILURE(rc))
+                            LogRel(("DnD: Setting mode %#x for file '%s' failed with %Rrc\n", fMode, m_strPathAbs.c_str(), rc));
                     }
                     else if (fOpen & RTFILE_O_READ)
@@ -271 +295 @@
                     }
                 }
+                else
+                    LogRel(("DnD: Opening file '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
 
                 if (RT_SUCCESS(rc))
@@ -285 +311 @@
             case Type_Directory:
             {
+                LogRel2(("DnD: Opening directory '%s'\n", m_strPathAbs.c_str()));
+
                 rc = RTDirOpen(&u.Dir.hDir, m_strPathAbs.c_str());
                 if (RT_SUCCESS(rc))
+                {
                     rc = queryInfoInternal();
+                }
+                else
+                    LogRel(("DnD: Opening directory '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
                 break;
             }
@@ -326 +358 @@
             break;
     }
+
+    if (RT_FAILURE(rc))
+        LogRel(("DnD: Querying information for '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
 
     return rc;
@@ -440 +475 @@
                 }
             }
+            else
+                LogRel(("DnD: Reading from file '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
             break;
         }
@@ -520 +557 @@
             rc = RTFileWrite(u.File.hFile, pvBuf, cbBuf, &cbWritten);
             if (RT_SUCCESS(rc))
+            {
                 u.File.cbProcessed += cbWritten;
+            }
+            else
+                LogRel(("DnD: Writing to file '%s' failed with %Rrc\n", m_strPathAbs.c_str(), rc));
             break;
         }