vbox的更動 98665 路徑 trunk/src/VBox/Additions/common

時間撮記:

2023-2-21 上午07:49:56 (21 月 以前)

作者:

vboxsync

訊息:

Guest Control: Implemented the GuestSession::i_fsQueryInfo() + GuestSession::i_fsCreateTemp() calls. bugref:9783

位置:

trunk/src/VBox/Additions/common

檔案:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (修改) (2 筆差異)
• VBoxService/VBoxServiceControlSession.cpp (修改) (3 筆差異)

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

@@ -2625 +2625 @@
 
     HGCMReplyFsNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, 7);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_QUERY_INFO);
@@ -2634 +2634 @@
     VbglHGCMParmPtrSet      (&Msg.u.queryinfo.acl,    pvACL, cbACL);
 
-    return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, u.read));
+    return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyFsNotify, u.queryinfo));
 }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1780 +1780 @@
     if (RT_SUCCESS(rc))
     {
+        uint32_t fFlagsRuntime = 0;
+
         if (!(fFlags & ~GSTCTL_QUERYINFO_F_VALID_MASK))
         {
-            uint32_t fFlagsRuntime = 0;
             if (fFlags & GSTCTL_QUERYINFO_F_ON_LINK)
                 fFlagsRuntime |= RTPATH_F_ON_LINK;
@@ -1790 +1791 @@
                 fFlagsRuntime |= RTPATH_F_NO_SYMLINKS;
 
+            if (!RTPATH_F_IS_VALID(fFlagsRuntime, 0))
+                rc = VERR_INVALID_PARAMETER;
+        }
+        else
+            rc = VERR_INVALID_PARAMETER;
+
+        if (RT_FAILURE(rc))
+            VGSvcError("Invalid fsqueryinfo flags: %#x (%#x)\n", fFlags, fFlagsRuntime);
+
+        if (RT_SUCCESS(rc))
+        {
 #define CASE_ATTR_ADD_VAL(a_Val) \
             case GSTCTL##a_Val: enmAttrRuntime = RT##a_Val; break;
@@ -1820 +1832 @@
 
             rc = RTPathQueryInfoEx(szPath, &objInfoRuntime, enmAttrRuntime, fFlagsRuntime);
-        }
-        else
-        {
-            VGSvcError("Invalid stat flags: %#x\n", fFlags);
-            rc = VERR_NOT_SUPPORTED;
         }