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

[PATCH] winapi_test: Fix a verifying loop on headers, which never finds any type name.
by Serge Gautherie 21 Jul '20

21 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8..784b4c4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -859,8 +859,7 @@ foreach my $test_dir (@test_dirs) { foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name; @@ -874,10 +873,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } } if (!$found) { -- 2.10.0.windows.1

2 1

[PATCH] winapi_test: Remove leftover PUUID_VECTOR from tests.dat.
by Serge Gautherie 21 Jul '20

21 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 02236f06a813a42a08fda5e40a97ba07fae9a712. --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..659fc41 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -999,7 +999,6 @@ PRPC_STUB_FUNCTION PRPC_SYNTAX_IDENTIFIER PSCONTEXT_QUEUE PXMIT_ROUTINE_QUINTUPLE -PUUID_VECTOR RPC_AUTH_IDENTITY_HANDLE RPC_AUTH_KEY_RETRIEVAL_FN RPC_AUTHZ_HANDLE -- 2.10.0.windows.1

2 1

[PATCH 2/5] user32: Trace EnumDisplaySettingsExW() results.
by Zhiyi Zhang 21 Jul '20

21 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 61cd06f6911..14d3778a535 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3440,8 +3440,9 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { WCHAR primary_adapter[CCHDEVICENAME]; + BOOL ret; - TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); if (!lpszDeviceName) { @@ -3451,7 +3452,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, lpszDeviceName = primary_adapter; } - return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + ret = USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + if (ret) + TRACE("device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " + "depth:%ubits orientation:%#x.\n", wine_dbgstr_w(lpszDeviceName), iModeNum, + lpDevMode->u1.s2.dmPosition.x, lpDevMode->u1.s2.dmPosition.y, lpDevMode->dmPelsWidth, + lpDevMode->dmPelsHeight, lpDevMode->dmDisplayFrequency, lpDevMode->dmBitsPerPel, + lpDevMode->u1.s2.dmDisplayOrientation); + else + WARN("Failed to query %s display settings.\n", wine_dbgstr_w(lpszDeviceName)); + return ret; } -- 2.25.1

2 1

[PATCH 1/5] user32: Trace ChangeDisplaySettingsExW() results.
by Zhiyi Zhang 21 Jul '20

