Changeset 99256 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 31, 2023 12:40:07 PM (20 months ago)

Author:

vboxsync

Message:

Guest Control: More renaming; required for preparation of implementing querying guest file system information. bugref:10414

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)
• VBoxService/VBoxServiceControlSession.cpp (modified) (6 diffs)

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

@@ -1269 +1269 @@
  * @param   pfFlags             Where to return the flags for .
  */
-VBGLR3DECL(int) VbglR3GuestCtrlFsGetQueryObjInfo(PVBGLR3GUESTCTRLCMDCTX pCtx,
+VBGLR3DECL(int) VbglR3GuestCtrlFsObjGetQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx,
                                                  char *pszPath, uint32_t cbPath, GSTCTLFSOBJATTRADD *penmAddAttrib,
                                                  uint32_t *pfFlags)
@@ -1284 +1284 @@
     do
     {
-        HGCMMsgFsQueryInfo Msg;
+        HGCMMsgFsObjQueryInfo Msg;
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_FS_OBJ_QUERY_INFO);

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

@@ -1975 +1975 @@
 
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-static int vgsvcGstCtrlSessionHandleFsQueryObjInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+static int vgsvcGstCtrlSessionHandleFsObjQueryInfo(const PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -1988 +1988 @@
     RTFSOBJINFO        objInfoRuntime;
 
-    int rc = VbglR3GuestCtrlFsGetQueryObjInfo(pHostCtx, szPath, sizeof(szPath), &enmAttrAdd, &fFlags);
+    int rc = VbglR3GuestCtrlFsObjGetQueryInfo(pHostCtx, szPath, sizeof(szPath), &enmAttrAdd, &fFlags);
     if (RT_SUCCESS(rc))
     {
@@ -2009 +2009 @@
 
         if (RT_FAILURE(rc))
-            VGSvcError("Invalid fsqueryinfo flags: %#x (%#x)\n", fFlags, fFlagsRuntime);
+            VGSvcError("Invalid fsobjqueryinfo flags: %#x (%#x)\n", fFlags, fFlagsRuntime);
 
         if (RT_SUCCESS(rc))
@@ -2053 +2053 @@
         if (RT_FAILURE(rc2))
         {
-            VGSvcError("Failed to reply to fsqueryinfo request %Rrc, rc=%Rrc\n", rc, rc2);
+            VGSvcError("Failed to reply to fsobjquerinfo request %Rrc, rc=%Rrc\n", rc, rc2);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -2060 +2060 @@
     else
     {
-        VGSvcError("Error fetching parameters for fsqueryinfo operation: %Rrc\n", rc);
+        VGSvcError("Error fetching parameters for fsobjqueryinfo operation: %Rrc\n", rc);
         VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID, rc, UINT32_MAX);
     }
@@ -2234 +2234 @@
         case HOST_MSG_FS_OBJ_QUERY_INFO:
             if (fImpersonated)
-                rc = vgsvcGstCtrlSessionHandleFsQueryObjInfo(pSession, pHostCtx);
+                rc = vgsvcGstCtrlSessionHandleFsObjQueryInfo(pSession, pHostCtx);
             break;