Rebase against 4d5824112e13160e538013a25f1c13a124565180.

This commit is contained in:
Alistair Leslie-Hughes
2021-03-17 09:44:07 +11:00
parent 1f89c15143
commit c747e46d75
8 changed files with 73 additions and 73 deletions

View File

@@ -1,4 +1,4 @@
From b9815e86e026c431050253146177f5c624a28756 Mon Sep 17 00:00:00 2001
From 5d866aebeeb7760eed0f35a206d43ef32bafbffe 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 67696f80db3..f25d8adc217 100644
index b8f9dc28e63..444feb5d152 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -26,6 +26,7 @@
@@ -20,7 +20,7 @@ index 67696f80db3..f25d8adc217 100644
#include "wine/asm.h"
#define DECLARE_CRITICAL_SECTION(cs) \
@@ -96,6 +97,39 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst
@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
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;
@@ -59,7 +59,7 @@ index 67696f80db3..f25d8adc217 100644
+
/* load order */
enum loadorder
#ifndef _WIN64
--
2.30.0
2.30.1