Changeset 77245 in vbox for trunk/src/VBox

Timestamp:

Feb 10, 2019 11:39:42 PM (6 years ago)

Author:

vboxsync

Message:

HGCM,SharedFolders: Added new variation on the HGCM page list type that does not use a bounce buffer. bugref:9172 [fix]

• Added VMMDevHGCMParmType_NoBouncePageList.
• Made VMMDevHGCMParmType_Embedded and VMMDevHGCMParmType_ContiguousPageList return updated buffer size to the guest.
• Changed the SHFL_FN_READ and SHFL_FN_WRITE function to accept VMMDevHGCMParmType_NoBouncePageList as buffer parameter type, using the RTFileSgReadAt/WriteAt functions to do the work.
• Modified the offset parameter of SHFL_FN_WRITE to return an update offset to assist in the RTFILE_O_APPEND scenarios where other parties have extended the file without the guest knowing. The guest now gets the file size returned after each write to an handle opened with RTFILE_O_APPEND.

File:

• trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp

@@ -666 +666 @@
 
             /* Verify parameters values. */
-            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_ROOT, rc == VERR_INVALID_PARAMETER);
-            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_NIL,  rc == VERR_INVALID_HANDLE);
+            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_ROOT, rc = VERR_INVALID_PARAMETER);
+            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_NIL,  rc = VERR_INVALID_HANDLE);
             if (paParms[4].type == VBOX_HGCM_SVC_PARM_PTR)
-                ASSERT_GUEST_STMT_BREAK(cbRead <= paParms[4].u.pointer.size, rc == VERR_INVALID_HANDLE);
-            else
-                ASSERT_GUEST_STMT_BREAK(cbRead <= paParms[4].u.Pages.cb, rc == VERR_OUT_OF_RANGE);
+                ASSERT_GUEST_STMT_BREAK(cbRead <= paParms[4].u.pointer.size, rc = VERR_INVALID_HANDLE);
+            else
+                ASSERT_GUEST_STMT_BREAK(cbRead <= paParms[4].u.Pages.cb, rc = VERR_OUT_OF_RANGE);
 
             /* Execute the function. */
@@ -715 +715 @@
 
             /* Verify parameters values. */
-            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_ROOT, rc == VERR_INVALID_PARAMETER);
-            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_NIL,  rc == VERR_INVALID_HANDLE);
+            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_ROOT, rc = VERR_INVALID_PARAMETER);
+            ASSERT_GUEST_STMT_BREAK(hFile != SHFL_HANDLE_NIL,  rc = VERR_INVALID_HANDLE);
             if (paParms[4].type == VBOX_HGCM_SVC_PARM_PTR)
-                ASSERT_GUEST_STMT_BREAK(cbWrite <= paParms[4].u.pointer.size, rc == VERR_INVALID_HANDLE);
-            else
-                ASSERT_GUEST_STMT_BREAK(cbWrite <= paParms[4].u.Pages.cb, rc == VERR_OUT_OF_RANGE);
+                ASSERT_GUEST_STMT_BREAK(cbWrite <= paParms[4].u.pointer.size, rc = VERR_INVALID_HANDLE);
+            else
+                ASSERT_GUEST_STMT_BREAK(cbWrite <= paParms[4].u.Pages.cb, rc = VERR_OUT_OF_RANGE);
 
             /* Execute the function. */