- Wine-Devel - list.winehq.org

[PATCH resend v2 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks Jan. 27, 2021

Jan. 27, 2021

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 39 +++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

1 1

[PATCH 2/3] mshtml: Implement IHTMLCSSStyleDeclaration2::animation property.
by Jacek Caban Jan. 27, 2021

Jan. 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)

1 0

[PATCH v2] msvcrt: Fix reading BOM-less files opened with ccs=unicode
by Piotr Caban Jan. 27, 2021

Jan. 27, 2021

From: Martin Storsjo <martin(a)martin.st> This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - changed the implementation so internal fd->exflag value is correct - removed C++ style comments dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-)

1 0

[PATCH] ntdll: Exclude lldiv variants from relay tracing.
by Dmitry Timoshkov Jan. 27, 2021

Jan. 27, 2021

Similar to 9be8c5255bb2c02467373bf373b6eefcfb0337ac. Otherwise ucrtbase initialization code crashes with +relay enabled when compiled with clang as a PE build. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9f7bfae76d..4b3d3d09b8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1450,7 +1450,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __toascii(long) -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) @ cdecl -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @@ -1458,7 +1458,7 @@ @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -- 2.29.2

3 4

[PATCH 1/2] mf/sar: Release pending items when audio client is released.
by Nikolay Sivov Jan. 27, 2021

Jan. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e318576e80e..d839cba90f1 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -228,7 +228,13 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { + struct queued_object *obj, *obj2; + MFCancelWorkItem(renderer->buffer_ready_key); + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) + { + release_pending_object(obj); + } renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -253,7 +259,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - struct queued_object *obj, *obj2; TRACE("%p, refcount %u.\n", iface, refcount); @@ -273,10 +278,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) IMFMediaType_Release(renderer->current_media_type); audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) - { - release_pending_object(obj); - } DeleteCriticalSection(&renderer->cs); heap_free(renderer); } -- 2.29.2

1 1

[PATCH 1/2] mfmediaengine: Add partial implementation of a time range object.
by Nikolay Sivov Jan. 27, 2021

Jan. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 212 ++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 98 +++++++++++ 2 files changed, 307 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5981548c9f8..0573ea844c1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -34,6 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -106,6 +133,27 @@ struct media_engine CRITICAL_SECTION cs; }; +struct range +{ + double start; + double end; +}; + +struct time_range +{ + IMFMediaTimeRange IMFMediaTimeRange_iface; + LONG refcount; + + struct range *ranges; + size_t count; + size_t capacity; +}; + +static struct time_range *impl_from_IMFMediaTimeRange(IMFMediaTimeRange *iface) +{ + return CONTAINING_RECORD(iface, struct time_range, IMFMediaTimeRange_iface); +} + struct media_error { IMFMediaError IMFMediaError_iface; @@ -226,6 +274,164 @@ static HRESULT create_media_error(IMFMediaError **ret) return S_OK; } +static HRESULT WINAPI time_range_QueryInterface(IMFMediaTimeRange *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTimeRange) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTimeRange_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI time_range_AddRef(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedIncrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedDecrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(range->ranges); + heap_free(range); + } + + return refcount; +} + +static DWORD WINAPI time_range_GetLength(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + return range->count; +} + +static HRESULT WINAPI time_range_GetStart(IMFMediaTimeRange *iface, DWORD idx, double *start) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, start); + + if (idx >= range->count) + return E_INVALIDARG; + + *start = range->ranges[idx].start; + + return S_OK; +} + +static HRESULT WINAPI time_range_GetEnd(IMFMediaTimeRange *iface, DWORD idx, double *end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, end); + + if (idx >= range->count) + return E_INVALIDARG; + + *end = range->ranges[idx].end; + + return S_OK; +} + +static BOOL WINAPI time_range_ContainsTime(IMFMediaTimeRange *iface, double time) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + size_t i; + + TRACE("%p, %.8e.\n", iface, time); + + for (i = 0; i < range->count; ++i) + { + if (time >= range->ranges[i].start && time <= range->ranges[i].end) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI time_range_AddRange(IMFMediaTimeRange *iface, double start, double end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %.8e, %.8e.\n", iface, start, end); + + if (range->count) + { + FIXME("Range merging is not implemented.\n"); + return E_NOTIMPL; + } + + if (!mf_array_reserve((void **)&range->ranges, &range->capacity, range->count + 1, sizeof(*range->ranges))) + return E_OUTOFMEMORY; + + range->ranges[range->count].start = start; + range->ranges[range->count].end = end; + range->count++; + + return S_OK; +} + +static HRESULT WINAPI time_range_Clear(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + range->count = 0; + + return S_OK; +} + +static const IMFMediaTimeRangeVtbl time_range_vtbl = +{ + time_range_QueryInterface, + time_range_AddRef, + time_range_Release, + time_range_GetLength, + time_range_GetStart, + time_range_GetEnd, + time_range_ContainsTime, + time_range_AddRange, + time_range_Clear, +}; + +static HRESULT create_time_range(IMFMediaTimeRange **range) +{ + struct time_range *object; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTimeRange_iface.lpVtbl = &time_range_vtbl; + object->refcount = 1; + + *range = &object->IMFMediaTimeRange_iface; + + return S_OK; +} + static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) { if (value) @@ -1718,11 +1924,11 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, - IMFMediaTimeRange **range) + IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, range); + TRACE("%p, %p.\n", iface, range); - return E_NOTIMPL; + return create_time_range(range); } static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f9f8fed4a74..1cc88420568 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -590,6 +590,103 @@ static void test_error(void) IMFMediaError_Release(eo); } +static void test_time_range(void) +{ + IMFMediaTimeRange *range; + double start, end; + DWORD count; + HRESULT hr; + BOOL ret; + + hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Empty ranges. */ + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaTimeRange_ContainsTime(range, 10.0); + ok(!ret, "Unexpected return value %d.\n", ret); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Add a range. */ + hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 1.0, "Unexpected end %.e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); +todo_wine + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + start = 0.0; + hr = IMFMediaTimeRange_GetStart(range, 1, &start); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.8e.\n", start); +} + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.0, "Unexpected end %.8e.\n", end); +} + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + IMFMediaTimeRange_Release(range); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -617,6 +714,7 @@ START_TEST(mfmediaengine) test_playback_rate(); test_mute(); test_error(); + test_time_range(); IMFMediaEngineClassFactory_Release(factory); -- 2.29.2

1 1

[PATCH v2 3/3] gdi32: Report real VREFRESH values for GetDeviceCaps() with display DCs.
by Zhiyi Zhang Jan. 27, 2021

Jan. 27, 2021

Even though MSDN says 0 and 1 are both valid and they represent the default refresh rate of display hardware. Some games rely on the value being the real refresh rate and use it to cap frame rates. Fix an issue that Sakuna: Of Rice and Ruin reports monitors of 1Hz and cap to 1fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 25 ++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb98c554238..e146a3a4f85 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -82,6 +82,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); +static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); @@ -245,6 +246,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); + pEnumDisplaySettingsW = (void *)GetProcAddress( user32, "EnumDisplaySettingsW" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } @@ -471,7 +473,28 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case PHYSICALOFFSETY: return 0; case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; - case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; + case VREFRESH: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) != DT_RASDISPLAY) + return 0; + + if (pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + display = dc->display[0] ? dc->display : NULL; + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode )) + return devmode.dmDisplayFrequency ? devmode.dmDisplayFrequency : 1; + } + + return 1; + } case DESKTOPHORZRES: if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 08557867566..58b3f0d5e0c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2020,7 +2020,7 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); } -- 2.27.0

