Changeset 33994 in vbox

Timestamp:

Nov 11, 2010 2:26:08 PM (14 years ago)

Author:

vboxsync

Message:

shfl: Replaced RTFSOBJINFO and RTFSPROPERTIES with shared folder specific versions. IPRT structures like this should never have been exposed to the guest.

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (6 diffs)
• src/VBox/Additions/WINNT/SharedFolders/redirector/sys/downlvli.c (modified) (3 diffs)
• src/VBox/Additions/WINNT/SharedFolders/redirector/sys/fileinfo.c (modified) (6 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h (modified) (2 diffs)
• src/VBox/Additions/linux/sharedfolders/dirops.c (modified) (3 diffs)
• src/VBox/Additions/linux/sharedfolders/utils.c (modified) (5 diffs)
• src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (1 diff)
• src/VBox/Additions/linux/sharedfolders/vfsmod.h (modified) (1 diff)
• src/VBox/Additions/solaris/SharedFolders/vboxfs.h (modified) (1 diff)
• src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c (modified) (9 diffs)
• src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (6 diffs)

trunk/include/VBox/shflsvc.h

@@ -242 +242 @@
 
 
+/**
+ * The available additional information in a SHFLFSOBJATTR object.
+ */
+typedef enum SHFLFSOBJATTRADD
+{
+    /** No additional information is available / requested. */
+    SHFLFSOBJATTRADD_NOTHING = 1,
+    /** The additional unix attributes (SHFLFSOBJATTR::u::Unix) are
+     *  available / requested. */
+    SHFLFSOBJATTRADD_UNIX,
+    /** The additional extended attribute size (SHFLFSOBJATTR::u::EASize) is
+     *  available / requested. */
+    SHFLFSOBJATTRADD_EASIZE,
+    /** The last valid item (inclusive).
+     * The valid range is SHFLFSOBJATTRADD_NOTHING thru
+     * SHFLFSOBJATTRADD_LAST. */
+    SHFLFSOBJATTRADD_LAST = SHFLFSOBJATTRADD_EASIZE,
+
+    /** The usual 32-bit hack. */
+    SHFLFSOBJATTRADD_32BIT_SIZE_HACK = 0x7fffffff
+} SHFLFSOBJATTRADD;
+
+
+/* Assert sizes of the IRPT types we're using below. */
+AssertCompileSize(RTFMODE,      4);
+AssertCompileSize(RTFOFF,       8);
+AssertCompileSize(RTINODE,      8);
+AssertCompileSize(RTTIMESPEC,   8);
+AssertCompileSize(RTDEV,        4);
+AssertCompileSize(RTUID,        4);
+
+/**
+ * Shared folder filesystem object attributes.
+ */
+#pragma pack(1)
+typedef struct SHFLFSOBJATTR
+{
+    /** Mode flags (st_mode). RTFS_UNIX_*, RTFS_TYPE_*, and RTFS_DOS_*.
+     * @remarks We depend on a number of RTFS_ defines to remain unchanged.
+     *          Fortuntately, these are depending on windows, dos and unix
+     *          standard values, so this shouldn't be much of a pain. */
+    RTFMODE         fMode;
+
+    /** The additional attributes available. */
+    SHFLFSOBJATTRADD  enmAdditional;
+
+    /**
+     * Additional attributes.
+     *
+     * Unless explicitly specified to an API, the API can provide additional
+     * data as it is provided by the underlying OS.
+     */
+    union SHFLFSOBJATTRUNION
+    {
+        /** Additional Unix Attributes
+         * These are available when SHFLFSOBJATTRADD is set in fUnix.
+         */
+         struct SHFLFSOBJATTRUNIX
+         {
+            /** The user owning the filesystem object (st_uid).
+             * This field is ~0U if not supported. */
+            RTUID           uid;
+
+            /** The group the filesystem object is assigned (st_gid).
+             * This field is ~0U if not supported. */
+            RTGID           gid;
+
+            /** Number of hard links to this filesystem object (st_nlink).
+             * This field is 1 if the filesystem doesn't support hardlinking or
+             * the information isn't available.
+             */
+            uint32_t        cHardlinks;
+
+            /** The device number of the device which this filesystem object resides on (st_dev).
+             * This field is 0 if this information is not available. */
+            RTDEV           INodeIdDevice;
+
+            /** The unique identifier (within the filesystem) of this filesystem object (st_ino).
+             * Together with INodeIdDevice, this field can be used as a OS wide unique id
+             * when both their values are not 0.
+             * This field is 0 if the information is not available. */
+            RTINODE         INodeId;
+
+            /** User flags (st_flags).
+             * This field is 0 if this information is not available. */
+            uint32_t        fFlags;
+
+            /** The current generation number (st_gen).
+             * This field is 0 if this information is not available. */
+            uint32_t        GenerationId;
+
+            /** The device number of a character or block device type object (st_rdev).
+             * This field is 0 if the file isn't of a character or block device type and
+             * when the OS doesn't subscribe to the major+minor device idenfication scheme. */
+            RTDEV           Device;
+        } Unix;
+
+        /**
+         * Extended attribute size.
+         */
+        struct SHFLFSOBJATTREASIZE
+        {
+            /** Size of EAs. */
+            RTFOFF          cb;
+        } EASize;
+    } u;
+} SHFLFSOBJATTR;
+#pragma pack()
+AssertCompileSize(SHFLFSOBJATTR, 44);
+/** Pointer to a shared folder filesystem object attributes structure. */
+typedef SHFLFSOBJATTR *PSHFLFSOBJATTR;
+/** Pointer to a const shared folder filesystem object attributes structure. */
+typedef const SHFLFSOBJATTR *PCSHFLFSOBJATTR;
+
+
+/**
+ * Filesystem object information structure.
+ */
+#pragma pack(1)
+typedef struct SHFLFSOBJINFO
+{
+   /** Logical size (st_size).
+    * For normal files this is the size of the file.
+    * For symbolic links, this is the length of the path name contained
+    * in the symbolic link.
+    * For other objects this fields needs to be specified.
+    */
+   RTFOFF       cbObject;
+
+   /** Disk allocation size (st_blocks * DEV_BSIZE). */
+   RTFOFF       cbAllocated;
+
+   /** Time of last access (st_atime).
+    * @remarks  Here (and other places) we depend on the IPRT timespec to
+    *           remain unchanged. */
+   RTTIMESPEC   AccessTime;
+
+   /** Time of last data modification (st_mtime). */
+   RTTIMESPEC   ModificationTime;
+
+   /** Time of last status change (st_ctime).
+    * If not available this is set to ModificationTime.
+    */
+   RTTIMESPEC   ChangeTime;
+
+   /** Time of file birth (st_birthtime).
+    * If not available this is set to ChangeTime.
+    */
+   RTTIMESPEC   BirthTime;
+
+   /** Attributes. */
+   SHFLFSOBJATTR Attr;
+
+} SHFLFSOBJINFO;
+#pragma pack()
+AssertCompileSize(SHFLFSOBJINFO, 92);
+/** Pointer to a shared folder filesystem object information structure. */
+typedef SHFLFSOBJINFO *PSHFLFSOBJINFO;
+/** Pointer to a const shared folder filesystem object information
+ *  structure. */
+typedef const SHFLFSOBJINFO *PCSHFLFSOBJINFO;
+
+
+/**
+ * Copy file system objinfo from IPRT to shared folder format.
+ *
+ * @param   pDst                The shared folder structure.
+ * @param   pSrc                The IPRT structure.
+ */
+DECLINLINE(void) vbfsCopyFsObjInfoFromIprt(PSHFLFSOBJINFO pDst, PCRTFSOBJINFO pSrc)
+{
+    pDst->cbObject          = pSrc->cbObject;
+    pDst->cbAllocated       = pSrc->cbAllocated;
+    pDst->AccessTime        = pSrc->AccessTime;
+    pDst->ModificationTime  = pSrc->ModificationTime;
+    pDst->ChangeTime        = pSrc->ChangeTime;
+    pDst->BirthTime         = pSrc->BirthTime;
+    pDst->Attr.fMode        = pSrc->Attr.fMode;
+    RT_ZERO(pDst->Attr.u);
+    switch (pSrc->Attr.enmAdditional)
+    {
+        default:
+        case RTFSOBJATTRADD_NOTHING:
+            pDst->Attr.enmAdditional        = SHFLFSOBJATTRADD_NOTHING;
+            break;
+
+        case RTFSOBJATTRADD_UNIX:
+            pDst->Attr.enmAdditional        = SHFLFSOBJATTRADD_UNIX;
+            pDst->Attr.u.Unix.uid           = pSrc->Attr.u.Unix.uid;
+            pDst->Attr.u.Unix.gid           = pSrc->Attr.u.Unix.gid;
+            pDst->Attr.u.Unix.cHardlinks    = pSrc->Attr.u.Unix.cHardlinks;
+            pDst->Attr.u.Unix.INodeIdDevice = pSrc->Attr.u.Unix.INodeIdDevice;
+            pDst->Attr.u.Unix.INodeId       = pSrc->Attr.u.Unix.INodeId;
+            pDst->Attr.u.Unix.fFlags        = pSrc->Attr.u.Unix.fFlags;
+            pDst->Attr.u.Unix.GenerationId  = pSrc->Attr.u.Unix.GenerationId;
+            pDst->Attr.u.Unix.Device        = pSrc->Attr.u.Unix.Device;
+            break;
+
+        case RTFSOBJATTRADD_EASIZE:
+            pDst->Attr.enmAdditional        = SHFLFSOBJATTRADD_EASIZE;
+            pDst->Attr.u.EASize.cb          = pSrc->Attr.u.EASize.cb;
+            break;
+    }
+}
+
+
 /** Result of an open/create request.
  *  Along with handle value the result code
@@ -361 +567 @@
      * returned actual attributes of opened/created object.
      */
-    RTFSOBJINFO Info;
+    SHFLFSOBJINFO Info;
 
 } SHFLCREATEPARMS;
@@ -397 +603 @@
 {
     /** Full information about the object. */
-    RTFSOBJINFO     Info;
+    SHFLFSOBJINFO   Info;
     /** The length of the short field (number of RTUTF16 chars).
      * It is 16-bit for reasons of alignment. */
@@ -409 +615 @@
 } SHFLDIRINFO, *PSHFLDIRINFO;
 
+
+/**
+ * Shared folder filesystem properties.
+ */
+typedef struct SHFLFSPROPERTIES
+{
+    /** The maximum size of a filesystem object name.
+     * This does not include the '\\0'. */
+    uint32_t cbMaxComponent;
+
+    /** True if the filesystem is remote.
+     * False if the filesystem is local. */
+    bool    fRemote;
+
+    /** True if the filesystem is case sensitive.
+     * False if the filesystem is case insensitive. */
+    bool    fCaseSensitive;
+
+    /** True if the filesystem is mounted read only.
+     * False if the filesystem is mounted read write. */
+    bool    fReadOnly;
+
+    /** True if the filesystem can encode unicode object names.
+     * False if it can't. */
+    bool    fSupportsUnicode;
+
+    /** True if the filesystem is compresses.
+     * False if it isn't or we don't know. */
+    bool    fCompressed;
+
+    /** True if the filesystem compresses of individual files.
+     * False if it doesn't or we don't know. */
+    bool    fFileCompression;
+
+    /** @todo more? */
+} SHFLFSPROPERTIES;
+AssertCompileSize(SHFLFSPROPERTIES, 12);
+/** Pointer to a shared folder filesystem properties structure. */
+typedef SHFLFSPROPERTIES *PSHFLFSPROPERTIES;
+/** Pointer to a const shared folder filesystem properties structure. */
+typedef SHFLFSPROPERTIES const *PCSHFLFSPROPERTIES;
+
+
+/**
+ * Copy file system properties from IPRT to shared folder format.
+ *
+ * @param   pDst                The shared folder structure.
+ * @param   pSrc                The IPRT structure.
+ */
+DECLINLINE(void) vbfsCopyFsPropertiesFromIprt(PSHFLFSPROPERTIES pDst, PCRTFSPROPERTIES pSrc)
+{
+    RT_ZERO(*pDst);                     /* zap the implicit padding. */
+    pDst->cbMaxComponent   = pSrc->cbMaxComponent;
+    pDst->fRemote          = pSrc->fRemote;
+    pDst->fCaseSensitive   = pSrc->fCaseSensitive;
+    pDst->fReadOnly        = pSrc->fReadOnly;
+    pDst->fSupportsUnicode = pSrc->fSupportsUnicode;
+    pDst->fCompressed      = pSrc->fCompressed;
+    pDst->fFileCompression = pSrc->fFileCompression;
+}
+
+
 typedef struct _SHFLVOLINFO
 {
@@ -416 +684 @@
     uint32_t       ulBytesPerSector;
     uint32_t       ulSerial;
-    RTFSPROPERTIES fsProperties;
+    SHFLFSPROPERTIES fsProperties;
 } SHFLVOLINFO, *PSHFLVOLINFO;
 
@@ -948 +1216 @@
 
     /** pointer, in/out:
-     * Information to be set/get (RTFSOBJINFO or SHFLSTRING).
-     * Do not forget to set the RTFSOBJINFO::Attr::enmAdditional for Get operation as well.
+     * Information to be set/get (SHFLFSOBJINFO or SHFLSTRING). Do not forget
+     * to set the SHFLFSOBJINFO::Attr::enmAdditional for Get operation as well.
      */
     HGCMFunctionParameter info;

trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/downlvli.c

@@ -48 +48 @@
     VBoxMRxGetNetRootExtension(capFcb->pNetRoot, pNetRootExtension);
     VBoxMRxGetDeviceExtension(RxContext, pDeviceExtension);
-    PRTFSOBJINFO pObjInfo = 0;
+    PSHFLFSOBJINFO pObjInfo = 0;
     uint32_t cbBuffer;
     int vboxRC;
@@ -54 +54 @@
     Log(("VBOXSF: VBoxMRxSetEndOfFile: New size = %RX64 (0x%x), pNewAllocationSize = 0x%x\n", pNewFileSize->QuadPart, pNewFileSize, pNewAllocationSize));
 
-    cbBuffer = sizeof(RTFSOBJINFO);
+    cbBuffer = sizeof(SHFLFSOBJINFO);
     pObjInfo = (PRTFSOBJINFO)vbsfAllocNonPagedMem(cbBuffer);
     if (pObjInfo == 0)
@@ -65 +65 @@
     pObjInfo->cbObject = pNewFileSize->QuadPart;
     Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
-    vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile, SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer, (PSHFLDIRINFO)pObjInfo);
+    vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+                            SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer, (PSHFLDIRINFO)pObjInfo);
     AssertRC(vboxRC);
 

trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/fileinfo.c

@@ -1010 +1010 @@
     int vboxRC = 0;
     uint32_t cbHGCMBuffer, cbMaxSize = 0;
-    PRTFSOBJINFO pFileEntry = NULL;
+    PSHFLFSOBJINFO pFileEntry = NULL;
     PCHAR pInfoBuffer = NULL;
     ULONG *pLengthRemaining = NULL;
@@ -1207 +1207 @@
         }
 
-        pFileEntry = (PRTFSOBJINFO)pHGCMBuffer;
+        pFileEntry = (PSHFLFSOBJINFO)pHGCMBuffer;
         Status = STATUS_SUCCESS;
 
@@ -1492 +1492 @@
     {
         PFILE_BASIC_INFORMATION pFileInfo = (PFILE_BASIC_INFORMATION)pBuffer;
-        PRTFSOBJINFO pSHFLFileInfo;
+        PSHFLFSOBJINFO pSHFLFileInfo;
 
         Log(("VBOXSF: VBoxMRxSetFileInformation: FileBasicInformation: CreationTime    %RX64\n", pFileInfo->CreationTime.QuadPart));
@@ -1520 +1520 @@
         }
 
-        cbBuffer = sizeof(RTFSOBJINFO);
+        cbBuffer = sizeof(SHFLFSOBJINFO);
         pHGCMBuffer = (uint8_t *)vbsfAllocNonPagedMem(cbBuffer);
         if (pHGCMBuffer == 0)
@@ -1528 +1528 @@
         }
         RtlZeroMemory(pHGCMBuffer, cbBuffer);
