From 21620bf3cfae3e98064ab6ba205e173273c340fa Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 1 Sep 2020 12:17:43 +1000
Subject: [PATCH] Rebase against 518d06404ad70aa9812a77d019a18fe79c16f831.

---
 ...ediag-message-to-show-warning-that-t.patch | 35 +++++++++----------
 patches/patchinstall.sh                       |  2 +-
 staging/upstream-commit                       |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
index e28d9c43..87a0347d 100644
--- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
+++ b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
@@ -1,15 +1,15 @@
-From aa9cb874b1fb89601d6a5a735b442b8a7aa7b3aa Mon Sep 17 00:00:00 2001
+From 0a8a91199763c531cebeed0f60581df2e5ed36cf Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] kernel32: Add winediag message to show warning, that this
  isn't vanilla wine.
 
 ---
- dlls/kernel32/process.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ dlls/kernel32/process.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 8f506fcf1320..45bfe7fe7b5d 100644
+index 9d725e1a43b..9c678039dad 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -60,6 +60,7 @@
@@ -28,22 +28,21 @@ index 8f506fcf1320..45bfe7fe7b5d 100644
  /***********************************************************************
   *           __wine_start_process
   *
-@@ -150,6 +152,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+@@ -146,6 +148,14 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+     TRACE_(relay)( "\1Starting process %s (entryproc=%p)\n",
+                    debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );
  
++    if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
++    {
++        FIXME_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
++        FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n");
++    }
++    else
++        WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
++
      __TRY
      {
-+        if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS)
-+        {
-+            FIXME_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
-+            FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n");
-+        }
-+        else
-+            WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version());
-+
-+
-         if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged ))
-             being_debugged = FALSE;
- 
+         ExitThread( call_process_entry( peb, entry ));
 -- 
-2.26.2
+2.28.0
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c92767fa..e7423b0e 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5bb27d1edb2b6c8c04991cc88e54f161f0c41625"
+	echo "518d06404ad70aa9812a77d019a18fe79c16f831"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 0d5efe5f..d9cfcfd7 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-5bb27d1edb2b6c8c04991cc88e54f161f0c41625
+518d06404ad70aa9812a77d019a18fe79c16f831