2 1

[PATCH v2 2/3] gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor.
by Zhiyi Zhang Jan. 27, 2021

Jan. 27, 2021

Fix DLC Quest uses the primary monitor size to render when in fullscreen mode on non-primary monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 18 +++++++++++ dlls/gdi32/driver.c | 64 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/gdi_private.h | 4 +++ dlls/user32/tests/monitor.c | 4 +-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a9a37d9efe7..830fabf6e78 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -623,6 +623,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) { + const WCHAR *display, *p; HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; @@ -663,6 +664,23 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } } + if (is_display_device( driver )) + display = driver; + else if (is_display_device( device )) + display = device; + else + display = NULL; + + if (display) + { + /* Copy only the display name. For example, \\.\DISPLAY1 in \\.\DISPLAY1\Monitor0 */ + p = display + 12; + while (iswdigit( *p )) + ++p; + lstrcpynW( dc->display, display, p - display + 1 ); + dc->display[p - display] = '\0'; + } + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e2528ece046..bb98c554238 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -81,7 +81,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); static HWND (WINAPI *pGetDesktopWindow)(void); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -137,10 +139,13 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * is_display_device */ -static BOOL is_display_device( LPCWSTR name ) +BOOL is_display_device( LPCWSTR name ) { const WCHAR *p = name; + if (!name) + return FALSE; + if (wcsnicmp( name, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) return FALSE; p += lstrlenW(L"\\\\.\\DISPLAY"); @@ -237,10 +242,33 @@ void CDECL __wine_set_display_driver( HMODULE module ) HeapFree( GetProcessHeap(), 0, driver ); user32 = LoadLibraryA( "user32.dll" ); + pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); + pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } +struct monitor_info +{ + const WCHAR *name; + RECT rect; +}; + +static BOOL CALLBACK monitor_enum_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + MONITORINFOEXW mi; + + mi.cbSize = sizeof(mi); + pGetMonitorInfoW( monitor, (MONITORINFO *)&mi ); + if (!lstrcmpiW( info->name, mi.szDevice )) + { + info->rect = mi.rcMonitor; + return FALSE; + } + + return TRUE; +} static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) { @@ -378,8 +406,38 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); - case HORZRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; - case VERTRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + case HORZRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.right - info.rect.left; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; + } + case VERTRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.bottom - info.rect.top; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + } case BITSPIXEL: return 32; case PLANES: return 1; case NUMBRUSHES: return -1; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8d917a795c0..2bf16e8eaf8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,6 +84,7 @@ typedef struct tagDC int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; + WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; DWORD layout; @@ -487,6 +488,9 @@ typedef struct #define WMFC_MAGIC 0x43464d57 +/* driver.c */ +extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ee435a4faf4..08557867566 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2085,7 +2085,7 @@ static void test_display_dc(void) hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); - check_display_dc(hdc, &dm, TRUE); + check_display_dc(hdc, &dm, FALSE); /* Tests after mode changes */ memset(&dm2, 0, sizeof(dm2)); @@ -2108,7 +2108,7 @@ static void test_display_dc(void) continue; } - check_display_dc(hdc, &dm2, TRUE); + check_display_dc(hdc, &dm2, FALSE); /* Tests after monitor detach */ if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) -- 2.27.0

