Remove several patches (accepted upstream).

This commit is contained in:
Sebastian Lackner
2014-09-29 23:08:35 +02:00
parent b4642f5151
commit e8107fe104
6 changed files with 12 additions and 86 deletions

View File

@ -1,41 +0,0 @@
From a4e0737b05a26a85215c06c5c9fe615353540e50 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 13 Sep 2014 01:35:08 +0200
Subject: kernel32: Ignore FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW.
---
dlls/kernel32/file.c | 3 +++
include/winbase.h | 3 +++
2 files changed, 6 insertions(+)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 412659b..b277fb9 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -1859,6 +1859,9 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level,
TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags);
+ /* ignore FIND_FIRST_EX_LARGE_FETCH, only a hint for performance optimization */
+ flags &= ~FIND_FIRST_EX_LARGE_FETCH;
+
if ((search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories)
|| flags != 0)
{
diff --git a/include/winbase.h b/include/winbase.h
index dd5e816..edd6ad6 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -289,6 +289,9 @@ typedef enum _FINDEX_INFO_LEVELS
FindExInfoMaxInfoLevel
} FINDEX_INFO_LEVELS;
+#define FIND_FIRST_EX_CASE_SENSITIVE 1
+#define FIND_FIRST_EX_LARGE_FETCH 2
+
typedef enum _FINDEX_SEARCH_OPS
{
FindExSearchNameMatch,
--
2.1.0

View File

@ -1,34 +1,13 @@
From 071f61cb5e78d5565e9bb0d28f61000423b46cd4 Mon Sep 17 00:00:00 2001
From 5c46447e0d8042755e05574ee234a2c9d50aa128 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 25 Sep 2014 03:08:19 +0200
Subject: kernel32: Ignore FIND_FIRST_EX_CASE_SENSITIVE flag in
Subject: kernel32/tests: Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in
FindFirstFileExW.
---
dlls/kernel32/file.c | 9 ++++++++-
dlls/kernel32/tests/file.c | 36 ++++++++++++++++++++++++------------
2 files changed, 32 insertions(+), 13 deletions(-)
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 2bd7a4e..dc4c9d5 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -1866,7 +1866,14 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level,
TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags);
/* ignore FIND_FIRST_EX_LARGE_FETCH, only a hint for performance optimization */
- flags &= ~FIND_FIRST_EX_LARGE_FETCH;
+
+ /* ignore FIND_FIRST_EX_CASE_SENSITIVE. Note: This is not completely correct.
+ * The correct solution would be to pass attr.Attributes = 0 to NtOpenFile. Nevertheless
+ * this doesn't match Windows behaviour. It seems to depend on the file system and special
+ * registry settings, if it has any effect or not. So just ignore it for now, since
+ * this is the way Windows behaves by default. */
+
+ flags &= ~(FIND_FIRST_EX_LARGE_FETCH | FIND_FIRST_EX_CASE_SENSITIVE);
if ((search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories)
|| flags != 0)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index ddfa019..e6f96d4 100644
--- a/dlls/kernel32/tests/file.c
@ -108,5 +87,5 @@ index ddfa019..e6f96d4 100644
test_file_sharing();
test_offset_in_overlapped_structure();
--
2.1.0
2.1.1

View File

@ -1,9 +1,3 @@
Author: Sebastian Lackner
Subject: Ignore FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW.
Subject: Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW.
Revision: 1
Fixes: [35121] Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW
Author: Sebastian Lackner
Subject: Ignore FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW.
Revision: 1
Fixes: Support for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW