Changeset 69691 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

iprt: Started on RTDirRel for NT.

Location:

trunk

Files:

• include/iprt/nt/nt.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (9 diffs)
• src/VBox/Runtime/include/internal/dir.h (modified) (2 diffs)
• src/VBox/Runtime/include/internal/file.h (modified) (1 diff)
• src/VBox/Runtime/nt/fileioutils-nt.cpp (added)
• src/VBox/Runtime/r3/dir.cpp (modified) (6 diffs)
• src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/nt/dirrel-r3-nt.cpp (added)
• src/VBox/Runtime/r3/nt/pathint-nt.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/dir-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/direnum-win.cpp (modified) (1 diff)

trunk/include/iprt/nt/nt.h

@@ -264 +264 @@
 RTDECL(int) RTNtPathOpenDir(const char *pszPath, ACCESS_MASK fDesiredAccess, ULONG fShareAccess, ULONG fCreateOptions,
                             ULONG fObjAttribs, PHANDLE phHandle, bool *pfObjDir);
+RTDECL(int) RTNtPathOpenDirEx(HANDLE hRootDir, struct _UNICODE_STRING *pNtName, ACCESS_MASK fDesiredAccess,
+                              ULONG fShareAccess, ULONG fCreateOptions, ULONG fObjAttribs, PHANDLE phHandle, bool *pfObjDir);
 RTDECL(int) RTNtPathClose(HANDLE hHandle);
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -680 +680 @@
         r3/tcp.cpp \
         r3/udp.cpp \
-        r3/generic/dirrel-r3-generic.cpp \
         r3/generic/semspinmutex-r3-generic.cpp \
         r3/xml.cpp \
@@ -818 +817 @@
         nt/RTNtPathExpand8dot3Path.cpp \
         nt/RTNtPathFindPossible8dot3Name.cpp \
+        nt/fileioutils-nt.cpp \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+        r3/nt/dirrel-r3-nt.cpp \
         r3/nt/fs-nt.cpp \
         r3/nt/pathint-nt.cpp \
@@ -899 +900 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/allocex-r3-posix.cpp \
         r3/linux/RTThreadGetNativeState-linux.cpp \
@@ -1011 +1013 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/os2/filelock-os2.cpp \
         r3/os2/mp-os2.cpp \
@@ -1094 +1097 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -1168 +1172 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -1241 +1246 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -1307 +1313 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTFileSetAllocationSize-posix.cpp \
@@ -1398 +1405 @@
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
+        r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \

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

@@ -159 +159 @@
  *
  * @returns IPRT status code.
- * @param   pDir        The directory to open. The pszPath member contains the
- *                      path to the directory.
- * @param   pszPathBuf  Pointer to a RTPATH_MAX sized buffer containing pszPath.
- *                      Find-first style systems can use this to setup the
- *                      wildcard expression.
+ * @param   pDir                The directory to open. The pszPath member contains the
+ *                              path to the directory.
+ * @param   pszPathBuf          Pointer to a RTPATH_MAX sized buffer containing
+ *                              pszPath.  Find-first style systems can use this
+ *                              to setup the wildcard expression.
+ * @param   hRelativeDir        The directory @a pvNativeRelative is relative,
+ *                              ~(uintptr_t)0 if absolute.
+ * @param   pvNativeRelative    The native relative path.  NULL if absolute.
  */
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf);
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative);
 
 /**
@@ -175 +178 @@
 size_t rtDirNativeGetStructSize(const char *pszPath);
 
+
+DECLHIDDEN(int) rtDirOpenRelative(PRTDIR *ppDir, const char *pszRelativeAndFilter, RTDIRFILTER enmFilter, uint32_t fFlags,
+                                  uintptr_t hRelativeDir, void *pvNativeRelative);
+
 #endif

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

@@ -56 +56 @@
 RTFILE rtFileGetStandard(RTHANDLESTD enmStdHandle);
 
+#ifdef RT_OS_WINDOWS
+/**
+ * Helper for converting RTFILE_O_XXX to the various NtCreateFile flags.
+ *
+ * @returns IPRT status code
+ * @param   fOpen               The RTFILE_O_XXX flags to convert.
+ * @param   pfDesiredAccess     Where to return the desired access mask.
+ * @param   pfObjAttribs        Where to return the NT object attributes.
+ * @param   pfFileAttribs       Where to return the file attributes (create).
+ * @param   pfShareAccess       Where to return the file sharing access mask.
+ * @param   pfCreateDisposition Where to return the file create disposition.
+ * @param   pfCreateOptions     Where to return the file open/create options.
+ */
+DECLHIDDEN(int) rtFileNtValidateAndConvertFlags(uint64_t fOpen, uint32_t *pfDesiredAccess, uint32_t *pfObjAttribs,
+                                                uint32_t *pfFileAttribs, uint32_t *pfShareAccess, uint32_t *pfCreateDisposition,
+                                                uint32_t *pfCreateOptions);
+#endif
+
 RT_C_DECLS_END
 

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

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