2 1

[PATCH v2 1/3] user32/tests: Add display DC tests.
by Zhiyi Zhang Jan. 27, 2021

Jan. 27, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Move tests to user32 and simplify them. Supersede 198367~198369. The newly added tests are still in a separate function because there are more tests coming that rely on the same tests setup. dlls/user32/tests/monitor.c | 156 ++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e4cc9d154f..ee435a4faf4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1992,6 +1992,161 @@ static void test_handles(void) ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); } +#define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) +static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) +{ + INT value; + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected HORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(allow_todo && dm->dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected VERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm->dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected DESKTOPHORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm->dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected DESKTOPVERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", + dm->dmDisplayFrequency, value); +} + +static void test_display_dc(void) +{ + DWORD device_idx, mode_idx; + DEVMODEA dm, dm2, dm3; + INT count, old_count; + DISPLAY_DEVICEA dd; + BOOL ret; + LONG res; + HDC hdc; + + /* Test DCs covering the entire virtual screen */ + hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok(!!hdc, "CreateDCA failed.\n"); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + + check_display_dc(hdc, &dm, FALSE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution.\n"); + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + DeleteDC(hdc); + + /* Test DCs covering a specific monitor */ + dd.cb = sizeof(dd); + for (device_idx = 0; EnumDisplayDevicesA(NULL, device_idx, &dd, 0); ++device_idx) + { + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); + + check_display_dc(hdc, &dm, TRUE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution for %s.\n", dd.DeviceName); + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", dd.DeviceName, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", dd.DeviceName); + DeleteDC(hdc); + continue; + } + + check_display_dc(hdc, &dm2, TRUE); + + /* Tests after monitor detach */ + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm3); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + dm3.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm3.dmPelsWidth = 0; + dm3.dmPelsHeight = 0; + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm3, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(dd.DeviceName, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count - 1, "Expected monitor count %d, got %d.\n", old_count - 1, count); + + /* Should report the same values before detach */ + check_display_dc(hdc, &dm2, TRUE); + } + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + DeleteDC(hdc); + } +} + START_TEST(monitor) { init_function_pointers(); @@ -2002,4 +2157,5 @@ START_TEST(monitor) test_work_area(); test_display_config(); test_handles(); + test_display_dc(); } -- 2.27.0

2 1

[PATCH] iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway.
by Paul Gofman Jan. 27, 2021

Jan. 27, 2021

Fixes hang on attempt to enter a single player game in Kingdoms Reborn. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++-------------- dlls/iphlpapi/tests/iphlpapi.c | 6 ++++++ include/iptypes.h | 3 +++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 81c4992ac73..bd1fea02e19 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -940,16 +940,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; + BOOL output_gateways; + + if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); + if (ret) return ret; + num_v4_gateways = count_v4_gateways(index, routeTable); + } + output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); if (family == WS_AF_INET) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } } else if (family == WS_AF_INET6) { @@ -958,12 +961,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (family == WS_AF_UNSPEC) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); } else @@ -996,7 +993,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; + if (output_gateways) + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -1050,7 +1048,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->Luid.Info.NetLuidIndex = index; aa->Luid.Info.IfType = aa->IfType; - if (num_v4_gateways) + if (output_gateways && num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -1089,6 +1087,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + if (num_v4_gateways) + ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..358084fde68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1277,6 +1277,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { + BOOL dns_eligible_found = FALSE; ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1349,6 +1350,10 @@ static void test_GetAdaptersAddresses(void) S(U(*ua)).Flags, ua->PrefixOrigin, ua->SuffixOrigin, ua->DadState, ua->ValidLifetime, ua->PreferredLifetime, ua->LeaseLifetime, S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); + + if (ua->Flags & IP_ADAPTER_ADDRESS_DNS_ELIGIBLE) + dns_eligible_found = TRUE; + ua = ua->Next; } for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++) @@ -1380,6 +1385,7 @@ static void test_GetAdaptersAddresses(void) ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } } + ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); } diff --git a/include/iptypes.h b/include/iptypes.h index c1a253d7b41..c1ee7322b01 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,6 +94,9 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ +#define IP_ADAPTER_ADDRESS_DNS_ELIGIBLE 0x00000001 +#define IP_ADAPTER_ADDRESS_TRANSIENT 0x00000002 + typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct { -- 2.29.2

1 0