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 4a18232e455d82c9334c71ebea833dfb5b50b19e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-08-26 08:55:28 +10:00
parent 5a5c5a5743
commit 8d34769ef1
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "a87bafc5b92c9f2deaa399e32a8ec42d28f7ea45"
echo "4a18232e455d82c9334c71ebea833dfb5b50b19e"
}
# Show version information

20
patches/setupapi-DiskSpaceList/0005-setupapi-ImplementSetupAddSectionToDiskSpaceList.patch
View File

@ -1,4 +1,4 @@
From 1c662a1bdeec10a46e88c5f83aaa3f3e8ea4bf12 Mon Sep 17 00:00:00 2001
From 82a42af095d379ed04ed3f0b369a156c87981d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Mar 2016 04:53:00 +0100
Subject: [PATCH] setupapi: ImplementSetupAddSectionToDiskSpaceList.
@ -12,7 +12,7 @@ Subject: [PATCH] setupapi: ImplementSetupAddSectionToDiskSpaceList.
5 files changed, 328 insertions(+), 4 deletions(-)
diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c
index 01b08c1408..8dbd0f0cc3 100644
index 01b08c1408e..8dbd0f0cc3d 100644
--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -20,6 +20,7 @@
@ -168,10 +168,10 @@ index 01b08c1408..8dbd0f0cc3 100644
BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace,
HINF InfHandle, HINF LayoutInfHandle,
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index aa59adf967..c0ca7bb76a 100644
index dc718cc66fc..ad626f113f1 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -331,7 +331,7 @@ static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARA
@@ -338,7 +338,7 @@ static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARA
*
* Retrieve the destination dir for a given section.
*/
@ -181,7 +181,7 @@ index aa59adf967..c0ca7bb76a 100644
INFCONTEXT context;
WCHAR systemdir[MAX_PATH], *dir;
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 33ccc48097..e8468bdeb0 100644
index 1b3f5cc6bd8..b2c42fe6e20 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -246,8 +246,8 @@
@ -196,20 +196,20 @@ index 33ccc48097..e8468bdeb0 100644
@ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long)
@ stdcall SetupAddToSourceListA(long str)
diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
index f4685ab2b4..4df062349c 100644
index 7681348a11c..edc833f5768 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -92,6 +92,8 @@ extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN;
@@ -94,6 +94,8 @@ extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN;
extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN;
extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN;
+extern WCHAR *get_destination_dir( HINF hinf, const WCHAR *section );
+
/* support for Ascii queue callback functions */
/* support for ANSI queue callback functions */
struct callback_WtoA_context
diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c
index 4ba9fea9e0..7b8bcf4a34 100644
index 4ba9fea9e0a..7b8bcf4a342 100644
--- a/dlls/setupapi/tests/diskspace.c
+++ b/dlls/setupapi/tests/diskspace.c
@@ -30,6 +30,8 @@
@ -432,5 +432,5 @@ index 4ba9fea9e0..7b8bcf4a34 100644
+ test_SetupAddSectionToDiskSpaceListA();
}
--
2.24.1
2.32.0

2
staging/upstream-commit
View File

@ -1 +1 @@
a87bafc5b92c9f2deaa399e32a8ec42d28f7ea45
4a18232e455d82c9334c71ebea833dfb5b50b19e