From bd3bf6c3b0c5dcf1e93b49fcc3605898b57b6063 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Tue, 24 Apr 2018 18:57:07 -0500
Subject: [PATCH] Rebase against e13f59085f8a3787abd4e3f3eabae1a7e607a3c0

---
 ...-Add-stub-for-ApiSetQueryApiSetPresence.patch | 16 ++++++++--------
 patches/ntdll-NtContinue/definition              |  1 +
 patches/patchinstall.sh                          |  5 ++++-
 patches/winemapi-user-xdg-mail/definition        |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 patches/ntdll-NtContinue/definition

diff --git a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch
index 8b07d2b1..3c06bc5c 100644
--- a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch
+++ b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch
@@ -1,4 +1,4 @@
-From 69a28da617c7d5c361eae5ed056cac7984b4177c Mon Sep 17 00:00:00 2001
+From aa4d3f847be7541b846438956ca988d3456054b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 13:17:31 +0100
 Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
@@ -10,19 +10,19 @@ Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
  3 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
-index 6d63b5bf43..1d99dd7132 100644
+index 6d63b5b..1d99dd7 100644
 --- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
 +++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
 @@ -1 +1 @@
 -@ stub ApiSetQueryApiSetPresence
 +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index 8f0c51cea9..1a0087ae14 100644
+index 88e8b33..85b0e32 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
-@@ -476,3 +476,14 @@ ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor
-     FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
-     return ERROR_SUCCESS;
+@@ -484,3 +484,14 @@ void WINAPI DbgUiRemoteBreakin( void *arg )
+ {
+     FIXME("stub\n");
  }
 +
 +/*********************************************************************
@@ -36,7 +36,7 @@ index 8f0c51cea9..1a0087ae14 100644
 +    return TRUE;
 +}
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 9adf1edd4a..adfb2fc7ef 100644
+index c260b0d..01836a3 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
 @@ -3,6 +3,7 @@
@@ -48,5 +48,5 @@ index 9adf1edd4a..adfb2fc7ef 100644
  @ stub CsrAllocateCapturePointer
  @ stub CsrAllocateMessagePointer
 -- 
-2.12.2
+2.7.4
 
diff --git a/patches/ntdll-NtContinue/definition b/patches/ntdll-NtContinue/definition
new file mode 100644
index 00000000..b8bd0656
--- /dev/null
+++ b/patches/ntdll-NtContinue/definition
@@ -0,0 +1 @@
+Fixes: [31910] Add stub for NtContinue
\ No newline at end of file
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 0622e629..8ed37fcc 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ee7756fdfd46cd64a09089def3c330a3b262cdd5"
+	echo "e13f59085f8a3787abd4e3f3eabae1a7e607a3c0"
 }
 
 # Show version information
@@ -8087,6 +8087,9 @@ fi
 
 # Patchset winemapi-user-xdg-mail
 # |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#11770] - use xdg-email if it's available.
+# |
 # | Modified files:
 # |   *	dlls/winemapi/Makefile.in, dlls/winemapi/sendmail.c, dlls/winemapi/winemapi_private.h, dlls/winemapi/xdg-email.c
 # |
diff --git a/patches/winemapi-user-xdg-mail/definition b/patches/winemapi-user-xdg-mail/definition
index d8105168..d7a9b153 100644
--- a/patches/winemapi-user-xdg-mail/definition
+++ b/patches/winemapi-user-xdg-mail/definition
@@ -1 +1 @@
-Fixes [11770] - use xdg-email if it's available.
+Fixes: [11770] - use xdg-email if it's available.