Changeset 69691 in vbox for trunk/src/VBox/Runtime/r3/dir.cpp

Timestamp:

Nov 14, 2017 3:27:52 PM (7 years ago)

Author:

vboxsync

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

119064

Message:

iprt: Started on RTDirRel for NT.

File:

• trunk/src/VBox/Runtime/r3/dir.cpp (modified) (6 diffs)

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

@@ -506 +506 @@
  *
  * @returns IPRT status code.
- * @param   ppDir       Where to store the directory handle.
- * @param   pszPath     The specified path.
- * @param   pszFilter   Pointer to where the filter start in the path. NULL if no filter.
- * @param   enmFilter   The type of filter to apply.
- * @param   fFlags      RTDIR_F_XXX.
- */
-static int rtDirOpenCommon(PRTDIR *ppDir, const char *pszPath, const char *pszFilter, RTDIRFILTER enmFilter, uint32_t fFlags)
+ * @param   ppDir               Where to store the directory handle.
+ * @param   pszPath             The specified path.
+ * @param   pszFilter           Pointer to where the filter start in the path.
+ *                              NULL if no filter.
+ * @param   enmFilter           The type of filter to apply.
+ * @param   fFlags              RTDIR_F_XXX.
+ * @param   hRelativeDir        The directory @a pvNativeRelative is relative,
+ *                              ~(uintptr_t)0 if absolute.
+ * @param   pvNativeRelative    The native relative path.  NULL if absolute.
+ */
+static int rtDirOpenCommon(PRTDIR *ppDir, const char *pszPath, const char *pszFilter, RTDIRFILTER enmFilter, uint32_t fFlags,
+                           uintptr_t hRelativeDir, void *pvNativeRelative)
 {
     /*
@@ -623 +628 @@
      * Hand it over to the native part.
      */
-    rc = rtDirNativeOpen(pDir, szRealPath);
+    rc = rtDirNativeOpen(pDir, szRealPath, hRelativeDir, pvNativeRelative);
     if (RT_SUCCESS(rc))
         *ppDir = pDir;
@@ -633 +638 @@
 
 
-
 RTDECL(int) RTDirOpen(PRTDIR *ppDir, const char *pszPath)
 {
@@ -645 +649 @@
      * Take common cause with RTDirOpenFiltered().
      */
-    int rc = rtDirOpenCommon(ppDir, pszPath, NULL, RTDIRFILTER_NONE, 0 /*fFlags*/);
+    int rc = rtDirOpenCommon(ppDir, pszPath, NULL, RTDIRFILTER_NONE, 0 /*fFlags*/, ~(uintptr_t)0, NULL);
     LogFlow(("RTDirOpen(%p:{%p}, %p:{%s}): return %Rrc\n", ppDir, *ppDir, pszPath, pszPath, rc));
     return rc;
@@ -651 +655 @@
 
 
-RTDECL(int) RTDirOpenFiltered(PRTDIR *ppDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fFlags)
+DECLHIDDEN(int) rtDirOpenRelative(PRTDIR *ppDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fFlags,
+                                  uintptr_t hRelativeDir, void *pvNativeRelative)
 {
     /*
@@ -689 +694 @@
      * and initialize the handle, and finally call the backend.
      */
-    int rc = rtDirOpenCommon(ppDir, pszPath, pszFilter, enmFilter, fFlags);
-
-    LogFlow(("RTDirOpenFiltered(%p:{%p}, %p:{%s}, %d, %#x): return %Rrc\n",
-             ppDir, *ppDir, pszPath, pszPath, enmFilter, fFlags, rc));
+    int rc = rtDirOpenCommon(ppDir, pszPath, pszFilter, enmFilter, fFlags, hRelativeDir, pvNativeRelative);
+
+    LogFlow(("RTDirOpenFiltered(%p:{%p}, %p:{%s}, %d, %#x, %p, %p): return %Rrc\n",
+             ppDir,*ppDir, pszPath, pszPath, enmFilter, fFlags, hRelativeDir, pvNativeRelative, rc));
     return rc;
+}
+
+
+RTDECL(int) RTDirOpenFiltered(PRTDIR *ppDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fFlags)
+{
+    return rtDirOpenRelative(ppDir, pszPath, enmFilter, fFlags, ~(uintptr_t)0, NULL);
 }