August 2020 - Wine-devel - list.winehq.org

[PATCH 2/3] winex11.drv: Initialize new display device registry display settings.
by Zhiyi Zhang 17 Aug '20

17 Aug '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 3 files changed, 35 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 2d1fc7220de..c4929e9b584 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -177,6 +177,38 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_SetHandler(&nores_handler); } +/* Initialize registry display settings when new display devices are added */ +void init_registry_display_settings(void) +{ + DEVMODEW dm = {.dmSize = sizeof(dm)}; + DISPLAY_DEVICEW dd = {sizeof(dd)}; + DWORD i = 0; + LONG ret; + + while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + { + /* Skip if the device already has registry display settings */ + if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + continue; + + if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); + continue; + } + + TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", + wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, + dm.dmDisplayFrequency, dm.u1.s2.dmPosition.x, dm.u1.s2.dmPosition.y); + + ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Failed to save registry display settings for %s, returned %d.\n", + wine_dbgstr_w(dd.DeviceName), ret); + } +} + static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a7a0e12d49..233891f7b00 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -701,6 +701,7 @@ extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *han extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; +extern void init_registry_display_settings(void) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 155bd85d811..faeb4d98d99 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1072,6 +1072,8 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) * ChangeDisplaySettings(). Otherwise, ChangeDisplaySettings() would send multiple * WM_DISPLAYCHANGE messages instead of just one */ X11DRV_DisplayDevices_Update( FALSE ); + + init_registry_display_settings(); } return FALSE; } -- 2.25.1

1 0

[PATCH 1/3] winex11.drv: Report a GPU same as the host primary GPU in virtual desktop mode.
by Zhiyi Zhang 17 Aug '20

17 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49631 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 7 ++++++- dlls/winex11.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 64f61d21e4d..b517e44e150 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -212,7 +212,12 @@ static BOOL X11DRV_desktop_get_gpus( struct x11drv_gpu **new_gpus, int *count ) gpu = heap_calloc( 1, sizeof(*gpu) ); if (!gpu) return FALSE; - lstrcpyW( gpu->name, wine_adapterW ); + if (!get_host_primary_gpu( gpu )) + { + WARN( "Failed to get host primary gpu.\n" ); + lstrcpyW( gpu->name, wine_adapterW ); + } + *new_gpus = gpu; *count = 1; return TRUE; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 27876e02df0..3e9e4474d4c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -259,6 +259,21 @@ RECT get_host_primary_monitor_rect(void) return rect; } +BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) +{ + struct x11drv_gpu *gpus; + INT gpu_count; + + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count) + { + *gpu = gpus[0]; + host_handler.free_gpus(gpus); + return TRUE; + } + + return FALSE; +} + RECT get_work_area(const RECT *monitor_rect) { Atom type; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375fd1465fd..4a7a0e12d49 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -792,6 +792,7 @@ struct x11drv_display_device_handler }; extern HANDLE get_display_device_init_mutex(void) DECLSPEC_HIDDEN; +extern BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) DECLSPEC_HIDDEN; extern void release_display_device_init_mutex(HANDLE) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 2/2] riched20: Implement ITextRange::Move() for tomCharacter
by Damjan Jovanovic 17 Aug '20

17 Aug '20

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/richole.c | 78 +++++++++++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 47 +++++++++++++++++++++ 2 files changed, 121 insertions(+), 4 deletions(-)

1 0

[PATCH v2] d3dx10: Introduce get_d3dx10_dds_format().
by Ziqing Hui 17 Aug '20

17 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Change the array name "convert_dds_format" to "to_be_converted_format" * Put each element in array on a single line. dlls/d3dx10_43/d3dx10_43_main.c | 26 +++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 25 insertions(+), 3 deletions(-)

2 1

[PATCH] vbscript: Implement Split.
by Robert Wilhelm 16 Aug '20

16 Aug '20

1 0

[PATCH 3/3] xactengine2_10: Add new dll.
by Vijay Kiran Kamuju 16 Aug '20

16 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] include: Add xact.h
by Vijay Kiran Kamuju 16 Aug '20

16 Aug '20

Differentiate interface changes between xactengine2_x dll versions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 16 Aug '20

16 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

Wine staging 5.15 release
by Alistair Leslie-Hughes 15 Aug '20

15 Aug '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.14 (670 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * xactengine: IXACT3Engine Initialize return valid error code. * fsutil: Add fsutil program with support for creating hard links. * xactengine: Add support for xactengine3 * xactengine: Support older XACT3Engine interfaces * xactengine: IXACT3Engine CreateSoundBank return correct HRESULT values. * xactengine: unwrap structure based of it's type. * xactengine: Dont cast interface pointers. * xactengine: Correct callback to windows function. * xactengine: Trace FAudio version being used * ole32/tests: Add a bunch of tests for HGLOBAL based IStream::Clone. * ole32: Allow moving a being reallocated block of memory managed by HGLOBAL based IStream. * user32: Implement GetRegisteredRawInputDevices. * dinput8/tests: Add DISCL_EXCLUSIVE / rawinput test. * dinput8: Add support for rawinput based devices. * dinput8: Use rawinput interface for mouse device. * dinput8: Stop using LL hooks for mouse devices. Added: * [49650] winmm: Support relative paths when option media files * [42027] systeminfo: Add basic functionality. * [49692] mfplat: Improved support for multiple video formats. Updated: * programs-findstr Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 1

[PATCH] quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters().
by Zebediah Figura 15 Aug '20

15 Aug '20

Primarily to avoid unnecessarily creating filters like the VMR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2c32b3bc436..4cef1004bdd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1130,7 +1130,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *middle_sink, IPin *sink, - BOOL render_to_existing, BOOL allow_renderers, unsigned int recursion_depth) + BOOL render_to_existing, unsigned int recursion_depth) { BOOL any = FALSE, all = TRUE; IPin *middle_source, *peer; @@ -1195,7 +1195,7 @@ static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, if (!sink) { - if (all && (any || allow_renderers)) + if (all) return S_OK; if (any) return VFW_S_PARTIAL_RENDER; @@ -1209,7 +1209,7 @@ err: static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *sink, BOOL render_to_existing, - BOOL allow_renderers, unsigned int recursion_depth) + unsigned int recursion_depth) { IEnumPins *sink_enum; IPin *filter_sink; @@ -1223,7 +1223,7 @@ static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, while (IEnumPins_Next(sink_enum, 1, &filter_sink, NULL) == S_OK) { hr = autoplug_through_sink(graph, source, filter, filter_sink, sink, - render_to_existing, allow_renderers, recursion_depth); + render_to_existing, recursion_depth); IPin_Release(filter_sink); if (SUCCEEDED(hr)) { @@ -1271,7 +1271,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter, - sink, render_to_existing, TRUE, recursion_depth))) + sink, render_to_existing, recursion_depth))) return hr; } @@ -1295,8 +1295,9 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, DeleteMediaType(mt); - if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, 0, FALSE, - MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL))) + if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, + 0, FALSE, MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, + render_to_existing, 0, NULL, NULL, NULL))) goto out; while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) @@ -1346,8 +1347,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, continue; } - hr = autoplug_through_filter(graph, source, filter, sink, - render_to_existing, !render_to_existing, recursion_depth); + hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth); if (SUCCEEDED(hr)) { IBaseFilter_Release(filter); -- 2.28.0

1 0