diff --git a/patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch b/patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch index d2c0fce0..d019870d 100644 --- a/patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch +++ b/patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch @@ -1,4 +1,4 @@ -From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001 +From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 23:08:30 +0100 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar @@ -11,7 +11,7 @@ Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h -index b4d681fe..287ad394 100644 +index b4d681fe0f3..287ad394fae 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src ) @@ -31,7 +31,7 @@ index b4d681fe..287ad394 100644 #endif /* __WINE_SERVER_LIST_H */ diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h -index dc50b5e7..8130deb5 100644 +index 8aae29c8c10..330b3e8fbc9 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -23,8 +23,14 @@ @@ -52,10 +52,10 @@ index dc50b5e7..8130deb5 100644 struct wine_rb_entry { diff --git a/include/winnt.h b/include/winnt.h -index 2b489382..a156efc4 100644 +index 46e17c546a7..d5c65d2017b 100644 --- a/include/winnt.h +++ b/include/winnt.h -@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION +@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field)) #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field)) @@ -70,8 +70,8 @@ index 2b489382..a156efc4 100644 + ((type *)((PCHAR)(address) - offsetof(type, field))) +#endif + #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0])) #ifdef __WINESRC__ - # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -- -2.20.1 +2.26.2 diff --git a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch index df979f49..2da78ed8 100644 --- a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch +++ b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch @@ -1,17 +1,31 @@ -From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001 +From c097870c69720ece3874ad4ff987408a8c24ffb2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:53:46 +0200 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string. --- - libs/wine/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + dlls/ntdll/Makefile.in | 2 +- + libs/wine/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in +index ebf607e9d43..de93445d4e3 100644 +--- a/dlls/ntdll/Makefile.in ++++ b/dlls/ntdll/Makefile.in +@@ -69,7 +69,7 @@ server_EXTRADEFS = \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + + unix/version.c: dummy +- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) ++ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) + + dummy: + .PHONY: dummy diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in -index 4833eb5..3cfa4f4 100644 +index fe2a2b45e58..1e55a6b1f46 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in -@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) +@@ -100,7 +100,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) version.c: dummy @@ -21,5 +35,5 @@ index 4833eb5..3cfa4f4 100644 dummy: .PHONY: dummy -- -1.9.1 +2.26.2 diff --git a/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch index 6d117bae..5c148318 100644 --- a/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch +++ b/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch @@ -1,4 +1,4 @@ -From 449d193d2cc9255387903c16fe803219fa63f29a Mon Sep 17 00:00:00 2001 +From 2c2c37e3c3ac90dbb1ee8a115835e240742431e3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 29 May 2014 23:43:45 +0200 Subject: [PATCH] loader: Add commandline option --patches to show the patch @@ -14,11 +14,11 @@ Subject: [PATCH] loader: Add commandline option --patches to show the patch 6 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index c29a1c26c26..8906e194272 100644 +index fd9ba491135..31fe31a1efc 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c -@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void) - return wine_get_version(); +@@ -56,6 +56,14 @@ const char * CDECL NTDLL_wine_get_version(void) + return unix_funcs->get_version(); } +/********************************************************************* @@ -33,10 +33,10 @@ index c29a1c26c26..8906e194272 100644 * wine_get_build_id (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 4f5fa8c21d4..f4784428e2e 100644 +index e82fb6a2aa1..0f5682573c2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1575,6 +1575,7 @@ +@@ -1588,6 +1588,7 @@ # Version @ cdecl wine_get_version() NTDLL_wine_get_version @@ -86,10 +86,10 @@ index 1143b129734..55f874d3e74 100644 wine_init_argv0_path; wine_mmap_add_reserved_area; diff --git a/loader/main.c b/loader/main.c -index 407c897892d..d97d6b28bf8 100644 +index 0e6b6f66b50..24bcfff8c4c 100644 --- a/loader/main.c +++ b/loader/main.c -@@ -53,7 +53,8 @@ static void check_command_line( int argc, char *argv[] ) +@@ -55,7 +55,8 @@ static void check_command_line( int argc, char *argv[] ) static const char usage[] = "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" " wine --help Display this help and exit\n" @@ -99,7 +99,7 @@ index 407c897892d..d97d6b28bf8 100644 if (argc <= 1) { -@@ -70,6 +71,45 @@ static void check_command_line( int argc, char *argv[] ) +@@ -72,6 +73,45 @@ static void check_command_line( int argc, char *argv[] ) printf( "%s\n", wine_get_build_id() ); exit(0); } diff --git a/patches/eventfd_synchronization/0023-ntdll-wineandroid.drv-winemac.drv-winex11.drv-Store-.patch b/patches/eventfd_synchronization/0023-ntdll-wineandroid.drv-winemac.drv-winex11.drv-Store-.patch index f9e7b09e..65fcc8b1 100644 --- a/patches/eventfd_synchronization/0023-ntdll-wineandroid.drv-winemac.drv-winex11.drv-Store-.patch +++ b/patches/eventfd_synchronization/0023-ntdll-wineandroid.drv-winemac.drv-winex11.drv-Store-.patch @@ -1,4 +1,4 @@ -From f7855379ad40d50af6d63a8e7349504ece2f3464 Mon Sep 17 00:00:00 2001 +From 54fe35bdc5ca494daf2b54d49e61995bfa36202f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 12 Jun 2018 10:01:08 -0500 Subject: [PATCH] ntdll, wineandroid.drv, winemac.drv, winex11.drv: Store the @@ -18,7 +18,7 @@ In any case I haven't bothered to guard this code with do_esync(); it'd require 7 files changed, 20 insertions(+) diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c -index c53818b5485..5d8dbac2df4 100644 +index ea7517d3f1d..94838d32213 100644 --- a/dlls/ntdll/esync.c +++ b/dlls/ntdll/esync.c @@ -74,6 +74,12 @@ int do_esync(void) @@ -35,10 +35,10 @@ index c53818b5485..5d8dbac2df4 100644 { ESYNC_SEMAPHORE = 1, diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 3e7327211b3..784635a53c8 100644 +index ae3814be559..a4c44ae88e6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1555,6 +1555,8 @@ +@@ -1567,6 +1567,8 @@ # All functions must be prefixed with '__wine_' (for internal functions) # or 'wine_' (for user-visible functions) to avoid namespace conflicts. @@ -48,7 +48,7 @@ index 3e7327211b3..784635a53c8 100644 @ cdecl -norelay wine_server_call(ptr) @ cdecl wine_server_close_fds_by_type(long) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 98caabbf8e8..8e07b148c88 100644 +index e150d2a9d9c..e09528c4cc1 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -270,6 +270,7 @@ struct debug_info @@ -60,18 +60,18 @@ index 98caabbf8e8..8e07b148c88 100644 int request_fd; /* fd for sending server requests */ int reply_fd; /* fd for receiving server replies */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index cbbdafb2e97..688f16eb528 100644 +index 17a77498074..92001e64c71 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -345,6 +345,7 @@ TEB *thread_init(void) +@@ -438,6 +438,7 @@ TEB *thread_init(void) thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; + thread_data->esync_queue_fd = -1; - debug_init(); + unix_funcs->dbg_init(); init_paths(); -@@ -718,6 +719,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT +@@ -745,6 +746,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; thread_data->start_stack = (char *)teb->Tib.StackBase; diff --git a/patches/eventfd_synchronization/0045-server-ntdll-Implement-alertable-waits.patch b/patches/eventfd_synchronization/0045-server-ntdll-Implement-alertable-waits.patch index 37b5e460..aa10dde1 100644 --- a/patches/eventfd_synchronization/0045-server-ntdll-Implement-alertable-waits.patch +++ b/patches/eventfd_synchronization/0045-server-ntdll-Implement-alertable-waits.patch @@ -1,4 +1,4 @@ -From ef25a40d4d6e2676ff66347297f96ca0c7a59460 Mon Sep 17 00:00:00 2001 +From 352d6aa96eb3e19acb61ad4942c86810a321c755 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 15 Jun 2018 14:12:22 -0500 Subject: [PATCH] server, ntdll: Implement alertable waits. @@ -16,7 +16,7 @@ We do this quite simply by waiting on an extra eventfd descriptor, which the ser 8 files changed, 121 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c -index d177bb47989..6f41c5e030b 100644 +index 7504f9b2931..15f99239fe9 100644 --- a/dlls/ntdll/esync.c +++ b/dlls/ntdll/esync.c @@ -684,19 +684,43 @@ static int do_poll( struct pollfd *fds, nfds_t nfds, ULONGLONG *end ) @@ -196,7 +196,7 @@ index d177bb47989..6f41c5e030b 100644 NTSTATUS esync_signal_and_wait( HANDLE signal, HANDLE wait, BOOLEAN alertable, diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 8e07b148c88..8ba11bcf94c 100644 +index e09528c4cc1..2a6ce77e6fd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -271,6 +271,7 @@ struct ntdll_thread_data @@ -208,18 +208,18 @@ index 8e07b148c88..8ba11bcf94c 100644 int request_fd; /* fd for sending server requests */ int reply_fd; /* fd for receiving server replies */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 688f16eb528..391c3b62ee3 100644 +index 92001e64c71..e0d646d6020 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -346,6 +346,7 @@ TEB *thread_init(void) +@@ -439,6 +439,7 @@ TEB *thread_init(void) thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; thread_data->esync_queue_fd = -1; + thread_data->esync_apc_fd = -1; - debug_init(); + unix_funcs->dbg_init(); init_paths(); -@@ -720,6 +721,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT +@@ -747,6 +748,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT thread_data->wait_fd[1] = -1; thread_data->start_stack = (char *)teb->Tib.StackBase; thread_data->esync_queue_fd = -1; @@ -284,10 +284,10 @@ index aeb58c5469c..cea025d9308 100644 void esync_clear( int fd ); diff --git a/server/protocol.def b/server/protocol.def -index 8991462eb45..3955a8bd1c7 100644 +index 01f2207cc8a..9188893d7de 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -4069,6 +4069,11 @@ struct handle_info +@@ -4070,6 +4070,11 @@ struct handle_info unsigned int shm_idx; /* this object's index into the shm section */ @END diff --git a/patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch b/patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch index c503f75f..91ab1b8c 100644 --- a/patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch +++ b/patches/libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch @@ -1,17 +1,17 @@ -From 83bfe1190916708b3ffa46397b589fe39dfca591 Mon Sep 17 00:00:00 2001 +From a3c6f83abc21e88b69bb6b50e02892ab78a04774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 27 May 2019 09:19:56 +1000 Subject: [PATCH] libwine: Add process specific debug channels. --- - dlls/ntdll/debugtools.c | 28 ++++++++++++++++++++++++++-- + dlls/ntdll/unix/debug.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c -index 64355ab..366e71e 100644 ---- a/dlls/ntdll/debugtools.c -+++ b/dlls/ntdll/debugtools.c -@@ -30,6 +30,7 @@ +diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c +index 7bc7787c9de..cf4ce6fb9a6 100644 +--- a/dlls/ntdll/unix/debug.c ++++ b/dlls/ntdll/unix/debug.c +@@ -34,6 +34,7 @@ #endif #include "wine/debug.h" @@ -19,7 +19,7 @@ index 64355ab..366e71e 100644 #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); -@@ -103,10 +104,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear +@@ -107,10 +108,22 @@ static void add_option( const char *name, unsigned char set, unsigned char clear nb_debug_options++; } @@ -43,7 +43,7 @@ index 64355ab..366e71e 100644 unsigned int i; if (!(options = strdup(str))) return; -@@ -117,6 +130,17 @@ static void parse_options( const char *str ) +@@ -121,6 +134,17 @@ static void parse_options( const char *str ) if ((next = strchr( opt, ',' ))) *next++ = 0; @@ -61,7 +61,7 @@ index 64355ab..366e71e 100644 p = opt + strcspn( opt, "+-" ); if (!p[0]) p = opt; /* assume it's a debug channel name */ -@@ -157,7 +181,7 @@ static void debug_usage(void) +@@ -161,7 +185,7 @@ static void debug_usage(void) { static const char usage[] = "Syntax of the WINEDEBUG variable:\n" @@ -71,5 +71,5 @@ index 64355ab..366e71e 100644 " turns on relay traces, disable heap warnings\n" "Available message classes: err, warn, fixme, trace\n"; -- -1.9.1 +2.26.2 diff --git a/patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-bottom-up-allocation-order-for-64-bit-ar.patch b/patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-bottom-up-allocation-order-for-64-bit-ar.patch index d4142541..062ec92e 100644 --- a/patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-bottom-up-allocation-order-for-64-bit-ar.patch +++ b/patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-bottom-up-allocation-order-for-64-bit-ar.patch @@ -1,4 +1,4 @@ -From 2c3361713f010ec03423c6eae45bacda5e7e93ac Mon Sep 17 00:00:00 2001 +From 53e3f063ddc0ac0dfee0e53deffc58f818479cdd Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Mon, 25 Nov 2019 12:19:20 +0300 Subject: [PATCH] ntdll: Force bottom up allocation order for 64 bit arch @@ -11,7 +11,7 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 0c7d6990b8c..f2e961d31c3 100644 +index 170e310f34d..e90fabf614a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1256,13 +1256,19 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, @@ -32,7 +32,7 @@ index 0c7d6990b8c..f2e961d31c3 100644 + alloc.limit = min(alloc.limit, (void *)0x7ffffe000000); + } + - if (wine_mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if (unix_funcs->mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; @@ -1272,7 +1278,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, diff --git a/patches/ntdll-ForceBottomUpAlloc/0006-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch b/patches/ntdll-ForceBottomUpAlloc/0006-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch index 5eda7560..98952797 100644 --- a/patches/ntdll-ForceBottomUpAlloc/0006-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch +++ b/patches/ntdll-ForceBottomUpAlloc/0006-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch @@ -1,4 +1,4 @@ -From 3b0d0de794f903da33ce7fb4de545d0305163a31 Mon Sep 17 00:00:00 2001 +From e659b08734ee7f9265736dadfe7b9a763e7ee2c6 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Tue, 14 Jan 2020 21:42:21 +0300 Subject: [PATCH] ntdll: Use free area list for virtual memory allocation. @@ -8,7 +8,7 @@ Subject: [PATCH] ntdll: Use free area list for virtual memory allocation. 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index a4bc4c6ef05..18524fc12de 100644 +index 167b9a7fedc..b66b7874ab7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -577,59 +577,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, @@ -95,7 +95,7 @@ index a4bc4c6ef05..18524fc12de 100644 }; /*********************************************************************** -@@ -1178,6 +1128,41 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) +@@ -1178,6 +1128,41 @@ static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *a return 0; } @@ -160,7 +160,7 @@ index a4bc4c6ef05..18524fc12de 100644 goto done; } -@@ -1955,6 +1942,12 @@ static int alloc_virtual_heap( void *base, size_t size, void *arg ) +@@ -1956,6 +1943,12 @@ static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) return (alloc->base != (void *)-1); } @@ -173,9 +173,9 @@ index a4bc4c6ef05..18524fc12de 100644 /*********************************************************************** * virtual_init */ -@@ -2020,6 +2013,9 @@ void virtual_init(void) +@@ -2021,6 +2014,9 @@ void virtual_init(void) size = (char *)address_space_start - (char *)0x10000; - if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) + if (size && unix_funcs->mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + + wine_mmap_add_free_area(address_space_start, (char *)user_space_limit - (char *)address_space_start); @@ -183,7 +183,7 @@ index a4bc4c6ef05..18524fc12de 100644 } -@@ -2791,6 +2787,9 @@ void virtual_set_large_address_space(void) +@@ -2792,6 +2788,9 @@ void virtual_set_large_address_space(void) /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; diff --git a/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch b/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch index c5685f36..529f621e 100644 --- a/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch +++ b/patches/ntdll-ThreadTime/0003-ntdll-Fill-process-kernel-and-user-time.patch @@ -1,4 +1,4 @@ -From 50638bb08f56b290bf0763181a25aa1b78c9fa19 Mon Sep 17 00:00:00 2001 +From 2fb8a13c53a38377e8c64d202f91c2b5997669d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 9 Mar 2017 16:27:23 +0100 Subject: [PATCH] ntdll: Fill process kernel and user time. @@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Fill process kernel and user time. 3 files changed, 57 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index 91362a21a767..8198e0298922 100644 +index 6f17225b983..bdd169fb335 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c -@@ -2742,6 +2742,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -2646,6 +2646,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PROCESS_INFORMATION* spi = SystemInformation; SYSTEM_PROCESS_INFORMATION* last = NULL; @@ -21,7 +21,7 @@ index 91362a21a767..8198e0298922 100644 HANDLE hSnap = 0; WCHAR procname[1024]; WCHAR* exename; -@@ -2779,7 +2780,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -2683,7 +2684,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (Length >= len + procstructlen) { @@ -30,7 +30,7 @@ index 91362a21a767..8198e0298922 100644 * vmCounters, ioCounters */ -@@ -2797,6 +2798,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -2701,6 +2702,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( /* spi->ti will be set later on */ @@ -41,10 +41,10 @@ index 91362a21a767..8198e0298922 100644 len += procstructlen; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 514956e2d073..f45b6a08b978 100644 +index 27e7141bc65..f30cfa2e36b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -302,6 +302,10 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); +@@ -301,6 +301,10 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); #define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) #endif @@ -56,10 +56,10 @@ index 514956e2d073..f45b6a08b978 100644 int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index aa706beb2127..b79eb9791048 100644 +index de355c51fdd..18f4f5533e2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -156,6 +156,53 @@ static ULONG_PTR get_image_addr(void) +@@ -154,6 +154,53 @@ static ULONG_PTR get_image_addr(void) #endif @@ -111,9 +111,9 @@ index aa706beb2127..b79eb9791048 100644 + + /*********************************************************************** - * set_process_name + * __wine_dbg_get_channel_flags (NTDLL.@) * -@@ -1025,42 +1072,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, +@@ -988,42 +1035,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, #ifdef __linux__ /* only /proc provides exact values for a specific thread */ if (unix_pid != -1 && unix_tid != -1) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3b609402..3aff657e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9e26bc811656ad8eb901bffa5528b9ce25d44bc3" + echo "3bb824f98891e8eb907c9c652fe528373a17b10d" } # Show version information @@ -4099,7 +4099,7 @@ fi # Patchset libs-Debug_Channel # | # | Modified files: -# | * dlls/ntdll/debugtools.c +# | * dlls/ntdll/unix/debug.c # | if test "$enable_libs_Debug_Channel" -eq 1; then patch_apply libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch