Zebediah Figura : include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.
Alexandre Julliard
julliard at winehq.org
Thu Mar 26 16:27:23 CDT 2020
Module: wine
Branch: master
Commit: 97e88a56bce95417a49bb60176680284d75c97f3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e88a56bce95417a49bb60176680284d75c97f3
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Mar 25 18:15:19 2020 -0500
include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/file.c | 6 +++---
dlls/ntdll/tests/file.c | 6 +++---
include/winioctl.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 1a5f86d7c2..bd27d5a434 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3248,9 +3248,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
FILE_FS_ATTRIBUTE_INFORMATION *info = buffer;
FIXME( "%p: faking attribute info\n", handle );
- info->FileSystemAttribute = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION |
- FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK |
- FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH;
+ info->FileSystemAttributes = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION |
+ FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK |
+ FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH;
info->MaximumComponentNameLength = MAXIMUM_FILENAME_LENGTH - 1;
info->FileSystemNameLength = sizeof(ntfsW);
memcpy(info->FileSystemName, ntfsW, sizeof(ntfsW));
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 75a67e8095..546795456a 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -3955,12 +3955,12 @@ static void test_query_attribute_information_file(void)
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status);
ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status);
- ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n");
+ ok(ffai->FileSystemAttributes != 0, "Missing FileSystemAttributes\n");
ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n");
ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n");
- trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n",
- ffai->FileSystemAttribute, ffai->MaximumComponentNameLength,
+ trace("FileSystemAttributes: %x MaximumComponentNameLength: %x FileSystemName: %s\n",
+ ffai->FileSystemAttributes, ffai->MaximumComponentNameLength,
wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR)));
CloseHandle( dir );
diff --git a/include/winioctl.h b/include/winioctl.h
index 7699579183..076ce9d7a8 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -434,7 +434,7 @@ typedef struct _FILE_FS_DEVICE_INFORMATION {
/* FileFsAttributeInformation = 5 */
typedef struct _FILE_FS_ATTRIBUTE_INFORMATION {
- ULONG FileSystemAttribute;
+ ULONG FileSystemAttributes;
LONG MaximumComponentNameLength;
ULONG FileSystemNameLength;
WCHAR FileSystemName[1];
More information about the wine-cvs
mailing list