wine-commits January 2021

2 participants
472 discussions

Zhiyi Zhang : winex11.drv: Check that there are connected outputs before using XRandR 1.4.

by Alexandre Julliard

Module: wine Branch: master Commit: 798137dbf6eeef3b7c1ca0257b381ad7903abbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=798137dbf6eeef3b7c1ca025… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 1 13:00:47 2021 +0800 winex11.drv: Check that there are connected outputs before using XRandR 1.4. On headless systems, Wine can still run through a VNC connection even though no outputs are connected. Fallback to using the Xinerama display device handler in this case to report at least one monitor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49500 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 78ad98acd49..fa748c2af04 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1555,6 +1555,38 @@ void X11DRV_XRandR_Init(void) #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) { + XRRScreenResources *screen_resources; + XRROutputInfo *output_info; + BOOL found_output = FALSE; + INT i; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + return; + + for (i = 0; i < screen_resources->noutput; ++i) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[i] ); + if (!output_info) + continue; + + if (output_info->connection == RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + found_output = TRUE; + break; + } + + pXRRFreeOutputInfo( output_info ); + } + pXRRFreeScreenResources( screen_resources ); + + if (!found_output) + { + WARN("No connected outputs found.\n"); + return; + } + display_handler.name = "XRandR 1.4"; display_handler.priority = 200; display_handler.get_gpus = xrandr14_get_gpus;

3 years, 4 months

Anton Baskanov : winegstreamer: Unmap and unref the buffer and release the sample before returning.

by Alexandre Julliard

Module: wine Branch: master Commit: 472adf650962bcb4623b8c387f1479b6c5d17a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=472adf650962bcb4623b8c38… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:47 2020 +0700 winegstreamer: Unmap and unref the buffer and release the sample before returning. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..805a7b8c089 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -826,6 +826,9 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu hr = IMediaSample_SetActualDataLength(sample, info.size); if(FAILED(hr)){ + IMediaSample_Release(sample); + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); WARN("SetActualDataLength failed: %08x\n", hr); return GST_FLOW_FLUSHING; }

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021