Changeset 69720 in vbox for trunk/src/VBox/Runtime/r3/nt

Timestamp:

Nov 16, 2017 4:18:19 PM (7 years ago)

Author:

vboxsync

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

119101

Message:

IPRT: More work on directory relative APIs (NT mainly) and VFS; introducing RTRmDir (test) tool.

• Added RTVfsDirRemoveDir
• Native NT implementation of RTDirRelRemoveDir.
• Improved the RTFS_TYPE_DIRECTORY case of rtVfsStdDir_UnlinkEntry.
• Added two new status code conversions to RTErrConvertFromNtStatus.

File:

• trunk/src/VBox/Runtime/r3/nt/dirrel-r3-nt.cpp (modified) (3 diffs)

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

@@ -217 +217 @@
 
 
-/**
- * Creates a directory relative to @a hDir.
- *
- * @returns IPRT status code.
- * @param   hDir            The directory @a pszRelPath is relative to.
- * @param   pszRelPath      The relative path to the directory to create.
- * @param   fMode           The mode of the new directory.
- * @param   fCreate         Create flags, RTDIRCREATE_FLAGS_XXX.
- * @param   phSubDir        Where to return the handle of the created directory.
- *                          Optional.
- *
- * @sa      RTDirCreate
- */
 RTDECL(int) RTDirRelDirCreate(PRTDIR hDir, const char *pszRelPath, RTFMODE fMode, uint32_t fCreate, PRTDIR *phSubDir)
 {
@@ -321 +308 @@
 
 
-/**
- * Removes a directory relative to @a hDir if empty.
- *
- * @returns IPRT status code.
- * @param   hDir            The directory @a pszRelPath is relative to.
- * @param   pszRelPath      The relative path to the directory to remove.
- *
- * @sa      RTDirRemove
- */
 RTDECL(int) RTDirRelDirRemove(PRTDIR hDir, const char *pszRelPath)
 {
@@ -336 +314 @@
     AssertReturn(pThis->u32Magic == RTDIR_MAGIC, VERR_INVALID_HANDLE);
 
-
-    char szPath[RTPATH_MAX];
-    int rc = rtDirRelBuildFullPath(pThis, szPath, sizeof(szPath), pszRelPath);
-    if (RT_SUCCESS(rc))
-    {
-RTAssertMsg2("DBG: RTDirRelDirRemove(%s)...\n", szPath);
-        rc = RTDirRemove(szPath);
+    /*
+     * Convert and normalize the path.
+     */
+    UNICODE_STRING NtName;
+    HANDLE hRoot = pThis->hDir;
+    int rc = RTNtPathRelativeFromUtf8(&NtName, &hRoot, pszRelPath, RTDIRREL_NT_GET_ASCENT(pThis),
+                                      pThis->enmInfoClass == FileMaximumInformation);
+    if (RT_SUCCESS(rc))
+    {
+        HANDLE              hSubDir = RTNT_INVALID_HANDLE_VALUE;
+        IO_STATUS_BLOCK     Ios     = RTNT_IO_STATUS_BLOCK_INITIALIZER;
+        OBJECT_ATTRIBUTES   ObjAttr;
+        InitializeObjectAttributes(&ObjAttr, &NtName, 0 /*fAttrib*/, hRoot, NULL);
+
+        NTSTATUS rcNt = NtCreateFile(&hSubDir,
+                                     DELETE | SYNCHRONIZE,
+                                     &ObjAttr,
+                                     &Ios,
+                                     NULL /*AllocationSize*/,
+                                     FILE_ATTRIBUTE_NORMAL,
+                                     FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
+                                     FILE_OPEN,
+                                     FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT,
+                                     NULL /*EaBuffer*/,
+                                     0 /*EaLength*/);
+        if (NT_SUCCESS(rcNt))
+        {
+            FILE_DISPOSITION_INFORMATION DispInfo;
+            DispInfo.DeleteFile = TRUE;
+            RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
+            rcNt = NtSetInformationFile(hSubDir, &Ios, &DispInfo, sizeof(DispInfo), FileDispositionInformation);
+
+            NTSTATUS rcNt2 = NtClose(hSubDir);
+            if (!NT_SUCCESS(rcNt2) && NT_SUCCESS(rcNt))
+                rcNt = rcNt2;
+        }
+
+        if (NT_SUCCESS(rcNt))
+            rc = VINF_SUCCESS;
+        else
+            rc = RTErrConvertFromNtStatus(rcNt);
+
+        RTNtPathFree(&NtName, NULL);
     }
     return rc;