-        pSHFLFileInfo = (PRTFSOBJINFO)pHGCMBuffer;
+        pSHFLFileInfo = (PSHFLFSOBJINFO)pHGCMBuffer;
 
         Log(("VBOXSF: VBoxMRxSetFileInformation: FileBasicInformation: keeps %d %d %d %d\n",
-              pVBoxFobx->fKeepCreationTime, pVBoxFobx->fKeepLastAccessTime, pVBoxFobx->fKeepLastWriteTime, pVBoxFobx->fKeepChangeTime));
+             pVBoxFobx->fKeepCreationTime, pVBoxFobx->fKeepLastAccessTime, pVBoxFobx->fKeepLastWriteTime, pVBoxFobx->fKeepChangeTime));
 
         /* The properties, that need to be changed, are set to something other than zero */
@@ -1546 +1546 @@
 
         Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
-        vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile, SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
+        vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+                                SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
         AssertRC(vboxRC);
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c

@@ -714 +714 @@
 }
 
-DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PRTFSOBJINFO pBuffer)
+DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath,
+                               PSHFLFSOBJINFO pBuffer)
 {
     int rc = VINF_SUCCESS;
@@ -734 +735 @@
 
     data.info.type                      = VMMDevHGCMParmType_LinAddr_Out;
-    data.info.u.Pointer.size            = sizeof(RTFSOBJINFO);
+    data.info.u.Pointer.size            = sizeof(SHFLFSOBJINFO);
     data.info.u.Pointer.u.linearAddr    = (uintptr_t)pBuffer;
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h

@@ -24 +24 @@
  */
 
-#ifndef __VBOXCALLS__H
-#define __VBOXCALLS__H
+#ifndef ___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h
+#define ___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h
 
 #include <VBox/VBoxGuestLib.h>
@@ -180 +180 @@
 
 DECLVBGL(int) vboxReadLink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
-DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PRTFSOBJINFO pBuffer);
+DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
 DECLVBGL(int) vboxCallSetSymlinks (PVBSFCLIENT pClient);
 
-#endif /* __VBOXCALLS__H */
+#endif /* !___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h */
+

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -319 +319 @@
     struct inode *inode;
     ino_t ino;
-    RTFSOBJINFO fsinfo;
+    SHFLFSOBJINFO fsinfo;
 
     TRACE();
@@ -406 +406 @@
  */
 static int sf_instantiate(struct inode *parent, struct dentry *dentry,
-                          SHFLSTRING *path, RTFSOBJINFO *info, SHFLHANDLE handle)
+                          SHFLSTRING *path, PSHFLFSOBJINFO info, SHFLHANDLE handle)
 {
     int err;
@@ -747 +747 @@
     struct sf_glob_info *sf_g;
     SHFLSTRING *path, *ssymname;
-    RTFSOBJINFO info;
+    SHFLFSOBJINFO info;
     int symname_len = strlen(symname) + 1;
 

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -69 +69 @@
 /* set [inode] attributes based on [info], uid/gid based on [sf_g] */
 void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
-                   RTFSOBJINFO *info)
-{
-    RTFSOBJATTR *attr;
+                   PSHFLFSOBJINFO info)
+{
+    PSHFLFSOBJATTR attr;
     int mode;
 
@@ -150 +150 @@
 
 int sf_stat(const char *caller, struct sf_glob_info *sf_g,
-            SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail)
+            SHFLSTRING *path, PSHFLFSOBJINFO result, int ok_to_fail)
 {
     int rc;
@@ -198 +198 @@
     struct sf_glob_info *sf_g;
     struct sf_inode_info *sf_i;
-    RTFSOBJINFO info;
+    SHFLFSOBJINFO info;
 
     TRACE();
@@ -275 +275 @@
     struct sf_inode_info *sf_i;
     SHFLCREATEPARMS params;
-    RTFSOBJINFO info;
+    SHFLFSOBJINFO info;
     uint32_t cbBuffer;
     int rc, err;
@@ -557 +557 @@
         {
             int nb;
-            wchar_t uni;
+            wchar_t uni; /** @todo this should be unicode_t in more recent kernel versions. */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -197 +197 @@
     struct sf_inode_info *sf_i;
     struct sf_glob_info *sf_g;
-    RTFSOBJINFO fsinfo;
+    SHFLFSOBJINFO fsinfo;
     struct vbsf_mount_info_new *info;
 

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

@@ -97 +97 @@
 
 extern void sf_init_inode(struct sf_glob_info *sf_g, struct inode *inode,
-                          RTFSOBJINFO *info);
+                          PSHFLFSOBJINFO info);
 extern int  sf_stat(const char *caller, struct sf_glob_info *sf_g,
-                    SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail);
+                    SHFLSTRING *path, PSHFLFSOBJINFO result, int ok_to_fail);
 extern int  sf_inode_revalidate(struct dentry *dentry);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs.h

