Changeset 97733 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Dec 2, 2022 4:40:56 PM (2 years ago)

Author:

vboxsync

Message:

DnD/VbglR3: Added some (optional release) logging to the generic code.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (10 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

@@ -99 +99 @@
             rc = Msg.cParms.GetUInt32(pcParms); AssertRC(rc);
         }
+
+        LogRel(("DnD: Received message %s (%#x) from host\n", DnDHostMsgToStr(*puMsg), *puMsg));
 
     } while (rc == VERR_INTERRUPTED);
@@ -386 +388 @@
         return VINF_SUCCESS;
 
+    LogRel2(("DnD: Receiving URI data started\n"));
+
     /*
      * Allocate temporary chunk buffer.
@@ -416 +420 @@
     do
     {
-        LogFlowFunc(("Wating for new message ...\n"));
+        LogFlowFunc(("Waiting for new message ...\n"));
 
         uint32_t uNextMsg;
@@ -583 +587 @@
                 default:
                 {
-                    LogFlowFunc(("Message %RU32 not supported\n", uNextMsg));
+                    LogRel(("DnD: Warning: Message %s (%#x) from host not supported\n", DnDGuestMsgToStr(uNextMsg), uNextMsg));
                     rc = VERR_NOT_SUPPORTED;
                     break;
@@ -616 +620 @@
     if (RT_FAILURE(rc))
     {
+        LogRel(("DnD: Receiving URI data failed with %Rrc\n", rc));
+
         DnDTransferObjectDestroy(&objCur);
         DnDDroppedFilesRollback(pDroppedFiles);
@@ -621 +627 @@
     else
     {
+        LogRel2(("DnD: Receiving URI data finished\n"));
+
         /** @todo Compare the transfer list with the dirs/files we really transferred. */
         /** @todo Implement checksum verification, if any. */
@@ -909 +917 @@
             RTMemFree(pvData);
 
-        LogRel(("DnD: Receiving meta data failed with %Rrc\n", rc));
-
         if (rc != VERR_CANCELLED)
         {
+            LogRel(("DnD: Receiving data failed with %Rrc\n", rc));
+
             int rc2 = VbglR3DnDHGSendProgress(pCtx, DND_PROGRESS_ERROR, 100 /* Percent */, rc);
             if (RT_FAILURE(rc2))
-                LogFlowFunc(("Unable to send progress error %Rrc to host: %Rrc\n", rc, rc2));
+                LogRel(("DnD: Unable to send progress error %Rrc to host: %Rrc\n", rc, rc2));
         }
     }
@@ -1178 +1186 @@
             && (uSessionID != pCtx->uSessionID))
         {
-            LogFlowFunc(("VM session ID changed to %RU64\n", uSessionID));
-
+            LogRel2(("DnD: VM session ID changed to %RU64\n", uSessionID));
             rc = VbglR3DnDDisconnect(pCtx);
             if (RT_SUCCESS(rc))
@@ -1188 +1195 @@
     if (rc == VERR_CANCELLED) /* Host service told us that we have to bail out. */
     {
+        LogRel2(("DnD: Host service requested termination\n"));
+
         pEvent->enmType = VBGLR3DNDEVENTTYPE_QUIT;
-
         *ppEvent = pEvent;
 
@@ -1312 +1320 @@
     {
         VbglR3DnDEventFree(pEvent);
-        LogFlowFunc(("Failed with %Rrc\n", rc));
+        LogRel(("DnD: Handling message %s (%#x) failed with %Rrc\n", DnDHostMsgToStr(uMsg), uMsg, rc));
     }
     else