diff --git a/patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch b/patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch index 4ddbf536..75f390bf 100644 --- a/patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch +++ b/patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch @@ -1,4 +1,4 @@ -From de8040e1a8900116a6a3fa0f0560e4a3c66d4d71 Mon Sep 17 00:00:00 2001 +From 0dc447fc1d384c9412e9c8f55bfef9adfaeec994 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 5 Aug 2017 03:39:23 +0200 Subject: [PATCH] ntdll: Use fast CS functions for heap locking. @@ -8,10 +8,10 @@ Subject: [PATCH] ntdll: Use fast CS functions for heap locking. 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c -index 51567d0552b..b1dcb01cd4f 100644 +index 1b6337d4ce8..ea2d4153b96 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c -@@ -340,13 +340,13 @@ static inline ULONG heap_get_flags( const HEAP *heap, ULONG flags ) +@@ -457,13 +457,13 @@ static inline ULONG heap_get_flags( const HEAP *heap, ULONG flags ) static void heap_lock( HEAP *heap, ULONG flags ) { if (heap_get_flags( heap, flags ) & HEAP_NO_SERIALIZE) return; @@ -27,19 +27,19 @@ index 51567d0552b..b1dcb01cd4f 100644 } static void heap_set_status( const HEAP *heap, ULONG flags, NTSTATUS status ) -@@ -1577,9 +1577,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c +@@ -1401,9 +1401,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c + /* link it into the per-process heap list */ if (processHeap) { - HEAP *heapPtr = subheap->heap; - RtlEnterCriticalSection( &processHeap->cs ); + enter_critical_section( &processHeap->cs ); - list_add_head( &processHeap->entry, &heapPtr->entry ); + list_add_head( &processHeap->entry, &heap->entry ); - RtlLeaveCriticalSection( &processHeap->cs ); + leave_critical_section( &processHeap->cs ); } else if (!addr) { -@@ -1623,9 +1623,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) +@@ -1447,9 +1447,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) if (heap == processHeap) return heap; /* cannot delete the main process heap */ /* remove it from the per-process list */ @@ -51,7 +51,7 @@ index 51567d0552b..b1dcb01cd4f 100644 heapPtr->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &heapPtr->cs ); -@@ -2171,7 +2171,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) +@@ -1930,7 +1930,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) ULONG total = 1; /* main heap */ struct list *ptr; @@ -60,7 +60,7 @@ index 51567d0552b..b1dcb01cd4f 100644 LIST_FOR_EACH( ptr, &processHeap->entry ) total++; if (total <= count) { -@@ -2179,7 +2179,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) +@@ -1938,7 +1938,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) LIST_FOR_EACH( ptr, &processHeap->entry ) *heaps++ = LIST_ENTRY( ptr, HEAP, entry ); } diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 78bda451..2c2d717c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "303f8042f9db508adaca02ef21f8de4992cb9c03" + echo "99ce6e87a3b22c5602d7bbedd43bb40627b63321" } # Show version information diff --git a/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch b/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch index 1acc800d..9ffdbffd 100644 --- a/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch +++ b/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch @@ -1,4 +1,4 @@ -From 54065eb714959facb7f4d463d9c8a11e5c6b2b42 Mon Sep 17 00:00:00 2001 +From 0c3e20339d2b531e62819b670b30635af6e75ea0 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 17 May 2017 23:55:55 +0800 Subject: [PATCH] server: Add support for a layered window region. (v3) @@ -11,10 +11,10 @@ Subject: [PATCH] server: Add support for a layered window region. (v3) 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c -index e15de7e5ccd..568fd26bb69 100644 +index 62ff4ad7777..a458e002ca0 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c -@@ -3695,13 +3695,11 @@ static void test_Input_mouse(void) +@@ -3683,13 +3683,11 @@ static void test_Input_mouse(void) if (msg.message == WM_LBUTTONDOWN) { @@ -29,18 +29,18 @@ index e15de7e5ccd..568fd26bb69 100644 got_button_up = TRUE; break; diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c -index 550c5f06f37..8204e3dba9e 100644 +index 10388a1cc8f..5ff6e23fa8d 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c -@@ -46,6 +46,7 @@ - #include "winbase.h" +@@ -48,6 +48,7 @@ + #include "x11drv.h" #include "winternl.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(bitblt); -@@ -1623,6 +1624,48 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) +@@ -1625,6 +1626,48 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) } #endif @@ -89,7 +89,7 @@ index 550c5f06f37..8204e3dba9e 100644 /*********************************************************************** * update_surface_region */ -@@ -1641,6 +1684,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) +@@ -1643,6 +1686,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) if (!surface->is_argb && surface->color_key == CLR_INVALID) { XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet ); @@ -97,7 +97,7 @@ index 550c5f06f37..8204e3dba9e 100644 return; } -@@ -1751,6 +1795,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) +@@ -1753,6 +1797,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) free( data ); } diff --git a/staging/upstream-commit b/staging/upstream-commit index e87e1940..613b2091 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -303f8042f9db508adaca02ef21f8de4992cb9c03 +99ce6e87a3b22c5602d7bbedd43bb40627b63321