[PATCH] include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 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 9e4af2fd0ca..2f5f61c7cfe 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3245,9 +3245,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 c05dba574f7..d49355ae345 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -3924,12 +3924,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 76995791830..076ce9d7a82 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];

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=68135

Your paranoid android.

=== w8 (32 bit report) ===

ntdll:
file.c:749: Test failed: Wrong status deadbabe.
file.c:750: Test failed: Wrong info 3735928559.
file.c:751: Test failed: event is not signaled.
file.c:754: Test failed: apc was not called.