VirtualBox

Changeset 77837 in vbox


Ignore:
Timestamp:
Mar 21, 2019 9:32:32 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
129520
Message:

SharedFoldersSvc: Added new function for server-side file content copying (SHFL_FN_COPY_FILE_PART) and a function for query host features and supported functions (SHFL_FN_QUERY_FEATURES). bugref:9172

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/shflsvc.h

    r77537 r77837  
    139139 * @since VBox 6.0  */
    140140#define SHFL_FN_SET_FILE_SIZE       (24)
     141/** Queries supported features.
     142 * @since VBox 6.0.6  */
     143#define SHFL_FN_QUERY_FEATURES      (25)
     144/** Copies part of a file to another.
     145 * @since VBox 6.0.6  */
     146#define SHFL_FN_COPY_FILE_PART      (26)
     147/** The last function number. */
     148#define SHFL_FN_LAST                SHFL_FN_COPY_FILE_PART
    141149/** @} */
    142150
    … …  
    19201928
    19211929
     1930/** @name SHFL_FN_QUERY_FEATURES
     1931 * @{ */
     1932/** SHFL_FN_QUERY_FEATURES parameters. */
     1933typedef struct VBoxSFParmQueryFeatures
     1934{
     1935    /** value64, out: Feature flags, SHFL_FEATURE_XXX. */
     1936    HGCMFunctionParameter f64Features;
     1937    /** value32, out: The ordinal of the last valid function */
     1938    HGCMFunctionParameter u32LastFunction;
     1939} VBoxSFParmQueryFeatures;
     1940/** Number of parameters for SHFL_FN_QUERY_FEATURES. */
     1941#define SHFL_CPARMS_QUERY_FEATURES (2)
     1942
     1943/** The write functions updates the file offset upon return.
     1944 * This can be helpful for files open in append mode. */
     1945#define SHFL_FEATURE_WRITE_UPDATES_OFFSET       RT_BIT_64(0)
     1946/** @} */
     1947
     1948
     1949/** @name SHFL_FN_COPY_FILE_PART
     1950 * @{ */
     1951/** SHFL_FN_COPY_FILE_PART parameters. */
     1952typedef struct VBoxSFParmCopyFilePart
     1953{
     1954    /** value32, in: SHFLROOT of the mapping the source handle belongs to. */
     1955    HGCMFunctionParameter id32RootSrc;
     1956    /** value64, in: SHFLHANDLE of the source file. */
     1957    HGCMFunctionParameter u64HandleSrc;
     1958    /** value64, in: The source file offset. */
     1959    HGCMFunctionParameter off64Src;
     1960
     1961    /** value32, in: SHFLROOT of the mapping the destination handle belongs to. */
     1962    HGCMFunctionParameter id32RootDst;
     1963    /** value64, in: SHFLHANDLE of the destination file. */
     1964    HGCMFunctionParameter u64HandleDst;
     1965    /** value64, in: The destination file offset. */
     1966    HGCMFunctionParameter off64Dst;
     1967
     1968    /** value64, in/out: The number of bytes to copy on input / bytes actually copied. */
     1969    HGCMFunctionParameter cb64ToCopy;
     1970    /** value32, in: Reserved for the future, must be zero. */
     1971    HGCMFunctionParameter f32Flags;
     1972} VBoxSFParmCopyFilePart;
     1973/** Number of parameters for SHFL_FN_COPY_FILE_PART. */
     1974#define SHFL_CPARMS_COPY_FILE_PART (8)
     1975/** @} */
    19221976
    19231977

  • trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp

    r77276 r77837  
    9797static STAMPROFILE g_StatSetSymlinks;
    9898static STAMPROFILE g_StatQueryMapInfo;
     99static STAMPROFILE g_StatQueryFeatures;
     100static STAMPROFILE g_StatCopyFilePart;
     101static STAMPROFILE g_StatCopyFilePartFail;
    99102static STAMPROFILE g_StatWaitForMappingsChanges;
    100103static STAMPROFILE g_StatWaitForMappingsChangesFail;
    … …  
    14841487            break;
    14851488        }
     1489
     1490        case SHFL_FN_QUERY_FEATURES:
     1491        {
     1492            pStat = pStatFail = &g_StatQueryFeatures;
     1493
     1494            /* Validate input: */
     1495            ASSERT_GUEST_STMT_BREAK(cParms == SHFL_CPARMS_QUERY_FEATURES, rc = VERR_WRONG_PARAMETER_COUNT);
     1496            ASSERT_GUEST_STMT_BREAK(paParms[0].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* f64Features */
     1497            ASSERT_GUEST_STMT_BREAK(paParms[1].type == VBOX_HGCM_SVC_PARM_32BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* u32LastFunction */
     1498
     1499            /* Execute the function: */
     1500            paParms[0].u.uint64 = SHFL_FEATURE_WRITE_UPDATES_OFFSET;
     1501            paParms[1].u.uint32 = SHFL_FN_LAST;
     1502            rc = VINF_SUCCESS;
     1503            break;
     1504        }
     1505
     1506        case SHFL_FN_COPY_FILE_PART:
     1507        {
     1508            pStat     = &g_StatCopyFilePart;
     1509            pStatFail = &g_StatCopyFilePartFail;
     1510
     1511            /* Validate input: */
     1512            ASSERT_GUEST_STMT_BREAK(cParms == SHFL_CPARMS_COPY_FILE_PART, rc = VERR_WRONG_PARAMETER_COUNT);
     1513            ASSERT_GUEST_STMT_BREAK(paParms[0].type == VBOX_HGCM_SVC_PARM_32BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* i32RootSrc  */
     1514            ASSERT_GUEST_STMT_BREAK(paParms[1].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* u64HandleSrc */
     1515            ASSERT_GUEST_STMT_BREAK(paParms[2].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* off64Src */
     1516            ASSERT_GUEST_STMT_BREAK((int64_t)paParms[2].u.uint64 < 0, rc = VERR_NEGATIVE_SEEK);
     1517            ASSERT_GUEST_STMT_BREAK(paParms[3].type == VBOX_HGCM_SVC_PARM_32BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* i32RootDst  */
     1518            ASSERT_GUEST_STMT_BREAK(paParms[4].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* u64HandleDst */
     1519            ASSERT_GUEST_STMT_BREAK(paParms[5].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* off64Dst */
     1520            ASSERT_GUEST_STMT_BREAK((int64_t)paParms[5].u.uint64 < 0, rc = VERR_NEGATIVE_SEEK);
     1521            ASSERT_GUEST_STMT_BREAK(paParms[6].type == VBOX_HGCM_SVC_PARM_64BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* cb64ToCopy */
     1522            ASSERT_GUEST_STMT_BREAK(paParms[6].u.uint64 < _1E, rc = VERR_OUT_OF_RANGE);
     1523            ASSERT_GUEST_STMT_BREAK(paParms[7].type == VBOX_HGCM_SVC_PARM_32BIT, rc = VERR_WRONG_PARAMETER_TYPE); /* f32Flags */
     1524            ASSERT_GUEST_STMT_BREAK(paParms[7].u.uint32 == 0, rc = VERR_INVALID_FLAGS);
     1525
     1526            /* Execute the function: */
     1527            rc = vbsfCopyFilePart(pClient,
     1528                                  paParms[0].u.uint32, paParms[1].u.uint64, paParms[2].u.uint64,
     1529                                  paParms[3].u.uint32, paParms[4].u.uint64, paParms[5].u.uint64,
     1530                                  &paParms[6].u.uint64, paParms[7].u.uint64);
     1531            break;
     1532        }
     1533
    14861534
    14871535        default:
    … …  
    17921840             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatSetSymlinks,               STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_SET_SYMLINKS",                      "/HGCM/VBoxSharedFolders/FnSetSymlink");
    17931841             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatQueryMapInfo,              STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_QUERY_MAP_INFO",                    "/HGCM/VBoxSharedFolders/FnQueryMapInfo");
     1842             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatQueryFeatures,             STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_QUERY_FEATURES",                    "/HGCM/VBoxSharedFolders/FnQueryFeatures");
     1843             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatCopyFilePart,              STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_COPY_FILE_PART successes",          "/HGCM/VBoxSharedFolders/FnCopyFilePart");
     1844             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatCopyFilePartFail,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_COPY_FILE_PART failures",           "/HGCM/VBoxSharedFolders/FnCopyFilePartFail");
    17941845             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatWaitForMappingsChanges,    STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_WAIT_FOR_MAPPINGS_CHANGES successes", "/HGCM/VBoxSharedFolders/FnWaitForMappingsChanges");
    17951846             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatWaitForMappingsChangesFail,STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_WAIT_FOR_MAPPINGS_CHANGES failures","/HGCM/VBoxSharedFolders/FnWaitForMappingsChangesFail");

  • trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

    r77685 r77837  
    13681368}
    13691369
     1370/** Implements SHFL_FN_COPY_FILE_PART (wrapping RTFileCopyPart).   */
     1371int vbsfCopyFilePart(SHFLCLIENTDATA *pClient, SHFLROOT idRootSrc, SHFLHANDLE hFileSrc, uint64_t offSrc,
     1372                     SHFLROOT idRootDst, SHFLHANDLE hFileDst, uint64_t offDst, uint64_t *pcbToCopy, uint32_t fFlags)
     1373{
     1374    /*
     1375     * Validate and translates handles.
     1376     */
     1377    uint64_t const cbToCopy = *pcbToCopy;
     1378    *pcbToCopy = 0;
     1379    LogFunc(("pClient %p, idRootSrc %#RX32, hFileSrc %#RX64, offSrc %#RX64, idRootSrc %#RX32, hFileSrc %#RX64, offSrc %#RX64, cbToCopy %#RX64, fFlags %#x\n",
     1380             pClient, idRootSrc, hFileSrc, offSrc, idRootDst, hFileDst, offDst, cbToCopy, fFlags));
     1381
     1382    AssertPtrReturn(pClient, VERR_INVALID_PARAMETER);
     1383
     1384    size_t cbTotal = 0;
     1385
     1386    SHFLFILEHANDLE *pHandleSrc = vbsfQueryFileHandle(pClient, hFileSrc);
     1387    int rc = vbsfCheckHandleAccess(pClient, idRootSrc, pHandleSrc, VBSF_CHECK_ACCESS_READ);
     1388    if (RT_SUCCESS(rc))
     1389    {
     1390        SHFLFILEHANDLE *pHandleDst = vbsfQueryFileHandle(pClient, hFileDst);
     1391        rc = vbsfCheckHandleAccess(pClient, idRootDst, pHandleDst, VBSF_CHECK_ACCESS_WRITE);
     1392        if (RT_SUCCESS(rc))
     1393        {
     1394            rc = RTFileCopyPart(pHandleSrc->file.Handle, offSrc, pHandleDst->file.Handle, offDst, cbToCopy, 0, &cbTotal);
     1395            *pcbToCopy = cbTotal;
     1396        }
     1397    }
     1398
     1399    RT_NOREF(fFlags);
     1400    LogFunc(("%Rrc bytes written %#zx\n", rc, cbTotal));
     1401    return rc;
     1402}
    13701403
    13711404#ifdef UNITTEST

  • trunk/src/VBox/HostServices/SharedFolders/vbsf.h

    r77243 r77837  
    3535int vbsfWritePages(SHFLCLIENTDATA *pClient, SHFLROOT idRoot, SHFLHANDLE hFile, uint64_t *poffFile,
    3636                   uint32_t *pcbBuffer, PVBOXHGCMSVCPARMPAGES pPages);
     37int vbsfCopyFilePart(SHFLCLIENTDATA *pClient, SHFLROOT idRootSrc, SHFLHANDLE hFileSrc, uint64_t offSrc,
     38                     SHFLROOT idRootDst, SHFLHANDLE hFileDst, uint64_t offDst, uint64_t *pcbToCopy, uint32_t fFlags);
    3739
    3840int vbsfLock(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint64_t offset, uint64_t length, uint32_t flags);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette