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 8f76cc687da9c0fc7fb10e84a8cf36bcad0ef473.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-08-15 08:34:49 +10:00
parent 4fa70d510c
commit d3de5eadd9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From c1b129ea5fb6f23e8d07cdb0c3c74e8672e880e9 Mon Sep 17 00:00:00 2001
From e332b9169147c9956e498133be4164ae8597681b 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 c079014a109..436af0ec1f0 100644
index ee9fdb801bb..3d1e96f43c3 100644
--- a/dlls/setupapi/diskspace.c
+++ b/dlls/setupapi/diskspace.c
@@ -20,6 +20,7 @@
@ -168,10 +168,10 @@ index c079014a109..436af0ec1f0 100644
BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace,
HINF InfHandle, HINF LayoutInfHandle,
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index f6c83d30e1d..4e5d3f99e9c 100644
index 40e106fffcd..53053e8c4d4 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -338,7 +338,7 @@ static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARA
@@ -337,7 +337,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 f6c83d30e1d..4e5d3f99e9c 100644
INFCONTEXT context;
WCHAR systemdir[MAX_PATH], *dir;
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 1b3f5cc6bd8..b2c42fe6e20 100644
index 7578fb25c9c..660b5ed422d 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -246,8 +246,8 @@
@ -196,12 +196,12 @@ index 1b3f5cc6bd8..b2c42fe6e20 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 7681348a11c..edc833f5768 100644
index 9d3d19c84c0..c93cfd6af49 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -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;
@@ -86,6 +86,8 @@ extern const WCHAR *DIRID_get_string( int dirid );
extern const WCHAR *PARSER_get_inf_filename( HINF hinf );
extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context );
+extern WCHAR *get_destination_dir( HINF hinf, const WCHAR *section );
+
@ -432,5 +432,5 @@ index 0cacf9a75aa..8e2eb88bf93 100644
+ test_SetupAddSectionToDiskSpaceListA();
}
--
2.35.1
2.40.1

2
staging/upstream-commit
View File

@ -1 +1 @@
b2a099b3ceec6fef05c455408c05714232cb466f
8f76cc687da9c0fc7fb10e84a8cf36bcad0ef473