Changeset 71978 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2018 11:26:21 AM (7 years ago)

Author:

vboxsync

Message:

rtPathNtQueryInfoInDirectoryObject: Return caller status when NtOpenDirectoryObject fails.

File:

• trunk/src/VBox/Runtime/r3/nt/RTPathQueryInfo-nt.cpp (modified) (5 diffs)

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

@@ -179 +179 @@
  * @param   pvBuf           Query buffer space.
  * @param   cbBuf           Size of the buffer.  ASSUMES lots of space.
+ * @param   rcNtCaller      The status code that got us here.
  */
 static int rtPathNtQueryInfoInDirectoryObject(OBJECT_ATTRIBUTES *pObjAttr, PRTFSOBJINFO pObjInfo,
                                               RTFSOBJATTRADD enmAddAttr, uint32_t fFlags,
-                                              void *pvBuf, size_t cbBuf)
+                                              void *pvBuf, size_t cbBuf, NTSTATUS rcNtCaller)
 {
     RT_NOREF(fFlags);
@@ -271 +272 @@
             return VERR_FILE_NOT_FOUND;
     }
+    else
+        return RTErrConvertFromNtStatus(rcNtCaller);
     return RTErrConvertFromNtStatus(rcNt);
 }
@@ -410 +413 @@
                  || rcNt == STATUS_INVALID_PARAMETER)
         {
-            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf));
+            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf), rcNt);
             if (RT_SUCCESS(rc))
                 return rc;
@@ -517 +520 @@
                  /*|| rcNt == STATUS_INVALID_PARAMETER*/)
         {
-            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf));
+            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf), rcNt);
             if (RT_SUCCESS(rc))
                 return rc;
@@ -618 +621 @@
         {
             InitializeObjectAttributes(&ObjAttr, pNtName, OBJ_CASE_INSENSITIVE, hRootDir, NULL);
-            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf));
+            rc = rtPathNtQueryInfoInDirectoryObject(&ObjAttr, pObjInfo, enmAddAttr, fFlags, &uBuf, sizeof(uBuf), rcNt);
             if (RT_FAILURE(rc))
                 rc = RTErrConvertFromNtStatus(rcNt);