@@ -80 +80 @@
 
 
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative)
 {
     /*
@@ -103 +103 @@
      */
 #ifdef IPRT_WITH_NT_PATH_PASSTHRU
-    bool fObjDir;
-#endif
-    rc = RTNtPathOpenDir(pszPathBuf,
-                         FILE_LIST_DIRECTORY | FILE_TRAVERSE | SYNCHRONIZE,
-                         FILE_SHARE_READ | FILE_SHARE_WRITE,
-                         FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT,
-                         OBJ_CASE_INSENSITIVE,
-                         &pDir->hDir,
-#ifdef IPRT_WITH_NT_PATH_PASSTHRU
-                         &fObjDir
+    bool fObjDir = false;
+#endif
+    if (pvNativeRelative == NULL)
+        rc = RTNtPathOpenDir(pszPathBuf,
+                             FILE_LIST_DIRECTORY | FILE_TRAVERSE | SYNCHRONIZE,
+                             FILE_SHARE_READ | FILE_SHARE_WRITE,
+                             FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT,
+                             OBJ_CASE_INSENSITIVE,
+                             &pDir->hDir,
+#ifdef IPRT_WITH_NT_PATH_PASSTHRU
+                             &fObjDir
 #else
-                         NULL
-#endif
-                         );
+                             NULL
+#endif
+                             );
+    else
+        rc = RTNtPathOpenDirEx((HANDLE)hRelativeDir,
+                               (struct _UNICODE_STRING *)pvNativeRelative,
+                               FILE_LIST_DIRECTORY | FILE_TRAVERSE | SYNCHRONIZE,
+                               FILE_SHARE_READ | FILE_SHARE_WRITE,
+                               FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT,
+                               OBJ_CASE_INSENSITIVE,
+                               &pDir->hDir,
+                               NULL);
     if (RT_SUCCESS(rc))
     {

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

@@ -763 +763 @@
     if (RT_SUCCESS(rc))
     {
-        HANDLE              hFile = RTNT_INVALID_HANDLE_VALUE;
-        IO_STATUS_BLOCK     Ios   = RTNT_IO_STATUS_BLOCK_INITIALIZER;
-        OBJECT_ATTRIBUTES   ObjAttr;
-        InitializeObjectAttributes(&ObjAttr, &NtName, fObjAttribs, hRootDir, NULL);
-
-        NTSTATUS rcNt = NtCreateFile(&hFile,
-                                     fDesiredAccess,
-                                     &ObjAttr,
-                                     &Ios,
-                                     NULL /* AllocationSize*/,
-                                     FILE_ATTRIBUTE_NORMAL,
-                                     fShareAccess,
-                                     FILE_OPEN,
-                                     fCreateOptions,
-                                     NULL /*EaBuffer*/,
-                                     0 /*EaLength*/);
+        if (pfObjDir)
+        {
+            *pfObjDir = false;
+#ifdef IPRT_WITH_NT_PATH_PASSTHRU
+            if (   !RTPATH_IS_SLASH(pszPath[0])
+                || !RTPATH_IS_SLASH(pszPath[1])
+                || pszPath[2] != '!'
+                || RTPATH_IS_SLASH(pszPath[3]))
+#endif
+                pfObjDir = NULL;
+        }
+        rc = RTNtPathOpenDirEx(hRootDir, &NtName, fDesiredAccess, fShareAccess, fCreateOptions, fObjAttribs, phHandle, pfObjDir);
+        rtNtPathFreeNative(&NtName, &hRootDir);
+    }
+    return rc;
+}
+
+
+
+/**
+ * Wrapper around NtCreateFile, extended version.
+ *
+ * @returns IPRT status code.
+ * @param   hRootDir            The root director the path is relative to.  NULL
+ *                              if none.
+ * @param   pNtName             The NT path.
+ * @param   fDesiredAccess      See NtCreateFile.
+ * @param   fShareAccess        See NtCreateFile.
+ * @param   fCreateOptions      See NtCreateFile.
+ * @param   fObjAttribs         The OBJECT_ATTRIBUTES::Attributes value, see
+ *                              NtCreateFile and InitializeObjectAttributes.
+ * @param   phHandle            Where to return the handle.
+ * @param   pfObjDir            If not NULL, the variable pointed to will be set
+ *                              to @c true if we opened an object directory and
+ *                              @c false if we opened an directory file (normal
+ *                              directory).
+ */
+RTDECL(int) RTNtPathOpenDirEx(HANDLE hRootDir, struct _UNICODE_STRING *pNtName, ACCESS_MASK fDesiredAccess, ULONG fShareAccess,
+                              ULONG fCreateOptions, ULONG fObjAttribs, PHANDLE phHandle, bool *pfObjDir)
+{
+    *phHandle = RTNT_INVALID_HANDLE_VALUE;
+
+    HANDLE              hFile = RTNT_INVALID_HANDLE_VALUE;
+    IO_STATUS_BLOCK     Ios   = RTNT_IO_STATUS_BLOCK_INITIALIZER;
+    OBJECT_ATTRIBUTES   ObjAttr;
+    InitializeObjectAttributes(&ObjAttr, pNtName, fObjAttribs, hRootDir, NULL);
+
+    NTSTATUS rcNt = NtCreateFile(&hFile,
+                                 fDesiredAccess,
+                                 &ObjAttr,
+                                 &Ios,
+                                 NULL /* AllocationSize*/,
+                                 FILE_ATTRIBUTE_NORMAL,
+                                 fShareAccess,
+                                 FILE_OPEN,
+                                 fCreateOptions,
+                                 NULL /*EaBuffer*/,
+                                 0 /*EaLength*/);
+    if (NT_SUCCESS(rcNt))
+    {
+        if (pfObjDir)
+            *pfObjDir = false;
+        *phHandle = hFile;
+        return VINF_SUCCESS;
+    }
+
+    if (   pfObjDir
+        && (rcNt == STATUS_OBJECT_NAME_INVALID || rcNt == STATUS_OBJECT_TYPE_MISMATCH))
+    {
+        /* Strip trailing slash. */
+        struct _UNICODE_STRING NtName2 = *pNtName;
+        if (   NtName2.Length > 2
+            && RTPATH_IS_SLASH(NtName2.Buffer[(NtName2.Length / 2) - 1]))
+            NtName2.Length -= 2;
+        ObjAttr.ObjectName = &NtName2;
+
+        /* Rought conversion of the access flags. */
+        ULONG fObjDesiredAccess = 0;
+        if (fDesiredAccess & (GENERIC_ALL | STANDARD_RIGHTS_ALL))
+            fObjDesiredAccess = DIRECTORY_ALL_ACCESS;
+        else
+        {
+            if (fDesiredAccess & (FILE_GENERIC_WRITE | GENERIC_WRITE | STANDARD_RIGHTS_WRITE))
+                fObjDesiredAccess |= DIRECTORY_CREATE_OBJECT | DIRECTORY_CREATE_OBJECT;
+            if (   (fDesiredAccess & (FILE_LIST_DIRECTORY | FILE_GENERIC_READ | GENERIC_READ | STANDARD_RIGHTS_READ))
+                || !fObjDesiredAccess)
+                fObjDesiredAccess |= DIRECTORY_QUERY | FILE_LIST_DIRECTORY;
+        }
+
+        rcNt = NtOpenDirectoryObject(&hFile, fObjDesiredAccess, &ObjAttr);
         if (NT_SUCCESS(rcNt))
         {
-            if (pfObjDir)
-                *pfObjDir = false;
+            *pfObjDir = true;
             *phHandle = hFile;
-            rc = VINF_SUCCESS;
-        }
-#ifdef IPRT_WITH_NT_PATH_PASSTHRU
-        else if (   pfObjDir
-                 && (rcNt == STATUS_OBJECT_NAME_INVALID || rcNt == STATUS_OBJECT_TYPE_MISMATCH)
-                 && RTPATH_IS_SLASH(pszPath[0])
-                 && RTPATH_IS_SLASH(pszPath[1])
-                 && pszPath[2] == '!'
-                 && RTPATH_IS_SLASH(pszPath[3]))
-        {
-            /* Strip trailing slash. */
-            if (   NtName.Length > 2
-                && RTPATH_IS_SLASH(NtName.Buffer[(NtName.Length / 2) - 1]))
-                NtName.Length -= 2;
-
-            /* Rought conversion of the access flags. */
-            ULONG fObjDesiredAccess = 0;
-            if (fDesiredAccess & (GENERIC_ALL | STANDARD_RIGHTS_ALL))
-                fObjDesiredAccess = DIRECTORY_ALL_ACCESS;
-            else
-            {
-                if (fDesiredAccess & (FILE_GENERIC_WRITE | GENERIC_WRITE | STANDARD_RIGHTS_WRITE))
-                    fObjDesiredAccess |= DIRECTORY_CREATE_OBJECT | DIRECTORY_CREATE_OBJECT;
-                if (   (fDesiredAccess & (FILE_LIST_DIRECTORY | FILE_GENERIC_READ | GENERIC_READ | STANDARD_RIGHTS_READ))
-                    || !fObjDesiredAccess)
-                    fObjDesiredAccess |= DIRECTORY_QUERY | FILE_LIST_DIRECTORY;
-            }
-
-            rcNt = NtOpenDirectoryObject(&hFile, fObjDesiredAccess, &ObjAttr);
-            if (NT_SUCCESS(rcNt))
-            {
-                *pfObjDir = true;
-                *phHandle = hFile;
-                rc = VINF_SUCCESS;
-            }
-            else
-                rc = RTErrConvertFromNtStatus(rcNt);
-        }
-#endif
-        else
-            rc = RTErrConvertFromNtStatus(rcNt);
-        rtNtPathFreeNative(&NtName, &hRootDir);
-    }
-    return rc;
-}
+            return VINF_SUCCESS;
+        }
+    }
+
+    return RTErrConvertFromNtStatus(rcNt);
+}
+
 
 

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

@@ -224 +224 @@
 
 
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative)
 {
     NOREF(pszPathBuf); /* only used on windows */
+    NOREF(hRelativeDir);
+    NOREF(pvNativeRelative);
 
     /*

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

@@ -51 +51 @@
 
 
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf)
-{
+int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative))
+{
+    RT_NOREF(hRelativeDir, pvNativeRelative);
+
     /*
      * Setup the search expression.