[pkg-wine-party] [SCM] Debian Wine packaging branch, lenny, updated. wine-1.0.0-1-126-gccc5cbd
Alexandre Julliard
julliard at winehq.org
Thu Oct 30 14:44:10 UTC 2008
The following commit has been merged in the lenny branch:
commit b372ec2cbd0dfcd3ba86819af9c63b533bf5f451
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Sep 16 11:32:38 2008 +0200
ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS.
(cherry picked from commit b0192cfed382c470e67aaac744de56011fe27bfb)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 972d600..3c7fac5 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2221,6 +2221,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
}
else
{
+ ULONGLONG bsize;
/* Linux's fstatvfs is buggy */
#if !defined(linux) || !defined(HAVE_FSTATFS)
struct statvfs stfs;
@@ -2230,7 +2231,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
io->u.Status = FILE_GetNtStatus();
break;
}
- info->BytesPerSector = stfs.f_frsize;
+ bsize = stfs.f_frsize;
#else
struct statfs stfs;
if (fstatfs( fd, &stfs ) < 0)
@@ -2238,11 +2239,12 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
io->u.Status = FILE_GetNtStatus();
break;
}
- info->BytesPerSector = stfs.f_bsize;
+ bsize = stfs.f_bsize;
#endif
- info->TotalAllocationUnits.QuadPart = stfs.f_blocks;
- info->AvailableAllocationUnits.QuadPart = stfs.f_bavail;
- info->SectorsPerAllocationUnit = 1;
+ info->BytesPerSector = 512;
+ info->SectorsPerAllocationUnit = 8;
+ info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8);
+ info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8);
io->Information = sizeof(*info);
io->u.Status = STATUS_SUCCESS;
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list