Changeset 33994 in vbox for trunk/src/VBox/HostServices

Timestamp:

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

Author:

vboxsync

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

67658

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/src/VBox/HostServices/SharedFolders

Files:

• testcase/tstShflSizes.cpp (modified) (1 diff)
• vbsf.cpp (modified) (6 diffs)

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);