Changeset 98709 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Feb 24, 2023 8:49:40 AM (2 years ago)

Author:

vboxsync

Message:

Guest Control: Implemented directory handling / walking as non-toolbox variants. bugref:9783

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (10 diffs)

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

@@ -1009 +1009 @@
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_DIR_OPEN);
         VbglHGCMParmPtrSet(&Msg.path, pszPath, cbPath);
-        VbglHGCMParmUInt64Set(&Msg.flags, 0);
-        VbglHGCMParmUInt64Set(&Msg.filter, 0);
+        VbglHGCMParmUInt32Set(&Msg.filter, 0);
+        VbglHGCMParmUInt32Set(&Msg.flags, 0);
 
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -1016 +1016 @@
         {
             Msg.context.GetUInt32(&pCtx->uContextID);
+            Msg.filter.GetUInt32((uint32_t *)penmFilter);
             Msg.flags.GetUInt32(pfFlags);
-            Msg.filter.GetUInt32((uint32_t *)penmFilter);
         }
     } while (rc == VERR_INTERRUPTED && g_fVbglR3GuestCtrlHavePeekGetCancel);
@@ -1044 +1044 @@
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_DIR_CLOSE);
-        VbglHGCMParmUInt64Set(&Msg.handle, 0);
+        VbglHGCMParmUInt32Set(&Msg.handle, 0);
 
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -1071 +1071 @@
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-    AssertReturn(pCtx->uNumParms == 4, VERR_INVALID_PARAMETER);
+    AssertReturn(pCtx->uNumParms == 5, VERR_INVALID_PARAMETER);
 
     AssertPtrReturn(puHandle, VERR_INVALID_POINTER);
@@ -1084 +1084 @@
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_DIR_READ);
-        VbglHGCMParmUInt64Set(&Msg.handle, 0);
-        VbglHGCMParmUInt32Set(&Msg.entry_size, 0);
+        VbglHGCMParmUInt32Set(&Msg.handle, 0);
+        VbglHGCMParmUInt32Set(&Msg.max_entry_size, 0);
         VbglHGCMParmUInt32Set(&Msg.add_attributes, 0);
         VbglHGCMParmUInt32Set(&Msg.flags, 0);
@@ -1094 +1094 @@
             Msg.context.GetUInt32(&pCtx->uContextID);
             Msg.handle.GetUInt32(puHandle);
-            Msg.entry_size.GetUInt32(pcbDirEntry);
+            Msg.max_entry_size.GetUInt32(pcbDirEntry);
             Msg.add_attributes.GetUInt32(penmAddAttrib);
             Msg.flags.GetUInt32(pfFlags);
@@ -2236 +2236 @@
 
     HGCMReplyDirNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY,
-                       RT_SUCCESS((int)uRc) ? GSTCTL_HGCM_REPLY_HDR_PARMS + 1 : GSTCTL_HGCM_REPLY_HDR_PARMS);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 1);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_DIR_NOTIFYTYPE_OPEN);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
 
-    if (RT_SUCCESS((int)uRc))
-        VbglHGCMParmUInt32Set(&Msg.u.open.handle, uDirHandle);
+    VbglHGCMParmUInt32Set(&Msg.u.open.handle, uDirHandle);
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, u.open));
@@ -2266 +2264 @@
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
 
-    return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, u));
+    return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, reply_hdr));
 }
 
@@ -2290 +2288 @@
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-    AssertReturn(RT_FAILURE((int)uRc) || pszUser, VERR_INVALID_POINTER);
-    AssertReturn(RT_FAILURE((int)uRc) || pszGroups, VERR_INVALID_POINTER);
-    AssertReturn(RT_FAILURE((int)uRc) || pvACL, VERR_INVALID_POINTER);
-    AssertReturn(RT_FAILURE((int)uRc) || cbACL, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszGroups, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvACL, VERR_INVALID_POINTER);
+    AssertReturn(cbACL, VERR_INVALID_PARAMETER);
 
     HGCMReplyDirNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY,
-                       RT_SUCCESS((int)uRc) ? GSTCTL_HGCM_REPLY_HDR_PARMS + 4 : GSTCTL_HGCM_REPLY_HDR_PARMS);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 4);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_DIR_NOTIFYTYPE_READ);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
 
-    if (RT_SUCCESS((int)uRc))
-    {
-        VbglHGCMParmPtrSet(&Msg.u.read.entry, pEntry, cbSize);
-        VbglHGCMParmPtrSetString(&Msg.u.read.user,   pszUser);
-        VbglHGCMParmPtrSetString(&Msg.u.read.groups, pszGroups);
-        VbglHGCMParmPtrSet      (&Msg.u.read.acl,    pvACL, cbACL);
-    }
+    VbglHGCMParmPtrSet      (&Msg.u.read.entry,   pEntry, cbSize);
+    VbglHGCMParmPtrSetString(&Msg.u.read.user,    pszUser);
+    VbglHGCMParmPtrSetString(&Msg.u.read.groups,  pszGroups);
+    VbglHGCMParmPtrSet      (&Msg.u.read.acl,     pvACL, cbACL);
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, u.read));
@@ -2327 +2321 @@
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize)
 {
-    char szIgnored[1];
+    char szIgnored[1] = { 0 };
     return VbglR3GuestCtrlDirCbReadEx(pCtx, uRc, pEntry, cbSize, szIgnored /* pszUser */, szIgnored /* pszGroups */,
                                       szIgnored /* pvACL */, sizeof(szIgnored) /* cbACL */);