Changeset 38133 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 25, 2011 9:02:17 AM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Removed obsolete code for guest directory enumeration.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (1 diff)
• VBoxService/Makefile.kmk (modified) (1 diff)
• VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• VBoxService/VBoxServiceControlDir.cpp (deleted)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -152 +152 @@
         if (RT_FAILURE(rc2))
             rc = rc2;
-    }
-    return rc;
-}
-
-
-/**
- * Closes a formerly opened guest directory.
- *
- * @return  IPRT status code.
- ** @todo Docs!
- */
-VBGLR3DECL(int) VbglR3GuestCtrlGetCmdDirClose(uint32_t  u32ClientId,    uint32_t  uNumParms,
-                                              uint32_t *puContext,      uint32_t *puHandle)
-{
-    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puHandle, VERR_INVALID_PARAMETER);
-
-    VBoxGuestCtrlHGCMMsgDirClose Msg;
-
-    Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms = uNumParms;
-
-    VbglHGCMParmUInt32Set(&Msg.context, 0);
-    VbglHGCMParmUInt32Set(&Msg.handle, 0);
-
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        int rc2 = Msg.hdr.result;
-        if (RT_FAILURE(rc2))
-        {
-            rc = rc2;
-        }
-        else
-        {
-            Msg.context.GetUInt32(puContext);
-            Msg.handle.GetUInt32(puHandle);
-        }
-    }
-    return rc;
-}
-
-
-/**
- * Opens a guest directory for reading.
- *
- * @return  IPRT status code.
- ** @todo Docs!
- */
-VBGLR3DECL(int) VbglR3GuestCtrlGetCmdDirOpen(uint32_t  u32ClientId,    uint32_t  uNumParms,
-                                             uint32_t *puContext,
-                                             char     *pszDir,         uint32_t  cbDir,
-                                             char     *pszFilter,      uint32_t  cbFilter,
-                                             uint32_t *puFlags,
-                                             char     *pszUser,        uint32_t  cbUser,
-                                             char     *pszPassword,    uint32_t  cbPassword)
-{
-    AssertPtrReturn(pszDir, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszFilter, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puFlags, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszUser, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszPassword, VERR_INVALID_PARAMETER);
-
-    VBoxGuestCtrlHGCMMsgDirOpen Msg;
-
-    Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms = uNumParms;
-
-    VbglHGCMParmUInt32Set(&Msg.context, 0);
-    VbglHGCMParmPtrSet(&Msg.directory, pszDir, cbDir);
-    VbglHGCMParmPtrSet(&Msg.filter, pszFilter, cbFilter);
-    VbglHGCMParmUInt32Set(&Msg.flags, 0);
-    VbglHGCMParmPtrSet(&Msg.username, pszUser, cbUser);
-    VbglHGCMParmPtrSet(&Msg.password, pszPassword, cbPassword);
-
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        int rc2 = Msg.hdr.result;
-        if (RT_FAILURE(rc2))
-        {
-            rc = rc2;
-        }
-        else
-        {
-            Msg.context.GetUInt32(puContext);
-            Msg.flags.GetUInt32(puFlags);
-        }
-    }
-    return rc;
-}
-
-
-/**
- * Opens a guest directory for reading.
- *
- * @return  IPRT status code.
- ** @todo Docs!
- */
-VBGLR3DECL(int) VbglR3GuestCtrlGetCmdDirRead(uint32_t  u32ClientId,    uint32_t  uNumParms,
-                                             uint32_t *puContext,      uint32_t *puHandle)
-{
-    AssertPtrReturn(puContext, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(puHandle, VERR_INVALID_PARAMETER);
-
-    VBoxGuestCtrlHGCMMsgDirRead Msg;
-
-    Msg.hdr.result = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GUEST_GET_HOST_MSG;
-    Msg.hdr.cParms = uNumParms;
-
-    VbglHGCMParmUInt32Set(&Msg.context, 0);
-    VbglHGCMParmUInt32Set(&Msg.handle, 0);
-
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        int rc2 = Msg.hdr.result;
-        if (RT_FAILURE(rc2))
-        {
-            rc = rc2;
-        }
-        else
-        {
-            Msg.context.GetUInt32(puContext);
-            Msg.handle.GetUInt32(puHandle);
-        }
     }
     return rc;

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -69 +69 @@
  VBoxService_SOURCES    += \
         VBoxServiceControl.cpp \
-        VBoxServiceControlDir.cpp \
         VBoxServiceControlExec.cpp \
         VBoxServiceControlExecThread.cpp \

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

@@ -162 +162 @@
                 case HOST_EXEC_GET_OUTPUT:
                     rc = VBoxServiceControlExecHandleCmdGetOutput(g_GuestControlSvcClientID, uNumParms);
-                    break;
-
-                case HOST_DIR_CLOSE:
-                    rc = VBoxServiceGCtrlDirClose(g_GuestControlSvcClientID, uNumParms);
-                    break;
-
-                case HOST_DIR_OPEN:
-                    rc = VBoxServiceGCtrlDirOpen(g_GuestControlSvcClientID, uNumParms);
-                    break;
-
-                case HOST_DIR_READ:
-                    rc = VBoxServiceGCtrlDirRead(g_GuestControlSvcClientID, uNumParms);
                     break;