mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Fix ntdll-CriticalSection patch rebase
This commit is contained in:
parent
4d65ec9456
commit
c896e5cb69
@ -1,14 +1,14 @@
|
||||
From 303c5e3a975e5add6d1d7ef431753697beb92c8e Mon Sep 17 00:00:00 2001
|
||||
From 50e78099e8c5fbd74131e339b8e48488e1581c74 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 5 Aug 2017 03:39:23 +0200
|
||||
Subject: [PATCH] ntdll: Use fast CS functions for heap locking.
|
||||
|
||||
---
|
||||
dlls/ntdll/heap.c | 52 +++++++++++++++++++++++------------------------
|
||||
1 file changed, 26 insertions(+), 26 deletions(-)
|
||||
dlls/ntdll/heap.c | 50 +++++++++++++++++++++++------------------------
|
||||
1 file changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
|
||||
index af2a489b727..a83370f20a8 100644
|
||||
index af2a489b727..178f81006d0 100644
|
||||
--- a/dlls/ntdll/heap.c
|
||||
+++ b/dlls/ntdll/heap.c
|
||||
@@ -1338,7 +1338,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */
|
||||
@ -20,15 +20,6 @@ index af2a489b727..a83370f20a8 100644
|
||||
|
||||
if (block) /* only check this single memory block */
|
||||
{
|
||||
@@ -1356,7 +1356,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */
|
||||
}
|
||||
else ret = validate_large_arena( heapPtr, large_arena, quiet );
|
||||
}
|
||||
- else ret = HEAP_ValidateInUseArena( subheap, arena, quiet );
|
||||
+ else ret = validate_large_arena( subheap, arena, quiet );
|
||||
goto done;
|
||||
}
|
||||
|
||||
@@ -1384,7 +1384,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */
|
||||
ret = TRUE;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user