Rebase against f34f13825fd060fda40f0a5b02dc1b420e3a8e1e

patches/ntdll-CriticalSection/0001-include-Move-interlocked_inc-dec-to-port.h.patch

@@ -1,7 +1,7 @@
-From 1ac9a6a07169a6d9dc3583c332513586fa2e8a54 Mon Sep 17 00:00:00 2001
+From 32fbaef5e77e1fbe08ad35c933ff4ed7f61217f8 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:37:47 +0200
-Subject: include: Move interlocked_inc/dec to port.h.
+Subject: [PATCH] include: Move interlocked_inc/dec to port.h.
 
 ---
  dlls/ntdll/critsection.c | 10 ----------
@@ -10,7 +10,7 @@ Subject: include: Move interlocked_inc/dec to port.h.
  3 files changed, 13 insertions(+), 21 deletions(-)
 
 diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
-index e405b08a5a7..a4bd463bd25 100644
+index 42e432c8f65..6b17cebe058 100644
 --- a/dlls/ntdll/critsection.c
 +++ b/dlls/ntdll/critsection.c
 @@ -40,16 +40,6 @@
@@ -31,7 +31,7 @@ index e405b08a5a7..a4bd463bd25 100644
  {
  #ifdef __i386__
 diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
-index 6063d51d9f9..b723e6f66f8 100644
+index bf7449cdfa6..b8dc8273702 100644
 --- a/dlls/ntdll/threadpool.c
 +++ b/dlls/ntdll/threadpool.c
 @@ -331,16 +331,6 @@ static void tp_object_prepare_shutdown( struct threadpool_object *object );
@@ -52,10 +52,10 @@ index 6063d51d9f9..b723e6f66f8 100644
  {
      struct rtl_work_item *item = userdata;
 diff --git a/include/wine/port.h b/include/wine/port.h
-index eb346e00fd3..e782ee00626 100644
+index e32818e5455..470ba66cb50 100644
 --- a/include/wine/port.h
 +++ b/include/wine/port.h
-@@ -506,6 +506,16 @@ static inline __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int6
+@@ -501,6 +501,16 @@ static inline __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int6
  extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare );
  #endif
  
@@ -72,7 +72,7 @@ index eb346e00fd3..e782ee00626 100644
  #else /* NO_LIBWINE_PORT */
  
  #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable
-@@ -516,9 +526,11 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa
+@@ -511,9 +521,11 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa
  #define getopt_long_only        __WINE_NOT_PORTABLE(getopt_long_only)
  #define interlocked_cmpxchg     __WINE_NOT_PORTABLE(interlocked_cmpxchg)
  #define interlocked_cmpxchg_ptr __WINE_NOT_PORTABLE(interlocked_cmpxchg_ptr)
@@ -83,8 +83,8 @@ index eb346e00fd3..e782ee00626 100644
  #define interlocked_xchg_add    __WINE_NOT_PORTABLE(interlocked_xchg_add)
 +#define interlocked_xchg_ptr    __WINE_NOT_PORTABLE(interlocked_xchg_ptr)
  #define lstat                   __WINE_NOT_PORTABLE(lstat)
- #define memcpy_unaligned        __WINE_NOT_PORTABLE(memcpy_unaligned)
- #undef memmove
+ #define pread                   __WINE_NOT_PORTABLE(pread)
+ #define pwrite                  __WINE_NOT_PORTABLE(pwrite)
 -- 
-2.13.1
+2.20.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5baadda536172d6713fa6fef1196dc2baa773904"
+	echo "f34f13825fd060fda40f0a5b02dc1b420e3a8e1e"
 }
 
 # Show version information