Changeset 4926 in vbox for trunk/src/VBox

Timestamp:

Sep 20, 2007 12:13:32 PM (18 years ago)

Author:

vboxsync

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

24672

Message:

don't depend on a file handle when requesting volume information though there is no handle available on Linux guests in that case (and the handle is not used anyway)

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (4 diffs)

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

@@ -1445 +1445 @@
 }
 
-int vbsfQueryVolumeInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags, uint32_t *pcbBuffer, uint8_t *pBuffer)
-{
-    SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_DIR|SHFL_HF_TYPE_FILE|SHFL_HF_TYPE_VOLUME);
+int vbsfQueryVolumeInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, uint32_t flags, uint32_t *pcbBuffer, uint8_t *pBuffer)
+{
     int            rc = VINF_SUCCESS;
     SHFLVOLINFO   *pSFDEntry;
@@ -1453 +1452 @@
     SHFLSTRING     dummy;
 
-    if (pHandle == 0 || pcbBuffer == 0 || pBuffer == 0 || *pcbBuffer < sizeof(SHFLVOLINFO))
+    if (pcbBuffer == 0 || pBuffer == 0 || *pcbBuffer < sizeof(SHFLVOLINFO))
     {
         AssertFailed();
@@ -1495 +1494 @@
 int vbsfQueryFSInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags, uint32_t *pcbBuffer, uint8_t *pBuffer)
 {
-    SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_DIR|SHFL_HF_TYPE_FILE|SHFL_HF_TYPE_VOLUME);
-
-    if (pHandle == 0 || pcbBuffer == 0 || pBuffer == 0)
+    if (pcbBuffer == 0 || pBuffer == 0)
     {
         AssertFailed();
@@ -1507 +1504 @@
 
     if (flags & SHFL_INFO_VOLUME)
-        return vbsfQueryVolumeInfo(pClient, root, Handle, flags, pcbBuffer, pBuffer);
+        return vbsfQueryVolumeInfo(pClient, root, flags, pcbBuffer, pBuffer);
 
     AssertFailed();