From 52f92a42de35d37037326a8f00fdbfa37d1e4ab0 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 23 May 2019 08:53:02 +1000
Subject: [PATCH] Rebase against 9cfe6094773929d9dd61db51da094324337ecab0

---
 ...top-macro-redefined-on-the-mac-build.patch | 39 -------------------
 patches/patchinstall.sh                       | 18 +--------
 ...dd-test-for-IDF_CHECKFIRST-and-Setup.patch | 14 ++++---
 3 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch

diff --git a/patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch b/patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch
deleted file mode 100644
index 35537402..00000000
--- a/patches/include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 16defa342cfa6b1ebf0d3b46b3e4225ad4218d23 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 17 May 2019 09:10:46 +1000
-Subject: [PATCH] include: Stop macro redefined on the mac build
-
----
- include/winerror.h | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/include/winerror.h b/include/winerror.h
-index 32680e0..d58aee8 100644
---- a/include/winerror.h
-+++ b/include/winerror.h
-@@ -66,6 +66,22 @@
- #define SEVERITY_SUCCESS    0
- #define SEVERITY_ERROR      1
- 
-+#undef MAKE_HRESULT
-+#undef SUCCEEDED
-+#undef FAILED
-+#undef IS_ERROR
-+#undef HRESULT_FACILITY
-+#undef S_OK
-+#undef S_FALSE
-+#undef E_NOTIMPL
-+#undef E_NOINTERFACE
-+#undef E_POINTER
-+#undef E_ABORT
-+#undef E_FAIL
-+#undef E_UNEXPECTED
-+#undef E_HANDLE
-+#undef E_OUTOFMEMORY
-+#undef E_INVALIDARG
- 
- #define MAKE_HRESULT(sev,fac,code) \
-     ((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) )
--- 
-1.9.1
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index f737ee57..161f2b86 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6a610a325809d47f48bc72f3a757e1a62b193ea8"
+	echo "9cfe6094773929d9dd61db51da094324337ecab0"
 }
 
 # Show version information
@@ -153,7 +153,6 @@ patch_enable_all ()
 	enable_httpapi_HttpCreateServerSession="$1"
 	enable_imagehlp_BindImageEx="$1"
 	enable_imm32_message_on_focus="$1"
-	enable_include_macos_compile="$1"
 	enable_include_winsock="$1"
 	enable_inseng_Implementation="$1"
 	enable_iphlpapi_System_Ping="$1"
@@ -589,9 +588,6 @@ patch_enable ()
 		imm32-message_on_focus)
 			enable_imm32_message_on_focus="$2"
 			;;
-		include-macos-compile)
-			enable_include_macos_compile="$2"
-			;;
 		include-winsock)
 			enable_include_winsock="$2"
 			;;
@@ -4072,18 +4068,6 @@ if test "$enable_imm32_message_on_focus" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset include-macos-compile
-# |
-# | Modified files:
-# |   *	include/winerror.h
-# |
-if test "$enable_include_macos_compile" -eq 1; then
-	patch_apply include-macos-compile/0001-include-Stop-macro-redefined-on-the-mac-build.patch
-	(
-		printf '%s\n' '+    { "Alistair Leslie-Hughes", "include: Stop macro redefined on the mac build.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset include-winsock
 # |
 # | Modified files:
diff --git a/patches/setupapi-SetupPromptForDisk/0002-setupapi-tests-Add-test-for-IDF_CHECKFIRST-and-Setup.patch b/patches/setupapi-SetupPromptForDisk/0002-setupapi-tests-Add-test-for-IDF_CHECKFIRST-and-Setup.patch
index 5c853ded..848c2a32 100644
--- a/patches/setupapi-SetupPromptForDisk/0002-setupapi-tests-Add-test-for-IDF_CHECKFIRST-and-Setup.patch
+++ b/patches/setupapi-SetupPromptForDisk/0002-setupapi-tests-Add-test-for-IDF_CHECKFIRST-and-Setup.patch
@@ -1,7 +1,7 @@
-From 7e2c3085b0a0054c0bfbc8e1779dacd6b5be895a Mon Sep 17 00:00:00 2001
+From e8a80102cb10ffd837a560fbaaf202f649152389 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 5 Oct 2014 23:53:39 +0200
-Subject: setupapi/tests: Add test for IDF_CHECKFIRST and
+Subject: [PATCH] setupapi/tests: Add test for IDF_CHECKFIRST and
  SetupPromptForDiskA/W.
 
 ---
@@ -11,15 +11,17 @@ Subject: setupapi/tests: Add test for IDF_CHECKFIRST and
  create mode 100644 dlls/setupapi/tests/dialog.c
 
 diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in
-index 30902e7..3531381 100644
+index bbfdf59..83f751c 100644
 --- a/dlls/setupapi/tests/Makefile.in
 +++ b/dlls/setupapi/tests/Makefile.in
-@@ -4,4 +4,5 @@ IMPORTS   = setupapi user32 advapi32
- C_SRCS = \
+@@ -5,6 +5,7 @@ SOURCES = \
+ 	coinst.c \
+ 	coinst.spec \
  	devinst.c \
 +	dialog.c \
  	diskspace.c \
  	install.c \
+ 	misc.c \
 diff --git a/dlls/setupapi/tests/dialog.c b/dlls/setupapi/tests/dialog.c
 new file mode 100644
 index 0000000..973b1fc
@@ -135,5 +137,5 @@ index 0000000..973b1fc
 +}
 \ No newline at end of file
 -- 
-2.2.1
+1.9.1