kernel32-FindFirstFile: Remove patch (accepted upstream), update changelog.

debian/changelog

@@ -11,6 +11,7 @@ wine-compholio (1.7.28) UNRELEASED; urgency=low
   * Added patch to limit cross thread access to ImmSet* functions.
   * Added patch for IRichEditOle and ITextDocument support for ITextServices.
   * Added patch to fix implementation of SH*Shared commands.
+  * Added patch to handle WRITECOPY memory protection properly on i386.
   * Added patches to make clearly visible, that this is a patched wine version.
   * Removed patch to support FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW (accepted upstream).
   * Removed patch to fix implementation of SH*Shared commands (accepted upstream).

patches/Makefile

@@ -32,7 +32,6 @@ PATCHLIST := \
 	fonts-Missing_Fonts.ok \
 	imm32-Cross_Thread_Access.ok \
 	iphlpapi-TCP_Table.ok \
-	kernel32-FindFirstFile.ok \
 	kernel32-GetFinalPathNameByHandle.ok \
 	kernel32-GetSystemTimes.ok \
 	kernel32-GetVolumePathName.ok \
@@ -405,21 +404,6 @@ iphlpapi-TCP_Table.ok:
 		echo '+    { "iphlpapi-TCP_Table", "Erich E. Hoover", "Implement AllocateAndGetTcpExTableFromStack." },'; \
 	) > iphlpapi-TCP_Table.ok
 
-# Patchset kernel32-FindFirstFile
-# |
-# | Included patches:
-# |   *	Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW. [by Sebastian Lackner]
-# |
-# | Modified files:
-# |   *	dlls/kernel32/tests/file.c, include/winbase.h
-# |
-.INTERMEDIATE: kernel32-FindFirstFile.ok
-kernel32-FindFirstFile.ok:
-	$(call APPLY_FILE,kernel32-FindFirstFile/0001-kernel32-tests-Add-tests-for-FIND_FIRST_EX_CASE_SENS.patch)
-	@( \
-		echo '+    { "kernel32-FindFirstFile", "Sebastian Lackner", "Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW." },'; \
-	) > kernel32-FindFirstFile.ok
-
 # Patchset kernel32-GetFinalPathNameByHandle
 # |
 # | Included patches:

patches/kernel32-FindFirstFile/0001-kernel32-tests-Add-tests-for-FIND_FIRST_EX_CASE_SENS.patch

@@ -1,106 +0,0 @@
-From 67d1f14b0f36270e245cdef779d1c409c094a6af 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/tests: Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in
- FindFirstFileExW.
-
----
- dlls/kernel32/tests/file.c | 36 ++++++++++++++++++++++++------------
- include/winbase.h          |  3 +++
- 2 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
-index ddfa019..e6f96d4 100644
---- a/dlls/kernel32/tests/file.c
-+++ b/dlls/kernel32/tests/file.c
-@@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void)
-     ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n");
- }
- 
--static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops)
-+static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags)
- {
-     WIN32_FIND_DATAA search_results;
-     HANDLE handle;
-@@ -2578,8 +2578,9 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops)
-     _lclose(_lcreat("test-dir\\file1", 0));
-     _lclose(_lcreat("test-dir\\file2", 0));
-     CreateDirectoryA("test-dir\\dir1", NULL);
-+
-     SetLastError(0xdeadbeef);
--    handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, 0);
-+    handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags);
-     if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
-     {
-         win_skip("FindFirstFileExA is not implemented\n");
-@@ -2603,22 +2604,31 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops)
-         skip("File system supports directory filtering\n");
-         /* Results from the previous call are not cleared */
-         ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName);
--        FindClose( handle );
--        goto cleanup;
-     }
-+    else
-+    {
-+        ok(ret, "Fetching fourth file failed\n");
-+        ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName);
- 
--    ok(ret, "Fetching fourth file failed\n");
--    ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName);
-+        ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n");
-+        ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName);
- 
--    ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n");
--    ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName);
-+        ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n");
-+    }
- 
- #undef CHECK_NAME
- 
--    ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n");
--
-     FindClose( handle );
- 
-+    /* The result of this tests depends on the Windows registry and the file system. On Wine we always simulate a system
-+     * where case-insensitivity is enforced, so the following call will succeed. */
-+    SetLastError(0xdeadbeef);
-+    handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags);
-+    ok(handle != INVALID_HANDLE_VALUE || (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND),
-+       "Unexpected error %x, expected valid handle or ERROR_PATH_NOT_FOUND\n", GetLastError());
-+    if (handle != INVALID_HANDLE_VALUE)
-+        FindClose( handle );
-+
- cleanup:
-     DeleteFileA("test-dir\\file1");
-     DeleteFileA("test-dir\\file2");
-@@ -4171,9 +4181,11 @@ START_TEST(file)
-     test_MoveFileW();
-     test_FindFirstFileA();
-     test_FindNextFileA();
--    test_FindFirstFileExA(0);
-+    test_FindFirstFileExA(0, 0);
-+    test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE);
-     /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */
--    test_FindFirstFileExA(FindExSearchLimitToDirectories);
-+    test_FindFirstFileExA(FindExSearchLimitToDirectories, 0);
-+    test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE);
-     test_LockFile();
-     test_file_sharing();
-     test_offset_in_overlapped_structure();
-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.1
-

patches/kernel32-FindFirstFile/definition

@@ -1,3 +0,0 @@
-Author: Sebastian Lackner
-Subject: Add tests for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW.
-Revision: 1