Added patch to implement FileFsFullSizeInformation information class.

README.md

@@ -39,6 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
+**Bug fixes and features included in the next upcoming release [1]:**
+
+* Support for FileFsFullSizeInformation information class
+
+
 **Bug fixes and features in Wine Staging 1.7.41 [218]:**
 
 *Note: The following list only contains features and bug fixes which are not

debian/changelog

@@ -1,4 +1,5 @@
 wine-staging (1.7.42) UNRELEASED; urgency=low
+  * Added patch to implement FileFsFullSizeInformation information class.
   * Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).
   * Removed patch for stub of ntdll.WinSqmIsOptedIn (fixed upstream).
   * Removed patch to fix issues with invalid console handles for new processes (accepted upstream). 

patches/ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch

@@ -0,0 +1,116 @@
+From 2703e7fa48675a6ab553c98fbe87e8cb6c171bbe Mon Sep 17 00:00:00 2001
+From: Jianqiu Zhang <zhangjianqiu_133@yeah.net>
+Date: Fri, 17 Apr 2015 14:33:41 +0800
+Subject: ntdll: Add support for FileFsFullSizeInformation class in
+ NtQueryVolumeInformationFile(try 2)
+
+---
+ dlls/ntdll/file.c       | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/ntdll/tests/file.c |  8 +-------
+ 2 files changed, 54 insertions(+), 8 deletions(-)
+
+diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
+index 0dc5c13..f0e1c91 100644
+--- a/dlls/ntdll/file.c
++++ b/dlls/ntdll/file.c
+@@ -3047,7 +3047,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
+         FIXME( "%p: control info not supported\n", handle );
+         break;
+     case FileFsFullSizeInformation:
+-        FIXME( "%p: full size info not supported\n", handle );
++        if(length < sizeof(FILE_FS_FULL_SIZE_INFORMATION))
++            io->u.Status = STATUS_BUFFER_TOO_SMALL;
++        else
++        {
++            FILE_FS_FULL_SIZE_INFORMATION *info = buffer;
++
++            if (fstat( fd, &st ) < 0)
++            {
++                io->u.Status = FILE_GetNtStatus();
++                break;
++            }
++            if(!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
++            {
++                io->u.Status = STATUS_INVALID_DEVICE_REQUEST;
++            }
++            else
++            {
++                ULONGLONG bsize;
++#if !defined(linux) || !defined(HAVE_FSTATFS)
++                struct statvfs stfs;
++
++                if(fstatvfs( fd, &stfs ) < 0)
++                {
++                    io->u.Status = FILE_GetNtStatus();
++                    break;
++                }
++                bsize = stfs.f_frsize;
++#else
++                struct statfs stfs;
++                if(fstatfs( fd, &stfs ) < 0)
++                {
++                    io->u.Status = FILE_GetNtStatus();
++                    break;
++                }
++                bsize = stfs.f_bsize;
++#endif
++                if(bsize == 2048)   /* assume CD-ROM */
++                {
++                    info->BytesPerSector = 2048;
++                    info->SectorsPerAllocationUnit = 1;
++                }
++                else
++                {
++                    info->BytesPerSector = 512;
++                    info->SectorsPerAllocationUnit = 8;
++                }
++                info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit);
++                info->CallerAvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit);
++                info->ActualAvailableAllocationUnits.QuadPart = bsize * stfs.f_bfree / (info->BytesPerSector * info->SectorsPerAllocationUnit);
++                io->Information = sizeof(*info);
++                io->u.Status = STATUS_SUCCESS;
++            }
++        }
+         break;
+     case FileFsObjectIdInformation:
+         FIXME( "%p: object id info not supported\n", handle );
+diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
+index c02c926..f96a7ff 100644
+--- a/dlls/ntdll/tests/file.c
++++ b/dlls/ntdll/tests/file.c
+@@ -1230,7 +1230,7 @@ static void test_file_full_size_information(void)
+ 
+     /* Assume No Quota Settings configured on Wine Testbot */
+     res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation);
+-    todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res);
++    ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res);
+     res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation);
+     ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res);
+ 
+@@ -1246,8 +1246,6 @@ static void test_file_full_size_information(void)
+     ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector);
+     ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit);
+ 
+-    todo_wine
+-    {
+     ok(ffsi.TotalAllocationUnits.QuadPart > 0,
+         "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n",
+         debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart));
+@@ -1265,14 +1263,10 @@ static void test_file_full_size_information(void)
+         "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n",
+         debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart),
+         debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart));
+-    }
+ 
+     /* Assume file system is NTFS */
+-    todo_wine
+-    {
+     ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector);
+     ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit);
+-    }
+ 
+     CloseHandle( h );
+ }
+-- 
+2.3.5
+

patches/ntdll-FileFsFullSizeInformation/definition

@@ -0,0 +1 @@
+Fixes: Support for FileFsFullSizeInformation information class

patches/patchinstall.sh

@@ -145,6 +145,7 @@ patch_enable_all ()
 	enable_ntdll_Exception="$1"
 	enable_ntdll_FD_Cache="$1"
 	enable_ntdll_FileDispositionInformation="$1"
+	enable_ntdll_FileFsFullSizeInformation="$1"
 	enable_ntdll_Fix_Alignment="$1"
 	enable_ntdll_Fix_Free="$1"
 	enable_ntdll_Heap_FreeLists="$1"
@@ -509,6 +510,9 @@ patch_enable ()
 		ntdll-FileDispositionInformation)
 			enable_ntdll_FileDispositionInformation="$2"
 			;;
+		ntdll-FileFsFullSizeInformation)
+			enable_ntdll_FileFsFullSizeInformation="$2"
+			;;
 		ntdll-Fix_Alignment)
 			enable_ntdll_Fix_Alignment="$2"
 			;;
@@ -3237,6 +3241,18 @@ if test "$enable_ntdll_FD_Cache" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset ntdll-FileFsFullSizeInformation
+# |
+# | Modified files:
+# |   *	dlls/ntdll/file.c, dlls/ntdll/tests/file.c
+# |
+if test "$enable_ntdll_FileFsFullSizeInformation" -eq 1; then
+	patch_apply ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch
+	(
+		echo '+    { "Jianqiu Zhang", "ntdll: Add support for FileFsFullSizeInformation class in NtQueryVolumeInformationFile.", 2 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-Fix_Alignment
 # |
 # | This patchset fixes the following Wine bugs: