January 2021 - Wine-commits

Zebediah Figura : include: Define some types before including ntddndis.h.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: acd9c7085df997902b8157de7912459a8b3abfe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd9c7085df997902b8157de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 10:10:19 2021 -0600 include: Define some types before including ntddndis.h. Note that Windows only defines some types before the include (specifically, NDIS_STATUS, NDIS_HANDLE, NDIS_STRING). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50426 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index 872b43b5824..6258bc13354 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -21,8 +21,6 @@ #ifndef _NDIS_ #define _NDIS_ -#include <ntddndis.h> - typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; typedef void *NDIS_HANDLE, **PNDIS_HANDLE, *PNDIS_PACKET_POOL; @@ -30,6 +28,8 @@ typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; +#include <ntddndis.h> + typedef enum _NDIS_REQUEST_TYPE { NdisRequestQueryInformation,

1 0

Alexandre Julliard : Release 6.1.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 47ac628b4a4e476c1b044765c95d5be2a7101d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ac628b4a4e476c1b044765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:04:59 2021 +0100 Release 6.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 912 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 460 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47ac628b4a4e476c1b04…

1 0

Tag wine-6.1 : Alexandre Julliard : Release 6.1
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: refs/tags/wine-6.1 Tag: 1307e28c37baa85d69d174f73fb2d95fb6393919 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1307e28c37baa85d69d174f73fb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:04:59 2021 +0100 Release 6.1

1 0

Brendan Shanks : loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 307f5d00f17d71fe0030acb6ba9f28c3c9d76615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f5d00f17d71fe0030acb6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:46 2021 -0800 loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher. On Apple Silicon, Rosetta allocates memory starting at 0x100000000 (the 4GB line) before the preloader runs. The .NET 3.5 installer and DirectX Jun2010 redistributable both contain non-relocatable EXEs with that base address, which fail to run. The workaround is to create an empty linker section at that address, which is mapped by the kernel before Rosetta runs and forces Rosetta's allocations higher in memory. The linker section runs from 0x100000000-0x114000000. Rosetta's allocations are ~132MB, and should end below 0x120000000. This is not an exact science: a non-relocatable EXE with base address between 0x114000000-0x120000000 will fail to run. If one is discovered, the section size will need to be changed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader_mac.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cb23101f4c..42596bbb9c8 100755 --- a/configure +++ b/configure @@ -8727,7 +8727,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index 0f8b9f6c080..a9003523700 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d86675538bb..fc07b7da0ed 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -54,6 +54,17 @@ #include "wine/asm.h" #include "main.h" +/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) + * before the preloader runs, which prevents any nonrelocatable EXEs with that + * base address from running. + * + * This empty linker section forces Rosetta's allocations (currently ~132 MB) + * to start at 0x114000000, and they should end below 0x120000000. + */ +#if defined(__x86_64__) +__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +#endif + #ifndef LC_MAIN #define LC_MAIN 0x80000028 struct entry_point_command @@ -79,6 +90,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -395,6 +407,10 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; + static const char reserved_segname[] = "WINE_4GB_RESERVE"; + + if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) + continue; if (end > seg_start && start <= seg_end) {

1 0

Zebediah Figura : winegstreamer: Do not flush the upstream source pin in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 5482400a4edb57985be313a68ea9b6406f26ae4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5482400a4edb57985be313a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:13 2021 -0600 winegstreamer: Do not flush the upstream source pin in activate_push(). We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) {

1 0

Zebediah Figura : winegstreamer: Don't grab filter_cs in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8e84f16066568e1a24f6eff1a8137acfe4f68ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e84f16066568e1a24f6eff1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:14 2021 -0600 winegstreamer: Don't grab filter_cs in activate_push(). There's no good reason to do this; we're not protecting anything that isn't already protected by GStreamer locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b2a20934837..e7178bb4dfc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1421,7 +1421,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { struct parser *This = gst_pad_get_element_private(pad); - EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); if (This->push_thread) { @@ -1441,7 +1440,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) return FALSE; } } - LeaveCriticalSection(&This->filter.filter_cs); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in activate_mode().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 1dc7015cdbcc863a57c89cc81b94440c10686da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc7015cdbcc863a57c89cc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:15 2021 -0600 winegstreamer: Avoid using Wine debug functions in activate_mode(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7178bb4dfc..5747cce1dd2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1422,7 +1422,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct parser *This = gst_pad_get_element_private(pad); if (!activate) { - TRACE("Deactivating\n"); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; @@ -1432,7 +1431,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!This->push_thread) { int ret; - TRACE("Activating\n"); if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); @@ -1447,7 +1445,7 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g { struct parser *filter = gst_pad_get_element_private(pad); - TRACE("%s source pad for filter %p in %s mode.\n", + GST_DEBUG("%s source pad for filter %p in %s mode.", activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); switch (mode) {

1 0

Zebediah Figura : winegstreamer: Don't force activate_mode() onto a Wine thread.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8c13dde595b0841198a7d17bfc21c2997dde53b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c13dde595b0841198a7d17b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:16 2021 -0600 winegstreamer: Don't force activate_mode() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 14 -------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 5267091c5e1..90c34b1cb39 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,20 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) -{ - struct cb_data cbdata = { ACTIVATE_MODE }; - - cbdata.u.activate_mode_data.pad = pad; - cbdata.u.activate_mode_data.parent = parent; - cbdata.u.activate_mode_data.mode = mode; - cbdata.u.activate_mode_data.activate = activate; - - call_cb(&cbdata); - - return cbdata.u.activate_mode_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4afde78ba7d..cbd9a630885 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - ACTIVATE_MODE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -114,7 +113,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5747cce1dd2..ea6808ec113 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1581,7 +1581,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_query_function(This->my_src, query_function); - gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); + gst_pad_set_activatemode_function(This->my_src, activate_mode); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2511,12 +2511,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case ACTIVATE_MODE: - { - struct activate_mode_data *data = &cbdata->u.activate_mode_data; - cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b3d00c3340e5a0d19d0b708a1c434b1ccb1bc04d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d00c3340e5a0d19d0b708a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:20 2021 -0600 wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..9427448b612 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,6 +291,7 @@ static void create_user_shared_data(void) data->NtMinorVersion = version.dwMinorVersion; data->SuiteMask = version.wSuiteMask; data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + data->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; wcscpy( data->NtSystemRoot, L"C:\\windows" ); features = data->ProcessorFeatures;

1 0

Zebediah Figura : kernel32: Implement GetSystemDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 246e2356e5a178ca7e56d350cbc5cdaecc8538ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e2356e5a178ca7e56d350… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:21 2021 -0600 kernel32: Implement GetSystemDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92582ae31de..227d49ea37e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -34,6 +34,7 @@ #include "wincon.h" #include "kernel_private.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/server.h" #include "wine/asm.h" @@ -41,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + typedef struct { LPSTR lpEnvAddress; @@ -553,8 +556,7 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) */ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) { - FIXME("stub\n"); - return OptIn; + return user_shared_data->NXSupportPolicy; } /**********************************************************************

1 0