Rebase against 2058505cebc7bb069e1e2d0d738353336e943b7b

patches/kernel32-MoveFile/0006-urlmon-tests-Add-test-for-opening-cache-file-with-DE.patch

@@ -1,48 +0,0 @@
-From d246bb6bbadaa959d49a29dc28d1288473ca8375 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 17 May 2017 11:58:20 +0200
-Subject: urlmon/tests: Add test for opening cache file with DELETE access.
-
----
- dlls/urlmon/tests/url.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
-index cd1d855032d..70234ff3fd7 100644
---- a/dlls/urlmon/tests/url.c
-+++ b/dlls/urlmon/tests/url.c
-@@ -182,6 +182,7 @@ static HRESULT abort_hres;
- static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot;
- static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort;
- static WCHAR cache_file_name[MAX_PATH];
-+static WCHAR http_cache_file[MAX_PATH];
- static BOOL only_check_prot_args = FALSE;
- static BOOL invalid_cn_accepted = FALSE;
- static BOOL abort_start = FALSE;
-@@ -1927,6 +1928,14 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES
-             ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" );
-     }
- 
-+    if(test_protocol == HTTP_TEST && !emulate_protocol && http_cache_file[0]) {
-+        HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_DELETE, NULL,
-+                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-+        ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got %p\n", file);
-+        ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError());
-+        http_cache_file[0] = 0;
-+    }
-+
-     return S_OK;
- }
- 
-@@ -2083,6 +2092,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
-         else if(emulate_protocol)
-             ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW),
-                "unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName));
-+        else if(test_protocol == HTTP_TEST)
-+            lstrcpyW(http_cache_file, pstgmed->u.lpszFileName);
-         else
-             ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n");
-     }
--- 
-2.12.2
-

patches/kernel32-MoveFile/0007-appwiz.cpl-Copy-addons-to-cache-instead-of-moving.patch

@@ -1,25 +0,0 @@
-From fcb6d21ede52ef770a04c59ea6bd5b9483c31f32 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 17 May 2017 12:03:15 +0200
-Subject: appwiz.cpl: Copy addons to cache instead of moving.
-
----
- dlls/appwiz.cpl/addons.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
-index c3847b54948..91cd485b026 100644
---- a/dlls/appwiz.cpl/addons.c
-+++ b/dlls/appwiz.cpl/addons.c
-@@ -510,7 +510,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
- 
-         cache_file_name = get_cache_file_name(TRUE);
-         if(cache_file_name) {
--            MoveFileW(msi_file, cache_file_name);
-+            CopyFileW(msi_file, cache_file_name, FALSE);
-             heap_free(cache_file_name);
-         }
-     }else {
--- 
-2.12.2
-

patches/kernel32-MoveFile/definition

@@ -1 +0,0 @@
-Fixes: [14901] MoveFile with source == dest should succeed.

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2d16e6e59c910ba0a5e7c1c104b290731a8f1ffa"
+	echo "2058505cebc7bb069e1e2d0d738353336e943b7b"
 }
 
 # Show version information
@@ -162,7 +162,6 @@ patch_enable_all ()
 	enable_kernel32_FindFirstFile="$1"
 	enable_kernel32_Job_Tests="$1"
 	enable_kernel32_K32GetPerformanceInfo="$1"
-	enable_kernel32_MoveFile="$1"
 	enable_kernel32_NeedCurrentDirectoryForExePath="$1"
 	enable_kernel32_NormalizeString="$1"
 	enable_kernel32_PE_Loader_Fixes="$1"
@@ -647,9 +646,6 @@ patch_enable ()
 		kernel32-K32GetPerformanceInfo)
 			enable_kernel32_K32GetPerformanceInfo="$2"
 			;;
-		kernel32-MoveFile)
-			enable_kernel32_MoveFile="$2"
-			;;
 		kernel32-NeedCurrentDirectoryForExePath)
 			enable_kernel32_NeedCurrentDirectoryForExePath="$2"
 			;;
@@ -3888,23 +3884,6 @@ if test "$enable_kernel32_K32GetPerformanceInfo" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset kernel32-MoveFile
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#14901] MoveFile with source == dest should succeed.
-# |
-# | Modified files:
-# |   *	dlls/appwiz.cpl/addons.c, dlls/urlmon/tests/url.c
-# |
-if test "$enable_kernel32_MoveFile" -eq 1; then
-	patch_apply kernel32-MoveFile/0006-urlmon-tests-Add-test-for-opening-cache-file-with-DE.patch
-	patch_apply kernel32-MoveFile/0007-appwiz.cpl-Copy-addons-to-cache-instead-of-moving.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "urlmon/tests: Add test for opening cache file with DELETE access.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "appwiz.cpl: Copy addons to cache instead of moving.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset kernel32-NeedCurrentDirectoryForExePath
 # |
 # | This patchset fixes the following Wine bugs: