Removed patchset msi-MoveFiles (accepted upstream).

README.md

@@ -51,7 +51,7 @@ Included bugfixes and improvements
 * Allow special characters in pipe names ([Wine Bug #28995](http://bugs.winehq.org/show_bug.cgi?id=28995 "Unable to use named pipes with \">\" character in the name"))
 * Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](http://bugs.winehq.org/show_bug.cgi?id=30639 "Audio stuttering and performance drops in Star Wolves 3"))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](http://bugs.winehq.org/show_bug.cgi?id=33162 "Acrobat Reader 11 crashes on start (native API application virtualization, NtProtectVirtualMemory removes execute page protection on its own code)"))
-* Fix ITERATE_MoveFiles when no source- and destname is specified ([Wine Bug #10085](http://bugs.winehq.org/show_bug.cgi?id=10085 "Adobe Bridge CS2 complains that it can't start due to licensing restrictions (affects photoshop)"))
+* ~~Fix ITERATE_MoveFiles when no source- and destname is specified~~ ([Wine Bug #10085](http://bugs.winehq.org/show_bug.cgi?id=10085 "Adobe Bridge CS2 complains that it can't start due to licensing restrictions (affects photoshop)"))
 * Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](http://bugs.winehq.org/show_bug.cgi?id=10767 "lstrcmp and others do not compare punctuation characters correctly"))
 * Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](http://bugs.winehq.org/show_bug.cgi?id=16550 "ConnectNamedPort should never return OK in overlapped mode (affects chromium ui_tests.exe)"))
 * Fix for programs leaking wndproc slots ([Wine Bug #32451](http://bugs.winehq.org/show_bug.cgi?id=32451 "Multiple GOG.com installer bundles show a broken/unresponsive dialog window during installation (installer process running out of wndproc slots)"))

debian/changelog

@@ -6,6 +6,7 @@ wine-compholio (1.7.26) UNRELEASED; urgency=low
   * Added patch to fix issues when using setcap on wine executable.
   * Added patch to improve heap allocation performance by using more freelists.
   * Added patch to fix detection of ncurses on Archlinux (avoids ugly workarounds at build time).
+  * Removed patch to fix issue with msi/ITERATE_MoveFiles (accepted upstream).
  -- Erich E. Hoover <erich.e.hoover@gmail.com>  Wed, 27 Aug 2014 00:34:51 +0200
 
 wine-compholio (1.7.25) unstable; urgency=low

patches/Makefile

@@ -37,7 +37,6 @@ PATCHLIST := \
 	kernel32-SystemFileCacheSize.ok \
 	libs-Unicode_Collation.ok \
 	loader-Cmdline_Diagnostics.ok \
-	msi-MoveFiles.ok \
 	ntdll-DOS_Attributes.ok \
 	ntdll-Dynamic_DST.ok \
 	ntdll-FD_Cache.ok \
@@ -468,24 +467,6 @@ loader-Cmdline_Diagnostics.ok:
 		echo '+    { "loader-Cmdline_Diagnostics", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \
 	) > loader-Cmdline_Diagnostics.ok
 
-# Patchset msi-MoveFiles
-# |
-# | Included patches:
-# |   *	Fix ITERATE_MoveFiles when no source- and destname is specified. [by Sebastian Lackner]
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#10085] Fix ITERATE_MoveFiles when no source- and destname is specified
-# |
-# | Modified files: 
-# |   *	dlls/msi/files.c
-# |
-.INTERMEDIATE: msi-MoveFiles.ok
-msi-MoveFiles.ok:
-	$(call APPLY_FILE,msi-MoveFiles/0001-msi-Fix-ITERATE_MoveFiles-when-no-source-and-destnam.patch)
-	@( \
-		echo '+    { "msi-MoveFiles", "Sebastian Lackner", "Fix ITERATE_MoveFiles when no source- and destname is specified." },'; \
-	) > msi-MoveFiles.ok
-
 # Patchset ntdll-DOS_Attributes
 # |
 # | Included patches:

patches/msi-MoveFiles/0001-msi-Fix-ITERATE_MoveFiles-when-no-source-and-destnam.patch

@@ -1,32 +0,0 @@
-From 43743ce1c92eeb824eb489f0a4b06e81e28a3426 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 14 Aug 2014 01:39:13 +0200
-Subject: msi: Fix ITERATE_MoveFiles when no source- and destname is
- specified.
-
----
- dlls/msi/files.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/msi/files.c b/dlls/msi/files.c
-index ec46ae3..62e5f43 100644
---- a/dlls/msi/files.c
-+++ b/dlls/msi/files.c
-@@ -843,7 +843,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
-     {
-         if (!wildcards)
-         {
--            destname = strdupW(sourcename);
-+            WCHAR *p;
-+            if (sourcename)
-+                destname = strdupW(sourcename);
-+            else if ((p = strrchrW(sourcedir, '\\')))
-+                destname = strdupW(p + 1);
-+            else
-+                destname = strdupW(sourcedir);
-             if (!destname)
-                 goto done;
-         }
--- 
-1.7.9.5
-

patches/msi-MoveFiles/definition

@@ -1,4 +0,0 @@
-Author: Sebastian Lackner
-Subject: Fix ITERATE_MoveFiles when no source- and destname is specified.
-Revision: 1
-Fixes: [10085] Fix ITERATE_MoveFiles when no source- and destname is specified