Changeset 50561 in vbox for trunk/src/VBox/GuestHost

Timestamp:

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

Author:

vboxsync

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

92425

Message:

DnD: Update, bugfixes.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (4 diffs)

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

@@ -183 +183 @@
 
                     /* End of file reached or error occurred? */
-                    if (   cbRead < cbToRead
+                    if (   m_cbProcessed == m_cbSize
                         || RT_FAILURE(rc))
+                    {
                         closeInternal();
+                    }
                 }
             }
@@ -572 +574 @@
 }
 
-RTCString DnDURIList::RootToString(const RTCString &strBasePath /* = "" */)
+RTCString DnDURIList::RootToString(const RTCString &strBasePath /* = "" */,
+                                   const RTCString &strSeparator /* = "\r\n" */)
 {
     RTCString strRet;
@@ -586 +589 @@
                 if (pszPathURI)
                 {
-                    strRet += RTCString(pszPathURI) + "\r\n";
+                    strRet += RTCString(pszPathURI) + strSeparator;
                     RTStrFree(pszPathURI);
                 }
+                else
+                    break;
                 RTStrFree(pszPath);
             }
@@ -599 +604 @@
             if (pszPathURI)
             {
-                strRet += RTCString(pszPathURI) + "\r\n";
+                strRet += RTCString(pszPathURI) + strSeparator;
                 RTStrFree(pszPathURI);
             }