Changeset 69795 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Nov 21, 2017 4:29:49 PM (7 years ago)

Author:

vboxsync

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

119213

Message:

IPRT: file mode changing on NT + RTChMod command.

• Reimplemented RTFileSetMode for NT.
• Implemented RTPathSetMode for NT.
• Reimplemented RTDirRelPathSetMode for NT.
• Started on a testcase command: RTChMode

Location:

trunk/src/VBox/Runtime/r3

Files:

• nt/RTFileSetMode-r3-nt.cpp (added)
• nt/RTPathSetMode-r3-nt.cpp (added)
• nt/dirrel-r3-nt.cpp (modified) (1 diff)
• nt/internal-r3-nt.h (modified) (1 diff)
• win/fileio-win.cpp (modified) (2 diffs)
• win/rtFileNativeSetAttributes-win.cpp (deleted)

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

@@ -414 +414 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTDIR_MAGIC, VERR_INVALID_HANDLE);
+    fMode = rtFsModeNormalize(fMode, pszRelPath, 0);
+    AssertReturn(rtFsModeIsValidPermissions(fMode), VERR_INVALID_FMODE);
     AssertMsgReturn(RTPATH_F_IS_VALID(fFlags, 0), ("%#x\n", fFlags), VERR_INVALID_FLAGS);
 
-    char szPath[RTPATH_MAX];
-    int rc = rtDirRelBuildFullPath(pThis, szPath, sizeof(szPath), pszRelPath);
-    if (RT_SUCCESS(rc))
-    {
-RTAssertMsg2("DBG: RTDirRelPathSetMode(%s)...\n", szPath);
-#ifndef RT_OS_WINDOWS
-        rc = RTPathSetMode(szPath, fMode); /** @todo fFlags is currently ignored. */
-#else
-        rc = VERR_NOT_IMPLEMENTED; /** @todo implement RTPathSetMode on windows. */
-        RT_NOREF(fMode);
-#endif
+    /*
+     * 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);
+
+        ULONG fOpenOptions = FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT;
+        if (fFlags & RTPATH_F_ON_LINK)
+            fOpenOptions |= FILE_OPEN_REPARSE_POINT;
+        NTSTATUS rcNt = NtCreateFile(&hSubDir,
+                                     FILE_WRITE_ATTRIBUTES | SYNCHRONIZE,
+                                     &ObjAttr,
+                                     &Ios,
+                                     NULL /*AllocationSize*/,
+                                     FILE_ATTRIBUTE_NORMAL,
+                                     FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
+                                     FILE_OPEN,
+                                     fOpenOptions,
+                                     NULL /*EaBuffer*/,
+                                     0 /*EaLength*/);
+        if (NT_SUCCESS(rcNt))
+        {
+            rc = rtNtFileSetModeWorker(hSubDir, fMode);
+
+            rcNt = NtClose(hSubDir);
+            if (!NT_SUCCESS(rcNt) && RT_SUCCESS(rc))
+                rc = RTErrConvertFromNtStatus(rcNt);
+        }
+        else
+            rc = RTErrConvertFromNtStatus(rcNt);
+
+        RTNtPathFree(&NtName, NULL);
     }
     return rc;

trunk/src/VBox/Runtime/r3/nt/internal-r3-nt.h

@@ -69 +69 @@
 #endif
 
+/**
+ * Common worker for RTFileSetMode, RTPathSetMode and RTDirRelPathSetMode.
+ *
+ * @returns IPRT status code.
+ * @param   hNativeFile The NT handle to the file system object.
+ * @param   fMode       Valid and normalized file mode mask to set.
+ */
+DECLHIDDEN(int) rtNtFileSetModeWorker(HANDLE hNativeFile, RTFMODE fMode);
+

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

@@ -977 +977 @@
 
 
+#if 0 /* RTFileSetMode is implemented by RTFileSetMode-r3-nt.cpp */
 /* This comes from a source file with a different set of system headers (DDK)
  * so it can't be declared in a common header, like internal/file.h.
@@ -1003 +1004 @@
     return VINF_SUCCESS;
 }
+#endif