Rebase against 99114803b80f6e687f1d4ed11e0808b821cdbf22

This commit is contained in:
Alistair Leslie-Hughes
2019-05-15 08:00:59 +10:00
parent f3e2363b52
commit 6ce73c283d
5 changed files with 36 additions and 27 deletions

View File

@@ -1,7 +1,7 @@
From 52a0506018b5f61484935142b79e73dbbe0ae9d7 Mon Sep 17 00:00:00 2001
From 7ab8094fbbc9adb4a5406fd9a780ab5542a5a3e4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 5 Aug 2017 03:38:38 +0200
Subject: ntdll: Add inline versions of RtlEnterCriticalSection /
Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
RtlLeaveCriticalSections.
---
@@ -9,7 +9,7 @@ Subject: ntdll: Add inline versions of RtlEnterCriticalSection /
1 file changed, 38 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 19d1e532759..c6c60090d10 100644
index 84866721a07..303cad1764a 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -27,6 +27,7 @@
@@ -18,9 +18,9 @@ index 19d1e532759..c6c60090d10 100644
#include "winternl.h"
+#include "wine/debug.h"
#include "wine/server.h"
#include "wine/asm.h"
#define MAX_NT_PATH_LENGTH 277
@@ -198,6 +199,43 @@ extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst,
@@ -214,6 +215,43 @@ extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* 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;
@@ -65,5 +65,5 @@ index 19d1e532759..c6c60090d10 100644
enum loadorder
--
2.13.1
2.20.1