21 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c0c3e76db7..61cd06f6911 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3310,12 +3310,18 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND WCHAR primary_adapter[CCHDEVICENAME]; BOOL def_mode = TRUE; DEVMODEW dm; + LONG ret; TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); if (!devname && !devmode) - return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + { + ret = USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Restoring all displays to their registry settings returned %d.\n", ret); + return ret; + } if (!devname && devmode) { @@ -3359,7 +3365,10 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } - return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); + return ret; } -- 2.25.1

2 1

[PATCH 4/5] user32/tests: Add more ChangeDisplaySettings() tests.
by Zhiyi Zhang 21 Jul '20

21 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 63 ++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5d7069591b7..fe763e46b48 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -351,7 +351,7 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te static void test_ChangeDisplaySettingsEx(void) { DPI_AWARENESS_CONTEXT context = NULL; - UINT primary, device, side, mode; + UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; INT count, old_count; @@ -362,6 +362,21 @@ static void test_ChangeDisplaySettingsEx(void) LONG res; int i; + /* Test invalid device names */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + + res = ChangeDisplaySettingsExA("invalid", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY1\\Monitor0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + /* Test dmDriverExtra */ memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -795,43 +810,63 @@ static void test_ChangeDisplaySettingsEx(void) expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ - for (side = 0; side < 4; ++side) + for (test = 0; test < 8; ++test) { - switch (side) + switch (test) { - /* Bottom */ + /* Bottom side with x offset */ case 0: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; + break; + /* Left side with y offset */ + case 1: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; + break; + /* Top side with x offset */ + case 2: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* Right side with y offset */ + case 3: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; + break; + /* Bottom side with the same x */ + case 4: dm2.dmPosition.x = dm.dmPosition.x; dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; break; - /* Left */ - case 1: + /* Left side with the same y */ + case 5: dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; dm2.dmPosition.y = dm.dmPosition.y; break; - /* Top */ - case 2: + /* Top side with the same x */ + case 6: dm2.dmPosition.x = dm.dmPosition.x; dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; break; - /* Right */ - case 3: + /* Right side with the same y */ + case 7: dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; dm2.dmPosition.y = dm.dmPosition.y; break; } res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s side %d returned unexpected %d\n", - devices[1].name, side, res); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s test %d returned unexpected %d\n", + devices[1].name, test, res); if (res != DISP_CHANGE_SUCCESSFUL) { - win_skip("ChangeDisplaySettingsExA %s side %d returned unexpected %d.\n", devices[1].name, side, res); + win_skip("ChangeDisplaySettingsExA %s test %d returned unexpected %d.\n", devices[1].name, test, res); continue; } flush_events(); - expect_dm(dm2, devices[1].name, side); + expect_dm(dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */ -- 2.25.1

1 0

[PATCH 3/5] user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.
by Zhiyi Zhang 21 Jul '20

21 Jul '20

ERROR_INVALID_HANDLE or ERROR_INVALID_MONITOR_HANDLE is from GetMonitorInfo(), not EnumDisplayMonitor(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6e8c9a275d7..5d7069591b7 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1199,6 +1199,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor { MONITORINFOEXA mi, mi2; DEVMODEA old_dm, dm; + DWORD error; INT count; LONG ret; @@ -1235,13 +1236,18 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor if (GetSystemMetrics(SM_CMONITORS) != count - 1) { skip("Failed to detach %s.\n", mi.szDevice); + SetLastError(0xdeadbeef); return TRUE; } /* The monitor handle should be invalid now */ mi2.cbSize = sizeof(mi2); + SetLastError(0xdeadbeef); ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); ok(!ret, "GetMonitorInfoA succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); /* Restore the original display settings */ ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, @@ -1253,6 +1259,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor mi.szDevice, ret); } + SetLastError(0xdeadbeef); return TRUE; } @@ -1276,16 +1283,10 @@ static void test_EnumDisplayMonitors(void) ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0); error = GetLastError(); if (count >= 2) - { todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n"); - todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, - "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); - } else - { ok(ret, "EnumDisplayMonitors failed.\n"); - ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); - } + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); } static void test_QueryDisplayConfig_result(UINT32 flags, -- 2.25.1

1 0

[PATCH 5/7] windowscodecs: Add more formats to get_bytes_per_block_from_format().
by Ziqing Hui 21 Jul '20

21 Jul '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 101 ++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 6 -- 2 files changed, 98 insertions(+), 9 deletions(-)

2 3

[PATCH 1/5] strmbase: Get rid of BaseRendererImpl_Receive().
by Zebediah Figura 21 Jul '20

21 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 142 ++++++++++++++++++--------------------- include/wine/strmbase.h | 2 - 2 files changed, 66 insertions(+), 78 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f0a747a2ce..bc2d0551fe3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -169,7 +169,72 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSample *sample) { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); - return BaseRendererImpl_Receive(filter, sample); + REFERENCE_TIME start, stop; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + if (filter->eos || filter->sink.flushing) + return S_FALSE; + + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (IMediaSample_GetMediaType(sample, &mt) == S_OK) + { + TRACE("Format change.\n"); + strmbase_dump_media_type(mt); + + if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + return VFW_E_TYPE_NOT_ACCEPTED; + DeleteMediaType(mt); + } + + EnterCriticalSection(&filter->csRenderLock); + if (filter->filter.state == State_Paused) + SetEvent(filter->state_event); + + if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + REFERENCE_TIME now; + DWORD_PTR cookie; + + strmbase_passthrough_update_time(&filter->passthrough, start); + + IReferenceClock_GetTime(filter->filter.clock, &now); + + if (now - filter->stream_start - start <= -10000) + { + HANDLE handles[2] = {filter->advise_event, filter->flush_event}; + DWORD ret; + + IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, + start, (HEVENT)filter->advise_event, &cookie); + + LeaveCriticalSection(&filter->csRenderLock); + + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(filter->filter.clock, cookie); + + if (ret == 1) + { + TRACE("Flush signaled; discarding current sample.\n"); + return S_OK; + } + + EnterCriticalSection(&filter->csRenderLock); + } + } + else + start = stop = -1; + + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + QualityControlRender_DoQOS(&filter->qc); + + LeaveCriticalSection(&filter->csRenderLock); + + return hr; } static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) @@ -267,81 +332,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_filter_cleanup(&filter->filter); } -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) -{ - REFERENCE_TIME start, stop; - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - TRACE("(%p)->%p\n", This, pSample); - - if (This->eos || This->sink.flushing) - return S_FALSE; - - if (This->filter.state == State_Stopped) - return VFW_E_WRONG_STATE; - - if (IMediaSample_GetMediaType(pSample, &pmt) == S_OK) - { - TRACE("Format change.\n"); - strmbase_dump_media_type(pmt); - - if (FAILED(This->pFuncsTable->pfnCheckMediaType(This, pmt))) - { - return VFW_E_TYPE_NOT_ACCEPTED; - } - DeleteMediaType(pmt); - } - - EnterCriticalSection(&This->csRenderLock); - if (This->filter.state == State_Paused) - SetEvent(This->state_event); - - /* Wait for render Time */ - if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) - { - REFERENCE_TIME now; - DWORD_PTR cookie; - - strmbase_passthrough_update_time(&This->passthrough, start); - - IReferenceClock_GetTime(This->filter.clock, &now); - - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; - - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); - - LeaveCriticalSection(&This->csRenderLock); - - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); - - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } - - EnterCriticalSection(&This->csRenderLock); - } - } - else - start = stop = -1; - - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - QualityControlRender_DoQOS(&This->qc); - - LeaveCriticalSection(&This->csRenderLock); - - return hr; -} - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9e0d4e7d479..24bb97702b5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -334,8 +334,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter); -- 2.27.0

2 5

Interop with custom clipboard format
by Gabriel Kind 21 Jul '20

21 Jul '20

Hello, I want to interop with a Windows Application that uses a custom clipboard format in SetClipboardData. Is it possible to access this custom format from X11? 01a4:trace:clipboard:SetClipboardData 024b 0x1a45fba I use "xclip -selection clipboard -o -t TARGETS" and it only lists me TARGETS MULTIPLE <- This one is empty TIMESTAMP <- this is 0 As a workaround I could create a small Windows application for IPC with my Linux program to Get/Set this format but maybe there is a simpler way? :) Bye Gabriel

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.148.
by Liam Middlebrook 20 Jul '20

20 Jul '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Arthur Huillet <ahuillet(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 04b263e3e4..dd86016117 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.145" +VK_XML_VERSION = "1.2.148" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

2 1