forked from wangwenx190/qtbase
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement fetching physical QStorageInfo::blockSize() under Windows
This is implemented in two passes, first we try the older and always available DeviceIoControl() function. This works most of the time, though it might fail for example for storage devices attached via USB. In this case, we try to dynamically load the newer NtQueryVolumeInformationFile kernel function. Since this is probably more expensive, we do this as fallback. [ChangeLog][QtCore][QStorageInfo] The QStorageInfo::blockSize() will now report the physical block size of a storage device under Windows. Network mapped drives are not supported. Fixes: QTBUG-93976 Change-Id: I08b5b879e5bf79c025e2e305196ec5c5fce8b20f Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
- Loading branch information
Showing
4 changed files
with
240 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
/**************************************************************************** | ||
** | ||
** Copyright (C) 2021 The Qt Company Ltd. | ||
** Contact: https://www.qt.io/licensing/ | ||
** | ||
** This file is part of the QtCore module of the Qt Toolkit. | ||
** | ||
** $QT_BEGIN_LICENSE:LGPL$ | ||
** Commercial License Usage | ||
** Licensees holding valid commercial Qt licenses may use this file in | ||
** accordance with the commercial license agreement provided with the | ||
** Software or, alternatively, in accordance with the terms contained in | ||
** a written agreement between you and The Qt Company. For licensing terms | ||
** and conditions see https://www.qt.io/terms-conditions. For further | ||
** information use the contact form at https://www.qt.io/contact-us. | ||
** | ||
** GNU Lesser General Public License Usage | ||
** Alternatively, this file may be used under the terms of the GNU Lesser | ||
** General Public License version 3 as published by the Free Software | ||
** Foundation and appearing in the file LICENSE.LGPL3 included in the | ||
** packaging of this file. Please review the following information to | ||
** ensure the GNU Lesser General Public License version 3 requirements | ||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. | ||
** | ||
** GNU General Public License Usage | ||
** Alternatively, this file may be used under the terms of the GNU | ||
** General Public License version 2.0 or (at your option) the GNU General | ||
** Public license version 3 or any later version approved by the KDE Free | ||
** Qt Foundation. The licenses are as published by the Free Software | ||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 | ||
** included in the packaging of this file. Please review the following | ||
** information to ensure the GNU General Public License requirements will | ||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and | ||
** https://www.gnu.org/licenses/gpl-3.0.html. | ||
** | ||
** $QT_END_LICENSE$ | ||
** | ||
****************************************************************************/ | ||
|
||
#ifndef QNTDLL_P_H | ||
#define QNTDLL_P_H | ||
|
||
// | ||
// W A R N I N G | ||
// ------------- | ||
// | ||
// This file is not part of the Qt API. It exists purely as an | ||
// implementation detail. This header file may change from version to | ||
// version without notice, or even be removed. | ||
// | ||
// We mean it. | ||
// | ||
|
||
#include <winternl.h> | ||
|
||
QT_BEGIN_NAMESPACE | ||
|
||
// keep the following structure as is, taken from | ||
// https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/ntddk/ns-ntddk-_file_fs_sector_size_information | ||
// Unfortunately we can't include the ntddk.h header, so we duplicate the code here. | ||
typedef struct _FILE_FS_SECTOR_SIZE_INFORMATION { | ||
ULONG LogicalBytesPerSector; | ||
ULONG PhysicalBytesPerSectorForAtomicity; | ||
ULONG PhysicalBytesPerSectorForPerformance; | ||
ULONG FileSystemEffectivePhysicalBytesPerSectorForAtomicity; | ||
ULONG Flags; | ||
ULONG ByteOffsetForSectorAlignment; | ||
ULONG ByteOffsetForPartitionAlignment; | ||
} FILE_FS_SECTOR_SIZE_INFORMATION, *PFILE_FS_SECTOR_SIZE_INFORMATION; | ||
|
||
#if !defined(Q_CC_CLANG) && !defined(Q_CC_MINGW) | ||
// keep the following enumeration as is, taken from | ||
// https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ne-wdm-_fsinfoclass | ||
// Unfortunately we can't include the wdm.h header, so we duplicate the code here. | ||
typedef enum _FSINFOCLASS { | ||
FileFsVolumeInformation, | ||
FileFsLabelInformation, | ||
FileFsSizeInformation, | ||
FileFsDeviceInformation, | ||
FileFsAttributeInformation, | ||
FileFsControlInformation, | ||
FileFsFullSizeInformation, | ||
FileFsObjectIdInformation, | ||
FileFsDriverPathInformation, | ||
FileFsVolumeFlagsInformation, | ||
FileFsSectorSizeInformation, | ||
FileFsDataCopyInformation, | ||
FileFsMetadataSizeInformation, | ||
FileFsFullSizeInformationEx, | ||
FileFsMaximumInformation | ||
} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; | ||
#endif | ||
|
||
QT_END_NAMESPACE | ||
|
||
#endif // QNTDLL_P_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters