Changeset 34051 in vbox for trunk

Timestamp:

Nov 13, 2010 11:13:39 AM (14 years ago)

Author:

vboxsync

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

67733

Message:

shared folders: code missed by r67658

File:

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

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

@@ -1338 +1338 @@
 
     SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_DIR|SHFL_HF_TYPE_FILE);
-    Assert(pHandle);
+    //Assert(pHandle);
     if (!pHandle)
         return VERR_INVALID_HANDLE;
@@ -1542 +1542 @@
                 && rc != VWRN_NO_DIRENT_INFO)
             {
-                AssertFailed();
+                //AssertFailed();
                 if (   rc == VERR_NO_TRANSLATION
                     || rc == VERR_INVALID_UTF8_ENCODING)
@@ -1689 +1689 @@
     SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_DIR|SHFL_HF_TYPE_FILE);
     int            rc = VINF_SUCCESS;
-    RTFSOBJINFO   *pObjInfo = (RTFSOBJINFO *)pBuffer;
-
-
-    if (pHandle == 0 || pcbBuffer == 0 || pObjInfo == 0 || *pcbBuffer < sizeof(RTFSOBJINFO))
+    SHFLFSOBJINFO   *pObjInfo = (SHFLFSOBJINFO *)pBuffer;
+    RTFSOBJINFO    fileinfo;
+
+
+    if (pHandle == 0 || pcbBuffer == 0 || pObjInfo == 0 || *pcbBuffer < sizeof(SHFLFSOBJINFO))
     {
         AssertFailed();
@@ -1705 +1706 @@
     if (pHandle->Header.u32Flags & SHFL_HF_TYPE_DIR)
     {
-        rc = RTDirQueryInfo(pHandle->dir.Handle, pObjInfo, RTFSOBJATTRADD_NOTHING);
+        rc = RTDirQueryInfo(pHandle->dir.Handle, &fileinfo, RTFSOBJATTRADD_NOTHING);
     }
     else
     {
-        rc = RTFileQueryInfo(pHandle->file.Handle, pObjInfo, RTFSOBJATTRADD_NOTHING);
+        rc = RTFileQueryInfo(pHandle->file.Handle, &fileinfo, RTFSOBJATTRADD_NOTHING);
 #ifdef RT_OS_WINDOWS
         if (RT_SUCCESS(rc) && RTFS_IS_FILE(pObjInfo->Attr.fMode))
@@ -1717 +1718 @@
     if (rc == VINF_SUCCESS)
     {
-        *pcbBuffer = sizeof(RTFSOBJINFO);
+        vbfsCopyFsObjInfoFromIprt(pObjInfo, &fileinfo);
+        *pcbBuffer = sizeof(SHFLFSOBJINFO);
     }
     else
@@ -1729 +1731 @@
     SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_DIR|SHFL_HF_TYPE_FILE);
     int             rc = VINF_SUCCESS;
-    RTFSOBJINFO    *pSFDEntry;
-
-    if (pHandle == 0 || pcbBuffer == 0 || pBuffer == 0 || *pcbBuffer < sizeof(RTFSOBJINFO))
+    SHFLFSOBJINFO  *pSFDEntry;
+
+    if (pHandle == 0 || pcbBuffer == 0 || pBuffer == 0 || *pcbBuffer < sizeof(SHFLFSOBJINFO))
     {
         AssertFailed();
@@ -1738 +1740 @@
 
     *pcbBuffer  = 0;
-    pSFDEntry   = (RTFSOBJINFO *)pBuffer;
+    pSFDEntry   = (SHFLFSOBJINFO *)pBuffer;
 
     Assert(flags == (SHFL_INFO_SET | SHFL_INFO_FILE));
@@ -1804 +1806 @@
         if (rc == VINF_SUCCESS)
         {
-            *pcbBuffer = sizeof(RTFSOBJINFO);
+            *pcbBuffer = sizeof(SHFLFSOBJINFO);
         }
         else
@@ -1818 +1820 @@
     SHFLFILEHANDLE *pHandle = (SHFLFILEHANDLE *)vbsfQueryHandle(Handle, SHFL_HF_TYPE_FILE);
     int             rc = VINF_SUCCESS;
-    RTFSOBJINFO    *pSFDEntry;
+    SHFLFSOBJINFO  *pSFDEntry;
 
     if (pHandle == 0 || pcbBuffer == 0 || pBuffer == 0 || *pcbBuffer < sizeof(RTFSOBJINFO))
@@ -1827 +1829 @@
 
     *pcbBuffer  = 0;
-    pSFDEntry   = (RTFSOBJINFO *)pBuffer;
+    pSFDEntry   = (SHFLFSOBJINFO *)pBuffer;
 
     if (flags & SHFL_INFO_SIZE)
@@ -1849 +1851 @@
             fileinfo.Attr.fMode |= 0111;
 #endif
-            *pSFDEntry = fileinfo;
-            *pcbBuffer = sizeof(RTFSOBJINFO);
+            vbfsCopyFsObjInfoFromIprt(pSFDEntry, &fileinfo);
+            *pcbBuffer = sizeof(SHFLFSOBJINFO);
         }
         else