Changeset 76385 in vbox for trunk

Timestamp:

Dec 23, 2018 1:01:58 AM (6 years ago)

Author:

vboxsync

Message:

DrvHostBase-win.cpp,iprt/nt/nt.h: Use nt-and-windows.h and add FILE_FS_SIZE_INFORMATION to nt.h, then we don't have to carry all those stupid+outdated header workarounds with us.

Location:

trunk

Files:

• include/iprt/nt/nt.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvHostBase-win.cpp (modified) (2 diffs)

trunk/include/iprt/nt/nt.h

@@ -1562 +1562 @@
 
 #ifdef IPRT_NT_USE_WINTERNL
+typedef struct _FILE_FS_SIZE_INFORMATION
+{
+    LARGE_INTEGER   TotalAllocationUnits;
+    LARGE_INTEGER   AvailableAllocationUnits;
+    ULONG           SectorsPerAllocationUnit;
+    ULONG           BytesPerSector;
+} FILE_FS_SIZE_INFORMATION;
+typedef FILE_FS_SIZE_INFORMATION *PFILE_FS_SIZE_INFORMATION;
+
 typedef enum _FSINFOCLASS
 {
     FileFsVolumeInformation = 1,
     FileFsLabelInformation,
-    FileFsSizeInformation,
+    FileFsSizeInformation,          /**< FILE_FS_SIZE_INFORMATION */
     FileFsDeviceInformation,
     FileFsAttributeInformation,

trunk/src/VBox/Devices/Storage/DrvHostBase-win.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
-#pragma warning(disable : 4163)
-#define _interlockedbittestandset      they_messed_it_up_in_winnt_h_this_time_sigh__interlockedbittestandset
-#define _interlockedbittestandreset    they_messed_it_up_in_winnt_h_this_time_sigh__interlockedbittestandreset
-#define _interlockedbittestandset64    they_messed_it_up_in_winnt_h_this_time_sigh__interlockedbittestandset64
-#define _interlockedbittestandreset64  they_messed_it_up_in_winnt_h_this_time_sigh__interlockedbittestandreset64
-
-#define WIN32_NO_STATUS
-#include <iprt/win/windows.h>
+#include <iprt/nt/nt-and-windows.h>
 #include <dbt.h>
-#undef WIN32_NO_STATUS
-
-#include <winioctl.h>
 #include <ntddscsi.h>
-#pragma warning(default : 4163)
-#undef _interlockedbittestandset
-#undef _interlockedbittestandreset
-#undef _interlockedbittestandset64
-#undef _interlockedbittestandreset64
-#include <ntstatus.h>
-
-/* from ntdef.h */
-typedef LONG NTSTATUS;
-
-/* from ntddk.h */
-typedef struct _IO_STATUS_BLOCK {
-    union {
-        NTSTATUS Status;
-        PVOID Pointer;
-    };
-    ULONG_PTR Information;
-} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
-
-
-/* from ntinternals.com */
-typedef enum _FS_INFORMATION_CLASS {
-    FileFsVolumeInformation=1,
-    FileFsLabelInformation,
-    FileFsSizeInformation,
-    FileFsDeviceInformation,
-    FileFsAttributeInformation,
-    FileFsControlInformation,
-    FileFsFullSizeInformation,
-    FileFsObjectIdInformation,
-    FileFsMaximumInformation
-} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
-
-typedef struct _FILE_FS_SIZE_INFORMATION {
-    LARGE_INTEGER   TotalAllocationUnits;
-    LARGE_INTEGER   AvailableAllocationUnits;
-    ULONG           SectorsPerAllocationUnit;
-    ULONG           BytesPerSector;
-} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION;
-
-extern "C"
-NTSTATUS __stdcall NtQueryVolumeInformationFile(
-        /*IN*/ HANDLE               FileHandle,
-        /*OUT*/ PIO_STATUS_BLOCK    IoStatusBlock,
-        /*OUT*/ PVOID               FileSystemInformation,
-        /*IN*/ ULONG                Length,
-        /*IN*/ FS_INFORMATION_CLASS FileSystemInformationClass );
 
 #include <iprt/ctype.h>
@@ -362 +305 @@
         /* use NT api, retry a few times if the media is being verified. */
         IO_STATUS_BLOCK             IoStatusBlock = {0};
-        FILE_FS_SIZE_INFORMATION    FsSize= {0};
+        FILE_FS_SIZE_INFORMATION    FsSize = {0};
         NTSTATUS rcNt = NtQueryVolumeInformationFile((HANDLE)RTFileToNative(pThis->Os.hFileDevice),  &IoStatusBlock,
                                                      &FsSize, sizeof(FsSize), FileFsSizeInformation);