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

Timestamp:

Apr 12, 2018 3:29:50 PM (7 years ago)

Author:

vboxsync

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

122068

Message:

IPRT/nt/RTDirRelDirOpenFiltered: Must strip the filter from the NT path of NtCreateFile will return invalid name, duh!

File:

• trunk/src/VBox/Runtime/r3/nt/dirrel-r3-nt.cpp (modified) (1 diff)

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

@@ -256 +256 @@
                                         &NtName, hRoot != NULL, pszDirAndFilter);
         if (RT_SUCCESS(rc))
+        {
+            /* Drop the filter from the NT name. */
+            switch (enmFilter)
+            {
+                case RTDIRFILTER_NONE:
+                    break;
+                case RTDIRFILTER_WINNT:
+                case RTDIRFILTER_UNIX:
+                case RTDIRFILTER_UNIX_UPCASED:
+                {
+                    size_t cwc = NtName.Length / sizeof(RTUTF16);
+                    while (   cwc > 0
+                           && NtName.Buffer[cwc - 1] != '\\')
+                        cwc--;
+                    NtName.Buffer[cwc] = '\0';
+                    NtName.Length = (uint16_t)(cwc * sizeof(RTUTF16));
+                    break;
+                }
+                default:
+                    AssertFailedBreak();
+            }
+
             rc = rtDirOpenRelativeOrHandle(phDir, szAbsDirAndFilter, enmFilter, fFlags, (uintptr_t)hRoot, &NtName);
+        }
         RTNtPathFree(&NtName, NULL);
     }