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

[PATCH 1/3] mfplat: Remove extra critical section used in sample implementation.
by Nikolay Sivov 06 Mar '20

06 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 55 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 03037590ec..8e54a538f6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,6 @@ struct sample size_t buffer_count; size_t capacity; DWORD flags; - CRITICAL_SECTION cs; DWORD prop_flags; LONGLONG duration; LONGLONG timestamp; @@ -281,7 +280,6 @@ static ULONG WINAPI sample_Release(IMFSample *iface) for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); clear_attributes_object(&sample->attributes); - DeleteCriticalSection(&sample->cs); heap_free(sample->buffers); heap_free(sample); } @@ -566,9 +564,9 @@ static HRESULT WINAPI sample_GetSampleFlags(IMFSample *iface, DWORD *flags) TRACE("%p, %p.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *flags = sample->flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -579,9 +577,9 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) TRACE("%p, %#x.\n", iface, flags); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->flags = flags; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -593,12 +591,12 @@ static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp TRACE("%p, %p.\n", iface, timestamp); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) *timestamp = sample->timestamp; else hr = MF_E_NO_SAMPLE_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -609,10 +607,10 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -624,12 +622,12 @@ static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *durat TRACE("%p, %p.\n", iface, duration); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) *duration = sample->duration; else hr = MF_E_NO_SAMPLE_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -640,10 +638,10 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -657,9 +655,9 @@ static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) if (!count) return E_INVALIDARG; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); *count = sample->buffer_count; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -671,7 +669,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF TRACE("%p, %u, %p.\n", iface, index, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { *buffer = sample->buffers[index]; @@ -679,7 +677,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -691,7 +689,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (sample->buffer_count == 0) hr = E_UNEXPECTED; @@ -706,7 +704,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi hr = E_NOTIMPL; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -718,7 +716,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) TRACE("%p, %p.\n", iface, buffer); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (!mf_array_reserve((void **)&sample->buffers, &sample->capacity, sample->buffer_count + 1, sizeof(*sample->buffers))) hr = E_OUTOFMEMORY; @@ -727,7 +725,7 @@ static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) sample->buffers[sample->buffer_count++] = buffer; IMFMediaBuffer_AddRef(buffer); } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -739,7 +737,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) TRACE("%p, %u.\n", iface, index); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) { IMFMediaBuffer_Release(sample->buffers[index]); @@ -752,7 +750,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) } else hr = E_INVALIDARG; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return hr; } @@ -764,11 +762,11 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) TRACE("%p.\n", iface); - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); sample->buffer_count = 0; - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -783,13 +781,13 @@ static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_lengt *total_length = 0; - EnterCriticalSection(&sample->cs); + EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) { if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) *total_length += length; } - LeaveCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->attributes.cs); return S_OK; } @@ -873,7 +871,6 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) } object->IMFSample_iface.lpVtbl = &samplevtbl; - InitializeCriticalSection(&object->cs); *sample = &object->IMFSample_iface; -- 2.25.1

1 2

[PATCH] windowscodecs: Fix compile for macos
by Alistair Leslie-Hughes 06 Mar '20

06 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 8194bc508a..e15332107e 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -401,7 +401,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - &GUID_WICPixelFormat32bppBGRA, 32, This->size, This->size); + &GUID_WICPixelFormat32bppBGRA, 32, TRUE, This->size, This->size); } return hr; -- 2.25.1

2 1

[PATCH] urlmon: Add URLOpenPullStreamW() stub.
by Jacek Caban 06 Mar '20

06 Mar '20

From: Aaro Altonen <a.altonen(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47535 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/umstream.c | 7 +++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH] wineconsole: Handle properly maximized window.
by Roman Pišl 06 Mar '20

06 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48706 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 5cc405d5b7..212c65cee4 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1437,7 +1437,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data) RegisterClassW(&wndclass); data->hWnd = CreateWindowW(wndclass.lpszClassName, NULL, - WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, + WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_HSCROLL|WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); if (!data->hWnd) return init_not_supported; -- 2.20.1

1 0

[PATCH 2/2] kernelbase/tests: Add test of assembly path of manifest embedded in exe module.
by Jacek Caban 06 Mar '20

