Rebase against 359ee2ecc21b08e4118f0f77b3a208e4b5e1e63d.

patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch

@@ -1,18 +1,18 @@
-From bb92d36109c9d4931051c69c0ab789b5c1396e66 Mon Sep 17 00:00:00 2001
+From fea92ad5c12ddb8d0a4d2363f21afe9c199359d1 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:38:38 +0200
 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
  RtlLeaveCriticalSections.
 
 ---
- dlls/ntdll/ntdll_misc.h | 38 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
+ dlls/ntdll/ntdll_misc.h | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 27e7141bc65..d1fe4ba99d0 100644
+index 92fcde95a8a..51a9069e290 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -28,6 +28,7 @@
+@@ -26,6 +26,7 @@
  #include "winnt.h"
  #include "winternl.h"
  #include "unixlib.h"
@@ -20,12 +20,10 @@ index 27e7141bc65..d1fe4ba99d0 100644
  #include "wine/server.h"
  #include "wine/asm.h"
  
-@@ -237,6 +238,43 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst
+@@ -103,6 +104,39 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst
  extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN;
  extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN;
  
-+#ifdef __WINE_WINE_PORT_H
-+
 +/* inline version of RtlEnterCriticalSection */
 +static inline void enter_critical_section( RTL_CRITICAL_SECTION *crit )
 +{
@@ -58,12 +56,10 @@ index 27e7141bc65..d1fe4ba99d0 100644
 +            RtlpUnWaitCriticalSection( crit );
 +    }
 +}
-+
-+#endif  /* __WINE_WINE_PORT_H */
 +
  /* load order */
  
  enum loadorder
 -- 
-2.26.2
+2.27.0