Changeset 57500 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 21, 2015 4:54:50 PM (10 years ago)

Author:

vboxsync

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

102287

Message:

DnD: Use a separate context for URI object when transferring, misc cleanups.

File:

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

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

@@ -414 +414 @@
                     if (pszPathAbs)
                     {
-                        rc = RTDirCreate(pszPathAbs, (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRWXU, 0);
+#ifdef RT_OS_WINDOWS
+                        uint32_t fCreationMode = (fMode & RTFS_DOS_MASK) | RTFS_DOS_NT_NORMAL;
+#else
+                        uint32_t fCreationMode = (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRWXU;
+#endif
+                        rc = RTDirCreate(pszPathAbs, fCreationMode, 0);
                         if (RT_SUCCESS(rc))
                             rc = DnDDirDroppedAddDir(&dirDroppedFiles, pszPathAbs);
@@ -455 +460 @@
                     if (   RT_SUCCESS(rc)
                         && (   uNextMsg == DragAndDropSvc::HOST_DND_HG_SND_FILE_HDR
-                             /* Protocol v1 always sends the file name, so try opening every time. */
+                             /* Protocol v1 always sends the file name, so opening the file every time. */
                             || pCtx->uProtocol <= 1)
                        )
@@ -465 +470 @@
                                          szPathName, cbPathName, fMode, cbFileSize));
 
-                            uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_ALL;
+                            uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_WRITE;
                             if (pCtx->uProtocol <= 1)
                                 fOpen |= RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND;
@@ -475 +480 @@
                             {
                                 RTCString strPathAbs(pszPathAbs);
-                                rc = objFile.OpenEx(strPathAbs, DnDURIObject::File, DnDURIObject::Target, fOpen,
-                                                    (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
+#ifdef RT_OS_WINDOWS
+                                uint32_t fCreationMode = (fMode & RTFS_DOS_MASK) | RTFS_DOS_NT_NORMAL;
+#else
+                                uint32_t fCreationMode = (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR;
+#endif
+                                rc = objFile.OpenEx(strPathAbs, DnDURIObject::File, DnDURIObject::Target, fOpen, fCreationMode);
                                 if (RT_SUCCESS(rc))
                                 {
@@ -927 +936 @@
             rc = VINF_PERMISSION_DENIED;
 
-        /* Set the protocol version to use. */
-        pCtx->uProtocol = 2;
-
-        Assert(Info.u32ClientID);
-        pCtx->uClientID = Info.u32ClientID;
+        if (RT_SUCCESS(rc))
+        {
+            /* Set the protocol version to use. */
+            pCtx->uProtocol = 2;
+
+            Assert(Info.u32ClientID);
+            pCtx->uClientID = Info.u32ClientID;
+        }
     }
 
@@ -941 +953 @@
          *       does not implement this command.
          */
-        DragAndDropSvc::VBOXDNDCONNECTPMSG Msg;
+        DragAndDropSvc::VBOXDNDCONNECTMSG Msg;
         RT_ZERO(Msg);
         Msg.hdr.result      = VERR_WRONG_ORDER;
@@ -1142 +1154 @@
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(uStatus > DragAndDropSvc::DND_PROGRESS_UNKNOWN, VERR_INVALID_PARAMETER);
 
     DragAndDropSvc::VBOXDNDHGEVTPROGRESSMSG Msg;
@@ -1147 +1160 @@
     Msg.hdr.result      = VERR_WRONG_ORDER;
     Msg.hdr.u32ClientID = pCtx->uClientID;
-    Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS;
+    Msg.hdr.u32Function = uStatus;
     Msg.hdr.cParms      = 3;