wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor style improvements in multiple patches.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-06-11 19:19:47 +02:00
parent 2672e6b4c5
commit 531ca00756
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch
View File

@@ -1,4 +1,4 @@
From 1914529dbe74c405c9ab0a947b8b065286ebc8a2 Mon Sep 17 00:00:00 2001
From a735fc035bb548fb1d452fc8e1772bd4c3296097 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Jun 2015 07:03:33 +0800
Subject: ntdll: Improve stub of NtQueryEaFile.
@@ -10,7 +10,7 @@ Based on a patch by Qian Hong.
2 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index d081750..8503dd8 100644
index d081750..6b8f0e4 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3191,14 +3191,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@@ -36,7 +36,7 @@ index d081750..8503dd8 100644
+ return status;
+
+ if (buffer && length)
+ memset(buffer, 0, length);
+ memset( buffer, 0, length );
+
+ if (needs_close) close( fd );
+ return STATUS_NO_EAS_ON_FILE;
@@ -44,7 +44,7 @@ index d081750..8503dd8 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 2df0edc..3696124 100644
index 86a4516..4bf5f23 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -78,6 +78,7 @@ static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOI
@@ -55,7 +55,7 @@ index 2df0edc..3696124 100644
static inline BOOL is_signaled( HANDLE obj )
{
@@ -2785,6 +2786,86 @@ static void test_read_write(void)
@@ -2802,6 +2803,86 @@ static void test_read_write(void)
CloseHandle(hfile);
}
@@ -126,7 +126,7 @@ index 2df0edc..3696124 100644
+ U(io).Status = 0xdeadbeef;
+ io.Information = 0xdeadbeef;
+ memset(buffer, 0xcc, EA_BUFFER_SIZE);
+ buffer_len = 4096;
+ buffer_len = EA_BUFFER_SIZE - 1;
+ status = pNtQueryEaFile(handle, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE);
+ ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %x\n", status);
+ ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", U(io).Status);
@@ -142,7 +142,7 @@ index 2df0edc..3696124 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -2820,6 +2901,7 @@ START_TEST(file)
@@ -2837,6 +2918,7 @@ START_TEST(file)
pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile");
pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
@@ -150,7 +150,7 @@ index 2df0edc..3696124 100644
test_read_write();
test_NtCreateFile();
@@ -2839,4 +2921,5 @@ START_TEST(file)
@@ -2856,4 +2938,5 @@ START_TEST(file)
test_file_disposition_information();
test_query_volume_information_file();
test_query_attribute_information_file();