Changeset 99253 in vbox for trunk

Timestamp:

Mar 31, 2023 10:22:37 AM (2 years ago)

Author:

vboxsync

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

156636

Message:

Guest Control: Renamed HOST_MSG_FS_QUERY_INFO -> HOST_MSG_FS_QUERY_INFO, to not confuse file system object information (files, directories, ++) with actual file system information. Required for preparation of implementing querying guest file system information. bugref:10414

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (2 diffs)
• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (3 diffs)
• src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp (modified) (1 diff)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -263 +263 @@
      * Retrieves information about a file system object.
      */
-    HOST_MSG_FS_QUERY_INFO = 334,
+    HOST_MSG_FS_OBJ_QUERY_INFO = 334,
     /**
      * Creates a temporary file or directory.
@@ -316 +316 @@
         RT_CASE_RET_STR(HOST_MSG_SHUTDOWN);
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-        RT_CASE_RET_STR(HOST_MSG_FS_QUERY_INFO);
+        RT_CASE_RET_STR(HOST_MSG_FS_OBJ_QUERY_INFO);
         RT_CASE_RET_STR(HOST_MSG_FS_CREATE_TEMP);
+        RT_CASE_RET_STR(HOST_MSG_FS_OBJ_MOVE);
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
         RT_CASE_RET_STR(HOST_MSG_32BIT_HACK);

trunk/include/VBox/VBoxGuestLib.h

@@ -1098 +1098 @@
  * @{
  */
-VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszPath, uint32_t cbPath, GSTCTLFSOBJATTRADD *penmAddAttrib, uint32_t *pfFlags);
+VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryObjInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszPath, uint32_t cbPath, GSTCTLFSOBJATTRADD *penmAddAttrib, uint32_t *pfFlags);
 VBGLR3DECL(int) VbglR3GuestCtrlFsGetCreateTemp(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszTemplate, uint32_t cbTemplate, char *pszPath, uint32_t cbPath, uint32_t *pfFlags, uint32_t *pfMode);
 /** @} */

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

@@ -1260 +1260 @@
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
 /**
- * Retrieves a HOST_MSG_FS_QUERY_INFO message.
+ * Retrieves a HOST_MSG_FS_OBJ_QUERY_INFO message.
  *
  * @returns VBox status code.
@@ -1269 +1269 @@
  * @param   pfFlags             Where to return the flags for .
  */
-VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx,
-                                              char *pszPath, uint32_t cbPath, GSTCTLFSOBJATTRADD *penmAddAttrib, uint32_t *pfFlags)
+VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryObjInfo(PVBGLR3GUESTCTRLCMDCTX pCtx,
+                                                 char *pszPath, uint32_t cbPath, GSTCTLFSOBJATTRADD *penmAddAttrib,
+                                                 uint32_t *pfFlags)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -1285 +1286 @@
         HGCMMsgFsQueryInfo Msg;
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
-        VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_FS_QUERY_INFO);
+        VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_FS_OBJ_QUERY_INFO);
         VbglHGCMParmPtrSet(&Msg.path, pszPath, cbPath);
         VbglHGCMParmUInt32Set(&Msg.add_attributes, 0);

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

@@ -1975 +1975 @@
 
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-static int vgsvcGstCtrlSessionHandleFsQueryInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleFsQueryObjInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1988 +1988 @@
     RTFSOBJINFO        objInfoRuntime;
 
-    int rc = VbglR3GuestCtrlFsGetQueryInfo(pHostCtx, szPath, sizeof(szPath), &enmAttrAdd, &fFlags);
+    int rc = VbglR3GuestCtrlFsGetQueryObjInfo(pHostCtx, szPath, sizeof(szPath), &enmAttrAdd, &fFlags);
     if (RT_SUCCESS(rc))
     {
@@ -2232 +2232 @@
 
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-        case HOST_MSG_FS_QUERY_INFO:
+        case HOST_MSG_FS_OBJ_QUERY_INFO:
             if (fImpersonated)
-                rc = vgsvcGstCtrlSessionHandleFsQueryInfo(pSession, pHostCtx);
+                rc = vgsvcGstCtrlSessionHandleFsQueryObjInfo(pSession, pHostCtx);
             break;
 

trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp

@@ -1661 +1661 @@
                         break;
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-                    case HOST_MSG_FS_QUERY_INFO:
+                    case HOST_MSG_FS_OBJ_QUERY_INFO:
                         RT_FALL_THROUGH();
                     case HOST_MSG_FS_CREATE_TEMP:

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2108 +2108 @@
         alock.release(); /* Drop lock before sending. */
 
-        vrc = i_sendMessage(HOST_MSG_FS_QUERY_INFO, i, paParms);
+        vrc = i_sendMessage(HOST_MSG_FS_OBJ_QUERY_INFO, i, paParms);
         if (RT_SUCCESS(vrc))
         {