From f912827a38ec59fcdda0413ddf6890ad6465c7fb Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 7 Dec 2022 09:31:52 +1100
Subject: [PATCH] Rebase against 0da7ad35f130a2ea59380dcad2179b972b3a909d.

---
 patches/patchinstall.sh                       |  2 +-
 ...nt-SetupAddInstallSectionToDiskSpace.patch | 37 ++++++++++++-------
 staging/upstream-commit                       |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index de086623..f69bad4c 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6b816b8969576a931af25fe5cc32326f03bb7359"
+	echo "0da7ad35f130a2ea59380dcad2179b972b3a909d"
 }
 
 # Show version information
diff --git a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch
index 737744b2..037cfaab 100644
--- a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch
+++ b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch
@@ -1,4 +1,4 @@
-From 37a1e2241efeb1d0654bbd6459b24ee6e92782d1 Mon Sep 17 00:00:00 2001
+From 1d7906d21e3a04ed01e0b6ba49879c18c7061fb8 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:54:37 +0100
 Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList.
@@ -7,14 +7,14 @@ Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList.
  dlls/setupapi/diskspace.c       |  87 +++++++++++++++-
  dlls/setupapi/setupapi.spec     |   2 +-
  dlls/setupapi/tests/diskspace.c | 170 ++++++++++++++++++++++++++++++++
- include/setupapi.h              |   3 +
- 4 files changed, 257 insertions(+), 5 deletions(-)
+ include/setupapi.h              |  12 +++
+ 4 files changed, 266 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c
-index 3153a18856a..39673cd63b5 100644
+index 436af0ec1f0..3ef91e79632 100644
 --- a/dlls/setupapi/diskspace.c
 +++ b/dlls/setupapi/diskspace.c
-@@ -294,14 +294,93 @@ BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC diskspace, HINF hinf, HINF h
+@@ -295,14 +295,93 @@ BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC diskspace, HINF hinf, HINF h
  /***********************************************************************
   *      SetupAddInstallSectionToDiskSpaceListW  (SETUPAPI.@)
   */
@@ -113,10 +113,10 @@ index 3153a18856a..39673cd63b5 100644
  *		SetupQuerySpaceRequiredOnDriveW  (SETUPAPI.@)
  */
 diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
-index ad8652ac93b..1d09b0e7e57 100644
+index 660b5ed422d..b9def8df864 100644
 --- a/dlls/setupapi/setupapi.spec
 +++ b/dlls/setupapi/setupapi.spec
-@@ -243,7 +243,7 @@
+@@ -245,7 +245,7 @@
  @ stub SearchForInfFile
  @ stub SetArrayToMultiSzValue
  @ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long)
@@ -126,7 +126,7 @@ index ad8652ac93b..1d09b0e7e57 100644
  @ stdcall SetupAddSectionToDiskSpaceListW(long long long wstr long ptr long)
  @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long)
 diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c
-index 7b8bcf4a342..13e025a8cfd 100644
+index 8e2eb88bf93..5643f930d9d 100644
 --- a/dlls/setupapi/tests/diskspace.c
 +++ b/dlls/setupapi/tests/diskspace.c
 @@ -935,6 +935,175 @@ static void test_SetupAddSectionToDiskSpaceListA(void)
@@ -312,13 +312,22 @@ index 7b8bcf4a342..13e025a8cfd 100644
 +    test_SetupAddInstallSectionToDiskSpaceListA();
  }
 diff --git a/include/setupapi.h b/include/setupapi.h
-index 818cc12599a..e54c6c227f6 100644
+index 21992ead500..41a0f720c7c 100644
 --- a/include/setupapi.h
 +++ b/include/setupapi.h
-@@ -1416,6 +1416,9 @@ DWORD    WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *);
- LONG     WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD);
- /* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */
- DWORD    WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *);
+@@ -1420,6 +1420,18 @@ typedef enum {
+ void     WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show );
+ void     WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show );
+ #define         InstallHinfSection WINELIB_NAME_AW(InstallHinfSection)
++BOOL     WINAPI IsUserAdmin(VOID);
++PWSTR    WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage);
++VOID     WINAPI MyFree(PVOID lpMem);
++PVOID    WINAPI MyMalloc(DWORD dwSize);
++PVOID    WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize);
++DWORD    WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *);
++LONG     WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD);
++/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */
++DWORD    WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *);
 +BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, PVOID, UINT);
 +BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, PVOID, UINT);
 +#define         SetupAddInstallSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddInstallSectionToDiskSpaceList)
@@ -326,5 +335,5 @@ index 818cc12599a..e54c6c227f6 100644
  BOOL     WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT);
  #define         SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList)
 -- 
-2.23.0
+2.38.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 09bec2ab..ca165634 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-6b816b8969576a931af25fe5cc32326f03bb7359
+0da7ad35f130a2ea59380dcad2179b972b3a909d