Changeset 75652 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 21, 2018 9:00:31 PM (6 years ago)

Author:

vboxsync

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

126831

Message:

IPRT/dir: Adding RTDirRewind for use with shared folders.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/dir.h (modified) (1 diff)
• r3/nt/direnum-r3-nt.cpp (modified) (5 diffs)
• r3/posix/dir-posix.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/include/internal/dir.h

@@ -99 +99 @@
 #ifndef RTDIR_AGNOSTIC
 # ifdef RT_OS_WINDOWS
+    /** Set by RTDirRewind. */
+    bool                fRestartScan;
     /** Handle to the opened directory search. */
     HANDLE              hDir;

trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp

@@ -432 +432 @@
                                                        pThis->cbBufferAlloc,
                                                        RTDIR_NT_SINGLE_RECORD /*ReturnSingleEntry */,
-                                                       FALSE /*RestartScan*/,
+                                                       pThis->fRestartScan,
                                                        &pThis->uObjDirCtx,
                                                        (PULONG)&Ios.Information);
@@ -448 +448 @@
                                         RTDIR_NT_SINGLE_RECORD /*ReturnSingleEntry */,
                                         pThis->pNtFilterStr,
-                                        FALSE /*RestartScan */);
+                                        pThis->fRestartScan);
     }
     else
@@ -486 +486 @@
                                     RTDIR_NT_SINGLE_RECORD /*ReturnSingleEntry */,
                                     pThis->pNtFilterStr,
-                                    FALSE /*RestartScan */);
+                                    pThis->fRestartScan);
         if (NT_SUCCESS(rcNt))
         { /* likely */ }
         else
         {
-            bool fRestartScan = false;
+            bool fRestartScan = pThis->fRestartScan;
             for (unsigned iRetry = 0; iRetry < 2; iRetry++)
             {
@@ -551 +551 @@
         return RTErrConvertFromNtStatus(rcNt);
     }
+    pThis->fRestartScan = false;
     AssertMsg(  Ios.Information
               > (pThis->enmInfoClass == FileMaximumInformation ? sizeof(*pThis->uCurData.pObjDir) : sizeof(*pThis->uCurData.pBoth)),
@@ -906 +907 @@
 }
 
+
+RTDECL(int) RTDirRewind(RTDIR hDir)
+{
+    /*
+     * Validate and digest input.
+     */
+    PRTDIRINTERNAL pThis = hDir;
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertReturn(pThis->u32Magic == RTDIR_MAGIC, VERR_INVALID_HANDLE);
+
+    /*
+     * The work is done on the next call to rtDirNtFetchMore.
+     */
+    pThis->fRestartScan = true;
+    pThis->fDataUnread  = false;
+
+    return VINF_SUCCESS;
+}
 
 

trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp

@@ -649 +649 @@
 
 
+RTDECL(int) RTDirRewind(RTDIR hDir)
+{
+    PRTDIRINTERNAL pDir = hDir;
+
+    /*
+     * Validate and digest input.
+     */
+    if (!rtDirValidHandle(pDir))
+        return VERR_INVALID_PARAMETER;
+
+    /*
+     * Do the rewinding.
+     */
+    /** @todo OS/2 does not rescan the directory as it should. */
+    rewinddir(pDir->pDir);
+    pDir->fDataUnread = false;
+
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) RTDirRename(const char *pszSrc, const char *pszDst, unsigned fRename)
 {