Changeset 50561 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

Timestamp:

Feb 24, 2014 9:07:22 PM (11 years ago)

Author:

vboxsync

Message:

DnD: Update, bugfixes.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -278 +278 @@
 
     /* Allocate temp buffer. */
-    uint32_t cbTmpData = _1M * 10; /** @todo r=andy 10MB, uh, really?? */
+    uint32_t cbTmpData = _64K; /** @todo Make this configurable? */
     void *pvTmpData = RTMemAlloc(cbTmpData);
     if (!pvTmpData)
@@ -311 +311 @@
     RTCList<RTCString> guestDirList;
     RTCList<RTCString> guestFileList;
-    char pszPathName[RTPATH_MAX];
-    uint32_t cbPathname = 0;
+
+    char szPathName[RTPATH_MAX];
+    uint32_t cbPathName = 0;
+
     bool fLoop = RT_SUCCESS(rc); /* No error occurred yet? */
     while (fLoop)
@@ -327 +329 @@
                     uint32_t fMode = 0;
                     rc = vbglR3DnDHGProcessSendDirMessage(uClientId,
-                                                          pszPathName,
-                                                          sizeof(pszPathName),
-                                                          &cbPathname,
+                                                          szPathName,
+                                                          sizeof(szPathName),
+                                                          &cbPathName,
                                                           &fMode);
+#ifdef DEBUG_andy
+                    LogFlowFunc(("HOST_DND_HG_SND_DIR pszPathName=%s, cbPathName=%RU32, fMode=0x%x, rc=%Rrc\n",
+                                 szPathName, cbPathName, fMode, rc));
+#endif
                     if (RT_SUCCESS(rc))
-                        rc = DnDPathSanitize(pszPathName, sizeof(pszPathName));
+                        rc = DnDPathSanitize(szPathName, sizeof(szPathName));
                     if (RT_SUCCESS(rc))
                     {
-                        char *pszNewDir = RTPathJoinA(pszDropDir, pszPathName);
+                        char *pszNewDir = RTPathJoinA(pszDropDir, szPathName);
                         if (pszNewDir)
                         {
@@ -354 +360 @@
                     uint32_t fMode = 0;
                     rc = vbglR3DnDHGProcessSendFileMessage(uClientId,
-                                                           pszPathName,
-                                                           sizeof(pszPathName),
-                                                           &cbPathname,
+                                                           szPathName,
+                                                           sizeof(szPathName),
+                                                           &cbPathName,
                                                            pvTmpData,
                                                            cbTmpData,
                                                            &cbDataRecv,
                                                            &fMode);
+#ifdef DEBUG_andy
+                    LogFlowFunc(("HOST_DND_HG_SND_FILE pszPathName=%s, cbPathName=%RU32, pvData=0x%p, cbDataRecv=%RU32, fMode=0x%x, rc=%Rrc\n",
+                                 szPathName, cbPathName, pvTmpData, cbDataRecv, fMode, rc));
+#endif
                     if (RT_SUCCESS(rc))
-                        rc = DnDPathSanitize(pszPathName, sizeof(pszPathName));
+                        rc = DnDPathSanitize(szPathName, sizeof(szPathName));
                     if (RT_SUCCESS(rc))
                     {
-                        char *pszNewFile = RTPathJoinA(pszDropDir, pszPathName);
-                        if (pszNewFile)
+                        char *pszPathAbs = RTPathJoinA(pszDropDir, szPathName);
+                        if (pszPathAbs)
                         {
                             RTFILE hFile;
@@ -372 +382 @@
                              *               create all sorts of funny races because we don't know if the guest has
                              *               modified the file in between the file data send calls. */
-                            rc = RTFileOpen(&hFile, pszNewFile,
+                            rc = RTFileOpen(&hFile, pszPathAbs,
                                             RTFILE_O_WRITE | RTFILE_O_APPEND | RTFILE_O_DENY_ALL | RTFILE_O_OPEN_CREATE);
                             if (RT_SUCCESS(rc))
@@ -386 +396 @@
                                         rc = RTFileSetMode(hFile, (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
                                 }
+
                                 RTFileClose(hFile);
-                                if (!guestFileList.contains(pszNewFile))
-                                    guestFileList.append(pszNewFile);
+
+                                if (!guestFileList.contains(pszPathAbs))
+                                    guestFileList.append(pszPathAbs);
                             }
-
-                            RTStrFree(pszNewFile);
+#ifdef DEBUG
+                            else
+                                LogFlowFunc(("Opening file failed with rc=%Rrc\n", rc));
+#endif
+                            RTStrFree(pszPathAbs);
                         }
                         else
@@ -416 +431 @@
             break;
         }
+
+        if (RT_FAILURE(rc))
+            break;
+
     } /* while */
 
@@ -430 +449 @@
             RTDirRemove(guestDirList.at(i).c_str());
         RTDirRemove(pszDropDir);
+
+        LogFlowFunc(("Failed with rc=%Rrc\n", rc));
     }
 
@@ -473 +494 @@
             rc = Msg.uScreenId.GetUInt32(puScreenId);  AssertRC(rc);
             rc = Msg.cFormat.GetUInt32(pcbFormatRecv); AssertRC(rc);
-            rc = Msg.cbData.GetUInt32(pcbDataTotal);     AssertRC(rc);
+            rc = Msg.cbData.GetUInt32(pcbDataTotal);   AssertRC(rc);
 
             AssertReturn(cbFormat >= *pcbFormatRecv, VERR_TOO_MUCH_DATA);
@@ -789 +810 @@
                 break;
             }
+            case DragAndDropSvc::HOST_DND_HG_SND_MORE_DATA:
+            case DragAndDropSvc::HOST_DND_HG_SND_DIR:
+            case DragAndDropSvc::HOST_DND_HG_SND_FILE:
+            {
+                pEvent->uType = uMsg;
+
+                /* All messages in this case are handled internally
+                 * by vbglR3DnDHGProcessSendDataMessage() and must
+                 * be specified by a preceding HOST_DND_HG_SND_DATA call. */
+                rc = VERR_WRONG_ORDER;
+                break;
+            }
             case DragAndDropSvc::HOST_DND_HG_EVT_CANCEL:
             {
@@ -1107 +1140 @@
         rc = vbglR3DnDGHSendDataInternal(u32ClientId, pvData, cbData,
                                          0 /* cbAdditionalData */);
-
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDGHErrorEvent(uint32_t u32ClientId, int rcOp)
+    if (RT_FAILURE(rc))
+    {
+        int rc2 = VbglR3DnDGHSendError(u32ClientId, rc);
+        if (RT_SUCCESS(rc2))
+            rc2 = rc;
+    }
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDGHSendError(uint32_t u32ClientId, int rcErr)
 {
     DragAndDropSvc::VBOXDNDGHEVTERRORMSG Msg;
@@ -1120 +1159 @@
     Msg.hdr.cParms      = 1;
 
-    Msg.uRC.SetUInt32(rcOp);
-
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-        rc = Msg.hdr.result;
-
-    return rc;
-}
-
+    Msg.uRC.SetUInt32((uint32_t)rcErr); /* uint32_t vs. int. */
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        rc = Msg.hdr.result;
+
+    LogFlowFunc(("Sending error %Rrc returned with rc=%Rrc\n", rcErr, rc));
+    return rc;
+}
+