Changeset 78541 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders

Timestamp:

May 16, 2019 10:26:53 AM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Final VBoxMRxQueryVolumeInfo cleanups. bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp (modified) (17 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include "vbsf.h"
+#include <iprt/asm.h>
 #include <iprt/err.h>
-#include <iprt/asm.h>
+#include <iprt/mem.h>
 
 extern "C" NTSTATUS NTAPI RxSetEndOfFileInfo(PRX_CONTEXT, PIRP, PFCB, PFOBX);
@@ -522 +523 @@
     return Status;
 }
+
+
+/*********************************************************************************************************************************
+*   NtQueryVolumeInformationFile                                                                                                 *
+*********************************************************************************************************************************/
 
 /**
@@ -583 +589 @@
 }
 
-
 /**
  * Handles NtQueryVolumeInformationFile / FileFsVolumeInformation
@@ -699 +704 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - cbCopied;
-    pRxContext->InformationToReturn  = cbCopied; /* whatever */
+    pRxContext->InformationToReturn  = cbCopied;
 
     return Status;
@@ -765 +770 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - sizeof(*pInfo);
-    pRxContext->InformationToReturn  = sizeof(*pInfo); /* whatever */
+    pRxContext->InformationToReturn  = sizeof(*pInfo);
     return STATUS_SUCCESS;
 }
@@ -833 +838 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - sizeof(*pInfo);
-    pRxContext->InformationToReturn  = sizeof(*pInfo); /* whatever */
+    pRxContext->InformationToReturn  = sizeof(*pInfo);
     return STATUS_SUCCESS;
 }
@@ -863 +868 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - sizeof(*pInfo);
-    pRxContext->InformationToReturn  = sizeof(*pInfo); /* whatever */
+    pRxContext->InformationToReturn  = sizeof(*pInfo);
     return STATUS_SUCCESS;
 }
@@ -935 +940 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - cbStrCopied - RT_UOFFSETOF(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName);
-    pRxContext->InformationToReturn  = cbStrCopied + RT_UOFFSETOF(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName); /* whatever */
+    pRxContext->InformationToReturn  = cbStrCopied + RT_UOFFSETOF(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName);
     return cbInfo >= cbNeeded ? STATUS_SUCCESS : STATUS_BUFFER_OVERFLOW;
 }
@@ -984 +989 @@
      */
     pRxContext->Info.LengthRemaining = cbInfo - sizeof(*pInfo);
-    pRxContext->InformationToReturn  = sizeof(*pInfo); /* whatever */
+    pRxContext->InformationToReturn  = sizeof(*pInfo);
     return STATUS_SUCCESS;
 }
 
 
-#include <iprt/mem.h>
 /**
  * Handles NtQueryVolumeInformationFile and similar.
  *
  * The RDBSS library does not do a whole lot for these queries.  No FCB locking.
- *
- *
  * The IO_STATUS_BLOCK updating differs too,  setting of Ios.Information is
- * limited to cbInitialBuf
- * - RxContext->Info.LengthRemaining.
+ * limited to cbInitialBuf - RxContext->Info.LengthRemaining.
  */
 NTSTATUS VBoxMRxQueryVolumeInfo(IN OUT PRX_CONTEXT RxContext)
@@ -1012 +1013 @@
     };
 #endif
-
-    NTSTATUS Status;
-
     RxCaptureFcb;
     RxCaptureFobx;
-
     PMRX_VBOX_NETROOT_EXTENSION pNetRootExtension = VBoxMRxGetNetRootExtension(capFcb->pNetRoot);
-    PMRX_VBOX_FOBX pVBoxFobx = VBoxMRxGetFileObjectExtension(capFobx);
-
-    Log(("VBOXSF: MrxQueryVolumeInfo: pInfoBuffer = %p, cbInfoBuffer = %d\n",
+    PMRX_VBOX_FOBX              pVBoxFobx         = VBoxMRxGetFileObjectExtension(capFobx);
+    NTSTATUS                    Status;
+
+    Log(("VBOXSF: VBoxMRxQueryVolumeInfo: pInfoBuffer = %p, cbInfoBuffer = %d\n",
          RxContext->Info.Buffer, RxContext->Info.LengthRemaining));
-    Log(("VBOXSF: MrxQueryVolumeInfo: vboxFobx = %p, Handle = 0x%RX64\n",
+    Log(("VBOXSF: VBoxMRxQueryVolumeInfo: vboxFobx = %p, Handle = 0x%RX64\n",
          pVBoxFobx, pVBoxFobx ? pVBoxFobx->hFile : 0));
 
-/** @todo Consolidate the tail code that updates LengthRemaining. */
     switch (RxContext->Info.FsInformationClass)
     {
@@ -1035 +1032 @@
                                              RxContext->Info.Length, capFcb->pNetRoot, pNetRootExtension, pVBoxFobx,
                                              VBoxMRxGetFcbExtension(capFcb));
-            return Status;
+            break;
 
         case FileFsSizeInformation:
@@ -1043 +1040 @@
                                            RxContext->Info.Length, pNetRootExtension, pVBoxFobx,
                                            VBoxMRxGetFcbExtension(capFcb));
-            return Status;
+            break;
 
         case FileFsFullSizeInformation:
@@ -1051 +1048 @@
                                                RxContext->Info.Length, pNetRootExtension, pVBoxFobx,
                                                VBoxMRxGetFcbExtension(capFcb));
-            return Status;
+            break;
 
         case FileFsDeviceInformation:
@@ -1058 +1055 @@
             Status = vbsfNtQueryFsDeviceInfo(RxContext, (PFILE_FS_DEVICE_INFORMATION)RxContext->Info.Buffer,
                                              RxContext->Info.Length, capFcb->pNetRoot);
-            return Status;
+            break;
 
         case FileFsAttributeInformation:
@@ -1066 +1063 @@
                                                 RxContext->Info.Length, pNetRootExtension, pVBoxFobx,
                                                 VBoxMRxGetFcbExtension(capFcb));
-            return Status;
+            break;
 
         case FileFsSectorSizeInformation:
@@ -1074 +1071 @@
                                                  RxContext->Info.Length, pNetRootExtension, pVBoxFobx,
                                                  VBoxMRxGetFcbExtension(capFcb));
-            return Status;
+            break;
 
         case FileFsLabelInformation:
@@ -1080 +1077 @@
             RT_FALL_THRU();
         default:
-        {
-            Log(("VBOXSF: MrxQueryVolumeInfo: Not supported FS_INFORMATION_CLASS value: %d (%s)!\n",
+            Log(("VBOXSF: VBoxMRxQueryVolumeInfo: Not supported FS_INFORMATION_CLASS value: %d (%s)!\n",
                  RxContext->Info.FsInformationClass,
                  (ULONG)RxContext->Info.FsInformationClass < RT_ELEMENTS(s_apszNames)
                  ? s_apszNames[RxContext->Info.FsInformationClass] : "??"));
-            /* Here is a weird issue I couldn't quite figure out.  When working directories, I
-               seem to get semi-random stuff back in the IO_STATUS_BLOCK.  Difference between
-               directories and files seemed to be the IRP_SYNCHRONOUS_API flag.  Poking around
-               a little bit more, the UserIosb seems to be a ring-0 stack address rather than
-               the usermode one and IopSynchronousApiServiceTail being used for copying it back
-               to user mode because the handle wasn't synchronous or something.
-
-               So, the following is kludge to make the IOS values 0,0 like FAT does it.  The
-               real fix for this escapes me, but this should do the trick... */
-            PIRP pIrp = RxContext->CurrentIrp;
-            if (   pIrp
-                && (pIrp->Flags & IRP_SYNCHRONOUS_API)
-                && RTR0MemKernelIsValidAddr(pIrp->UserIosb))
-            {
-                Log9(("VBOXSF: MrxQueryVolumeInfo: IRP_SYNCHRONOUS_API hack: Setting UserIosb (%p) values to zero!\n", \
-                      pIrp->UserIosb));
-                __try
-                {
-                    pIrp->UserIosb->Status      = 0;
-                    pIrp->UserIosb->Information = 0;
-                }
-                __except(EXCEPTION_EXECUTE_HANDLER)
-                {
+            Status = STATUS_INVALID_PARAMETER;
+            RxContext->InformationToReturn = 0;
+            break;
+    }
+
+    /* Here is a weird issue I couldn't quite figure out.  When working directories, I
+       seem to get semi-random stuff back in the IO_STATUS_BLOCK when returning failures
+       for unsupported classes.  The difference between directories and files seemed to
+       be the IRP_SYNCHRONOUS_API flag.  Poking around a little bit more, the UserIosb
+       seems to be a ring-0 stack address rather than the usermode one and
+       IopSynchronousApiServiceTail being used for copying it back to user mode because
+       the handle wasn't synchronous or something.
+
+       So, the following is kludge to make the IOS values 0,0 like FAT does it.  The
+       real fix for this escapes me, but this should do the trick for now... */
+    PIRP pIrp = RxContext->CurrentIrp;
+    if (   pIrp
+        && (pIrp->Flags & IRP_SYNCHRONOUS_API)
+        && RTR0MemKernelIsValidAddr(pIrp->UserIosb))
+    {
+        Log2(("VBOXSF: VBoxMRxQueryVolumeInfo: IRP_SYNCHRONOUS_API hack: Setting UserIosb (%p) values!\n", pIrp->UserIosb));
+        __try
+        {
+            pIrp->UserIosb->Status      = 0;
+            pIrp->UserIosb->Information = RxContext->InformationToReturn;
+        }
+        __except(EXCEPTION_EXECUTE_HANDLER)
+        {
 #ifdef LOG_ENABLED
-                    NTSTATUS rcNt = GetExceptionCode();
-                    Log(("VBOXSF: MrxQueryVolumeInfo: Oops %#x accessing %p\n", rcNt, pIrp->UserIosb));
+            NTSTATUS rcNt = GetExceptionCode();
+            Log(("VBOXSF: VBoxMRxQueryVolumeInfo: Oops %#x accessing %p\n", rcNt, pIrp->UserIosb));
 #endif
-                }
-            }
-            return STATUS_INVALID_PARAMETER;
-        }
-    }
+        }
+    }
+    Log(("VBOXSF: VBoxMRxQueryVolumeInfo: Returned %#010x\n", Status));
+    return Status;
 }