You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Removed patchset msi-MoveFiles (accepted upstream).
This commit is contained in:
@@ -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:
|
||||
|
@@ -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
|
||||
|
@@ -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
|
Reference in New Issue
Block a user