Rebase against 6cbe072c3799b27addb67014245ea7c59b1023dd.

This commit is contained in:
Alistair Leslie-Hughes
2024-02-29 11:17:10 +11:00
parent 91d4974f10
commit 34eb04e7cc
5 changed files with 45 additions and 45 deletions

View File

@@ -1,4 +1,4 @@
From 4dd82c635bcf8c2c7d070d6c5786787ff2d7d887 Mon Sep 17 00:00:00 2001
From 7e6c4ffa4bcf4e008a2cf4ed75c279058d002aac 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 /
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
1 file changed, 34 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index a7967a6c242..8b088f9d3c3 100644
index 24c583dd159..cffe27d847c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -28,6 +28,7 @@
@@ -19,10 +19,10 @@ index a7967a6c242..8b088f9d3c3 100644
+#include "wine/debug.h"
#include "wine/asm.h"
#define DECLARE_CRITICAL_SECTION(cs) \
@@ -94,6 +95,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data;
extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args );
extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args );
#define MAX_NT_PATH_LENGTH 277
@@ -105,6 +106,39 @@ extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *
extern struct _KUSER_SHARED_DATA *user_shared_data;
+/* inline version of RtlEnterCriticalSection */
+static inline void enter_critical_section( RTL_CRITICAL_SECTION *crit )
@@ -57,9 +57,9 @@ index a7967a6c242..8b088f9d3c3 100644
+ }
+}
+
struct dllredirect_data
{
ULONG size;
#ifdef _WIN64
static inline TEB64 *NtCurrentTeb64(void) { return NULL; }
#else
--
2.42.0
2.43.0