wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 190fb605c34ac1365076dff0a6560ddb42ca1ef2.

Browse Source
This commit is contained in:
Zebediah Figura 2019-11-22 20:02:37 -06:00
parent 7e4e808869
commit 194199011a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "90fc020400c06c163d4ab117d8da755b0f0e0861"
echo "190fb605c34ac1365076dff0a6560ddb42ca1ef2"
}
# Show version information

19
patches/setupapi-SP_COPY_IN_USE_NEEDS_REBOOT/0001-setupapi-Implement-SP_COPY_IN_USE_NEEDS_REBOOT.patch
View File

@ -1,17 +1,17 @@
From be3b930fc9abcd8d1038542dc47a1d52bf8500dd Mon Sep 17 00:00:00 2001
From 1535e7b74c6764467b12eeea62981ee4168cdd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 18 Sep 2016 22:59:13 +0200
Subject: [PATCH] setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT.
---
dlls/setupapi/queue.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
dlls/setupapi/queue.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index 8dae62e..c82e4fa 100644
index 2d2c83347..7efb6e3e9 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -1135,7 +1135,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
@@ -1132,7 +1132,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
}
}
if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
@ -20,11 +20,10 @@ index 8dae62e..c82e4fa 100644
{
ERR("Unsupported style(s) 0x%x\n",style);
}
@@ -1144,6 +1144,24 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
@@ -1140,6 +1140,23 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
if (docopy)
{
rc = CopyFileW(source,target,FALSE);
TRACE("Did copy... rc was %i\n",rc);
+
+ if (!rc && GetLastError() == ERROR_SHARING_VIOLATION &&
+ (style & SP_COPY_IN_USE_NEEDS_REBOOT))
+ {
@ -42,9 +41,9 @@ index 8dae62e..c82e4fa 100644
+ DeleteFileW(temp_file);
+ }
+ }
if (!rc) WARN( "failed to copy, err %u\n", GetLastError() );
}
else
SetLastError(ERROR_SUCCESS);
--
1.9.1
2.23.0