mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Remove several patches (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
b4642f5151
commit
e8107fe104
@ -35,7 +35,7 @@ Wine. All those differences are also documented on the
|
||||
Included bugfixes and improvements
|
||||
==================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [10]:**
|
||||
**Bugfixes and features included in the next upcoming release [9]:**
|
||||
|
||||
* Correctly treat '.' when checking for empty directories ([Wine Bug #26272](http://bugs.winehq.org/show_bug.cgi?id=26272))
|
||||
* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](http://bugs.winehq.org/show_bug.cgi?id=11436))
|
||||
@ -43,7 +43,6 @@ Included bugfixes and improvements
|
||||
* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155))
|
||||
* Limit cross thread access to ImmSet* functions ([Wine Bug #35361](http://bugs.winehq.org/show_bug.cgi?id=35361))
|
||||
* Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652))
|
||||
* Support for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW
|
||||
* Support for IRichEditOle and ITextDocument support for ITextServices. ([Wine Bug #17042](http://bugs.winehq.org/show_bug.cgi?id=17042))
|
||||
* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](http://bugs.winehq.org/show_bug.cgi?id=36964))
|
||||
* Update a XIM candidate position when cursor location changes ([Wine Bug #30938](http://bugs.winehq.org/show_bug.cgi?id=30938))
|
||||
@ -87,7 +86,7 @@ Included bugfixes and improvements
|
||||
* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372))
|
||||
* Support for DOS hidden/system file attributes ([Wine Bug #9158](http://bugs.winehq.org/show_bug.cgi?id=9158))
|
||||
* Support for Dynamic DST (daylight saving time) information in registry
|
||||
* Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW ([Wine Bug #35121](http://bugs.winehq.org/show_bug.cgi?id=35121))
|
||||
* ~~Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW~~ ([Wine Bug #35121](http://bugs.winehq.org/show_bug.cgi?id=35121))
|
||||
* Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073))
|
||||
* Support for GetSystemTimes ([Wine Bug #19813](http://bugs.winehq.org/show_bug.cgi?id=19813))
|
||||
* Support for GetVolumePathName
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -10,6 +10,7 @@ wine-compholio (1.7.28) UNRELEASED; urgency=low
|
||||
* Added patch to export ?_BADOFF@std@@3_JB on both i386 and win64.
|
||||
* Added patch to limit cross thread access to ImmSet* functions.
|
||||
* Added patch for IRichEditOle and ITextDocument support for ITextServices.
|
||||
* Removed patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 21 Sep 2014 01:44:14 +0200
|
||||
|
||||
wine-compholio (1.7.27) unstable; urgency=low
|
||||
|
||||
@ -383,22 +383,16 @@ iphlpapi-TCP_Table.ok:
|
||||
# Patchset kernel32-FindFirstFile
|
||||
# |
|
||||
# | Included patches:
|
||||
# | * Ignore FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW. [by Sebastian Lackner]
|
||||
# | * Ignore FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW. [by Sebastian Lackner]
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#35121] Support for FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW
|
||||
# | * Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW. [by Sebastian Lackner]
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/file.c, dlls/kernel32/tests/file.c, include/winbase.h
|
||||
# | * dlls/kernel32/tests/file.c
|
||||
# |
|
||||
.INTERMEDIATE: kernel32-FindFirstFile.ok
|
||||
kernel32-FindFirstFile.ok:
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0001-kernel32-Ignore-FIND_FIRST_EX_LARGE_FETCH-flag-in-Fi.patch)
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0002-kernel32-Ignore-FIND_FIRST_EX_CASE_SENSITIVE-flag-in.patch)
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0001-kernel32-tests-Add-tests-for-FIND_FIRST_EX_CASE_SENS.patch)
|
||||
@( \
|
||||
echo '+ { "kernel32-FindFirstFile", "Sebastian Lackner", "Ignore FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW." },'; \
|
||||
echo '+ { "kernel32-FindFirstFile", "Sebastian Lackner", "Ignore FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW." },'; \
|
||||
echo '+ { "kernel32-FindFirstFile", "Sebastian Lackner", "Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW." },'; \
|
||||
) > kernel32-FindFirstFile.ok
|
||||
|
||||
# Patchset kernel32-GetFinalPathNameByHandle
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user