@@ -73 +73 @@
 /** Helper functions */
 extern int vboxvfs_Stat(const char *pszCaller, vboxvfs_globinfo_t *pVBoxVFSGlobalInfo, SHFLSTRING *pPath,
-            RTFSOBJINFO *pResult, boolean_t fAllowFailure);
+            PSHFLFSOBJINFO pResult, boolean_t fAllowFailure);
 extern void vboxvfs_InitVNode(vboxvfs_globinfo_t *pVBoxVFSGlobalInfo, vboxvfs_vnode_t *pVBoxVNode,
-            RTFSOBJINFO *pFSInfo);
+            PSHFLFSOBJINFO pFSInfo);
 
 

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -416 +416 @@
 
 static int
-sfprov_getinfo(sfp_mount_t *mnt, char *path, RTFSOBJINFO *info)
+sfprov_getinfo(sfp_mount_t *mnt, char *path, PSHFLFSOBJINFO info)
 {
         int rc;
@@ -495 +495 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -508 +508 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -529 +529 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -542 +542 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -555 +555 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -575 +575 @@
 {
         int rc;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
 
         rc = sfprov_getinfo(mnt, path, &info);
@@ -615 +615 @@
         SHFLCREATEPARMS parms;
         SHFLSTRING *str;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
         uint32_t bytes;
         int str_size;
@@ -713 +713 @@
         SHFLCREATEPARMS parms;
         SHFLSTRING *str;
-        RTFSOBJINFO info;
+        SHFLFSOBJINFO info;
         uint32_t bytes;
         int str_size;

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp

@@ -60 +60 @@
     STRUCT(SHFLDIRINFO, 128);
     STRUCT(SHFLVOLINFO, 40);
+    STRUCT(SHFLFSOBJATTR, 44);
+    STRUCT(SHFLFSOBJINFO, 92);
 #ifdef VBOX_WITH_64_BITS_GUESTS
 /* The size of the guest structures depends on the current architecture bit count (ARCH_BITS)

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

@@ -893 +893 @@
                 info.Attr.fMode |= 0111;
 #endif
-                pParms->Info = info;
+                vbfsCopyFsObjInfoFromIprt(&pParms->Info, &info);
             }
             pParms->Result = SHFL_FILE_EXISTS;
@@ -969 +969 @@
             info.Attr.fMode |= 0111;
 #endif
-            pParms->Info = info;
+            vbfsCopyFsObjInfoFromIprt(&pParms->Info, &info);
         }
     }
@@ -1066 +1066 @@
                 if (RT_SUCCESS(rc))
                 {
-                    pParms->Info = info;
+                    vbfsCopyFsObjInfoFromIprt(&pParms->Info, &info);
                 }
             }
@@ -1171 +1171 @@
             info.Attr.fMode |= 0111;
 #endif
-            pParms->Info = info;
+            vbfsCopyFsObjInfoFromIprt(&pParms->Info, &info);
             pParms->Result = SHFL_FILE_EXISTS;
             break;
@@ -1573 +1573 @@
         pDirEntry->Info.Attr.fMode |= 0111;
 #endif
-        pSFDEntry->Info = pDirEntry->Info;
+        vbfsCopyFsObjInfoFromIprt(&pSFDEntry->Info, &pDirEntry->Info);
         pSFDEntry->cucShortName = 0;
 
@@ -1891 +1891 @@
             goto exit;
 
-        rc = RTFsQueryProperties(pszFullPath, &pSFDEntry->fsProperties);
+        RTFSPROPERTIES FsProperties;
+        rc = RTFsQueryProperties(pszFullPath, &FsProperties);
         if (rc != VINF_SUCCESS)
             goto exit;
+        vbfsCopyFsPropertiesFromIprt(&pSFDEntry->fsProperties, &FsProperties);
 
         *pcbBuffer = sizeof(SHFLVOLINFO);