06 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I put it in kernelbase tests instead of kernel32 to be able to test a manifest in main exe module without affecting existing actctx tests. dlls/kernelbase/tests/Makefile.in | 3 +++ dlls/kernelbase/tests/path.c | 21 +++++++++++++++++++++ dlls/kernelbase/tests/rsrc.rc | 22 ++++++++++++++++++++++ dlls/kernelbase/tests/test.manifest | 6 ++++++ 4 files changed, 52 insertions(+) create mode 100644 dlls/kernelbase/tests/rsrc.rc create mode 100644 dlls/kernelbase/tests/test.manifest

1 0

[PATCH 1/2] ntdll: Use module path as assembly path for manifests embedded in resources.
by Jacek Caban 06 Mar '20

06 Mar '20

Fixes Office 2016 installer, which removes its .exe directory from load path, but expects to be able to load files listed in manifest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/actctx.c | 61 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-)

1 0

[PATCH v2] dnsapi/tests: Add some DnsQuery tests.
by Dmitry Timoshkov 06 Mar '20

06 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dnsapi/tests/Makefile.in | 5 +- dlls/dnsapi/tests/query.c | 115 ++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 dlls/dnsapi/tests/query.c diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 14c8f30fd1..2c48bcec36 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi +IMPORTS = dnsapi ws2_32 C_SRCS = \ cache.c \ name.c \ - record.c + record.c \ + query.c diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c new file mode 100644 index 0000000000..5ec5181bd0 --- /dev/null +++ b/dlls/dnsapi/tests/query.c @@ -0,0 +1,115 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" +#include "winsock2.h" +#include "ws2ipdef.h" + +#include "wine/test.h" + +#define NS_MAXDNAME 1025 + +static void test_DnsQuery(void) +{ + WCHAR domain[MAX_PATH]; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + DNS_STATUS status; + + wcscpy(domain, L"_ldap._tcp.deadbeef"); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + + wcscpy(domain, L"_ldap._tcp.dc._msdcs."); + size = ARRAY_SIZE(domain) - wcslen(domain); + ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size); + ok(ret, "GetComputerNameEx error %u\n", GetLastError()); + if (!size) + { + skip("computer is not in a domain\n"); + return; + } + + status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + trace("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), status); + if (status != ERROR_SUCCESS) + { + skip("domain %s doesn't have an SRV entry\n", wine_dbgstr_w(domain)); + return; + } + + trace("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + wcsncpy(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + status = DnsQuery_W(name, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + WCHAR buf[IP4_ADDRESS_STRING_LENGTH]; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + + /* IPv6 */ + status = DnsQuery_W(name, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + WCHAR buf[IP6_ADDRESS_STRING_LENGTH]; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } +} + +START_TEST(query) +{ + WSADATA data; + + WSAStartup(MAKEWORD(2, 2), &data); + + test_DnsQuery(); +} -- 2.20.1

2 1

[PATCH 3/5] wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode().
by Zhiyi Zhang 06 Mar '20

06 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 4 ++-- dlls/wined3d/directx.c | 31 +++++++++++++------------------ dlls/wined3d/swapchain.c | 31 ++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9f51cd2ca6f..4d4a9d7114f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -683,7 +683,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) return DDERR_NOEXCLUSIVEMODE; } - if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, NULL))) + if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, NULL))) ddraw->flags &= ~DDRAW_RESTORE_MODE; InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); @@ -1104,7 +1104,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW /* TODO: The possible return values from msdn suggest that the screen mode * can't be changed if a surface is locked or some drawing is in progress. */ - if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, &mode))) { if (ddraw->primary) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f873ed56b2a..fb43e46ee5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1209,12 +1209,12 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out * that GetDisplayMode still returns 24 bpp. This should probably be * handled in winex11 instead. */ - if (adapter->screen_format && adapter->screen_format != mode->format_id) + if (adapter->outputs[0].screen_format && adapter->outputs[0].screen_format != mode->format_id) { WARN("Overriding format %s with stored format %s.\n", debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->screen_format)); - mode->format_id = adapter->screen_format; + debug_d3dformat(adapter->outputs[0].screen_format)); + mode->format_id = adapter->outputs[0].screen_format; } if (!(m.dmFields & DM_DISPLAYFLAGS)) @@ -1253,20 +1253,15 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI return WINED3D_OK; } -HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, - UINT adapter_idx, const struct wined3d_display_mode *mode) +HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, + const struct wined3d_display_mode *mode) { - struct wined3d_adapter *adapter; DEVMODEW new_mode, current_mode; RECT clip_rc; LONG ret; enum wined3d_format_id new_format_id; - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - adapter = wined3d->adapters[adapter_idx]; + TRACE("output %p, mode %p.\n", output, mode); memset(&new_mode, 0, sizeof(new_mode)); new_mode.dmSize = sizeof(new_mode); @@ -1279,7 +1274,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, TRACE("mode %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id), mode->scanline_ordering); - format = wined3d_get_format(adapter, mode->format_id, WINED3D_BIND_RENDER_TARGET); + format = wined3d_get_format(output->adapter, mode->format_id, WINED3D_BIND_RENDER_TARGET); new_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; new_mode.dmBitsPerPel = format->byte_count * CHAR_BIT; @@ -1300,7 +1295,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if (!EnumDisplaySettingsW(adapter->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(output->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -1309,7 +1304,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Only change the mode if necessary. */ - if (!EnumDisplaySettingsW(adapter->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) + if (!EnumDisplaySettingsW(output->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) { ERR("Failed to get current display mode.\n"); } @@ -1322,11 +1317,11 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); - adapter->screen_format = new_format_id; + output->screen_format = new_format_id; return WINED3D_OK; } - ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(output->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { if (new_mode.dmFields & DM_DISPLAYFREQUENCY) @@ -1334,14 +1329,14 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); new_mode.dmFields &= ~DM_DISPLAYFREQUENCY; new_mode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(output->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); } if (ret != DISP_CHANGE_SUCCESSFUL) return WINED3DERR_NOTAVAILABLE; } /* Store the new values. */ - adapter->screen_format = new_format_id; + output->screen_format = new_format_id; /* And finally clip mouse to our screen. */ SetRect(&clip_rc, 0, 0, new_mode.dmPelsWidth, new_mode.dmPelsHeight); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 65935a61650..720a82f9b32 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -29,7 +29,8 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { - HRESULT hr; + struct wined3d_output *output; + HRESULT hr = E_FAIL; UINT i; TRACE("Destroying swapchain %p.\n", swapchain); @@ -71,8 +72,9 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { if (swapchain->state.desc.auto_restore_display_mode) { - if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &swapchain->state.original_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + &swapchain->state.original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) @@ -856,8 +858,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_swapchain_ops *swapchain_ops) { - const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc texture_desc; + struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; RECT client_rect; @@ -964,8 +966,9 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (!desc->windowed && desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { /* Change the display settings */ - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, - adapter->ordinal, &swapchain->state.d3d_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + &swapchain->state.d3d_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); goto err; @@ -1048,8 +1051,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc err: if (displaymode_set) { - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - adapter->ordinal, &swapchain->state.original_mode))) + if (!output || FAILED(wined3d_output_set_display_mode(output, + &swapchain->state.original_mode))) ERR("Failed to restore display mode.\n"); ClipCursor(NULL); } @@ -1261,6 +1264,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; unsigned int screensaver_active; + struct wined3d_output *output; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1292,8 +1296,9 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, &swapchain->state.d3d_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(wined3d_output_set_display_mode(output, + &swapchain->state.d3d_mode))) ERR("Failed to set display mode.\n"); } @@ -1308,8 +1313,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa device->restore_screensaver = FALSE; } - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, NULL))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(wined3d_output_set_display_mode(output, NULL))) ERR("Failed to set display mode.\n"); swapchain->reapply_mode = TRUE; @@ -1442,7 +1447,7 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) + if (FAILED(hr = wined3d_output_set_display_mode(output, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2dbb394444d..b83adbaa8f3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -20,7 +20,6 @@ @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) -@ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) @ cdecl wined3d_adapter_get_output(ptr long) @@ -162,6 +161,7 @@ @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) +@ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23540295bb4..6e6634e4f48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2900,6 +2900,7 @@ struct wined3d_output { WCHAR device_name[CCHDEVICENAME]; struct wined3d_adapter *adapter; + enum wined3d_format_id screen_format; D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; @@ -2911,7 +2912,6 @@ struct wined3d_adapter { unsigned int ordinal; POINT monitor_position; - enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b14db420838..f62375e539e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2277,8 +2277,6 @@ ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, struct wined3d_device *device, unsigned int flags); -HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, - UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, @@ -2502,6 +2500,8 @@ HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, -- 2.20.1

2 1

[tools] testbot: Ignore replies to patch series.
by Francois Gouget 06 Mar '20

06 Mar '20

Except for part 1, replies to patch series cannot be tested even if they contain a patch: - They must not take the place of the original patch series part. - They are likely to arrive long after the patch series has been completed, by which time the TestBot no longer has access to the patch series parts. - They must not cause the TestBot to open a new patch series waiting for the other parts. So ignore replies to patch series, except for replies to part 1 which are treated as regular patches. With this patch, when a collision happens, we know it's not because of a reply so adjust the corresponding patch disposition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 35 ++++++++++++++------- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a76c35fd48..7cd780e5e0 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -542,10 +542,31 @@ sub NewPatch($$$) } my $ErrMessage; - if (scalar(@PatchBodies) == 1) + my $SubjectInfo = $Patch->ParseSubject(); + if (@PatchBodies == 0) { - my $SubjectInfo = $Patch->ParseSubject(); - $Patch->Disposition($SubjectInfo->{PartNo} ? "Checking series" : "Checking patch"); + $Patch->Disposition("No patch found"); + } + elsif (@PatchBodies > 1) + { + $Patch->Disposition("Message contains multiple patches"); + } + elsif ($SubjectInfo->{Re} and ($SubjectInfo->{PartNo} || 0) > 1) + { + # Except for part 1, replies to patch series cannot be tested even if + # they contain a patch: + # - They must not take the place of the original patch series part. + # - They are likely to arrive long after the patch series has been + # completed, by which time the TestBot no longer has access to the + # patch series parts. + # - They must not trigger the creation of a new PendingPatchSet object. + $Patch->Disposition("Reply to a patch series"); + } + else + { + # Treat replies to patch series part 1 as regular patches + $SubjectInfo->{PartNo} = undef if ($SubjectInfo->{Re}); + $Patch->Disposition("Checking ". ($SubjectInfo->{PartNo} ? "series" : "patch")); (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (!defined $ErrMessage) @@ -555,14 +576,6 @@ sub NewPatch($$$) $Patch->Submit($PatchBodies[0]->path, $SubjectInfo); } } - elsif (scalar(@PatchBodies) == 0) - { - $Patch->Disposition("No patch found"); - } - else - { - $Patch->Disposition("Message contains multiple patches"); - } foreach my $PatchBody (@PatchBodies) { diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 8f5b470542..9e386af588 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -245,7 +245,7 @@ sub NewSubmission($$$) my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); if ($Part) { - $Patch->Disposition("Existing part reply / collision"); + $Patch->Disposition("Patch series collision"); return undef; } -- 2.20.1

1 0

[tools] testbot: Tweak placement of 'Re:' in the Job title.
by Francois Gouget 06 Mar '20

06 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This moves it back to where it was before the ParseSubject() patch. testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 7cd780e5e0..54b6c5e49c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,7 @@ sub Submit($$;$) my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Remarks = "[$PatchesMailingList] "; # Keep Re because it's similar to a version - $Remarks = "$SubjectInfo->{Re} $Remarks" if ($SubjectInfo->{Re}); + $Remarks .= "$SubjectInfo->{Re} " if ($SubjectInfo->{Re}); $Remarks .= "$SubjectInfo->{Domain} " if ($SubjectInfo->{Domain}); $Remarks .= "v$SubjectInfo->{Version} " if ($SubjectInfo->{Version}); $Remarks .= $SubjectInfo->{Title}; -- 2.20.1

1 0