wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 287be7c5ee5ed4d070d93209c6cd355be6ed46da.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-07-08 22:37:18 +02:00
parent de4694c81b
commit 00969f9cd8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 2703e7fa48675a6ab553c98fbe87e8cb6c171bbe Mon Sep 17 00:00:00 2001
From 8cdd24c7d9aa7a007ffe437efc8d22f4413e4187 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
@ -10,10 +10,10 @@ Subject: ntdll: Add support for FileFsFullSizeInformation class in
2 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 0dc5c13..f0e1c91 100644
index 1cb34d3545d..0785e482be1 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3047,7 +3047,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -3374,7 +3374,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
FIXME( "%p: control info not supported\n", handle );
break;
case FileFsFullSizeInformation:
@ -75,10 +75,10 @@ index 0dc5c13..f0e1c91 100644
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
index 18b0e5d3921..aa0d8a47f5a 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)
@@ -1117,7 +1117,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);
@ -87,7 +87,7 @@ index c02c926..f96a7ff 100644
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)
@@ -1133,8 +1133,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);
@ -95,11 +95,11 @@ index c02c926..f96a7ff 100644
- {
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)
wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart));
@@ -1152,14 +1150,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));
wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart),
wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart));
- }
/* Assume file system is NTFS */
@ -112,5 +112,5 @@ index c02c926..f96a7ff 100644
CloseHandle( h );
}
--
2.3.5
2.13.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "7e1522cdd69587b59f97a3b3c755cef40a52070e"
echo "287be7c5ee5ed4d070d93209c6cd355be6ed46da"
}
# Show version information