December 2021 - Wine-Commits

Nikolay Sivov : dwrite: Allocate outline buffers on PE side.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 1a8d6f55f245aca47d233607419012f5fcd55b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a8d6f55f245aca47d233607… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:18 2021 +0300 dwrite: Allocate outline buffers on PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 27 +++++++++++++++++++++---- dlls/dwrite/freetype.c | 48 ++++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3d445cddae2..2b9651a906c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -742,7 +742,7 @@ struct font_backend_funcs font_object_handle (CDECL *create_font_object)(const void *data_ptr, UINT64 data_size, unsigned int index); void (CDECL *release_font_object)(font_object_handle object); void (CDECL *notify_release)(void *key); - int (CDECL *get_glyph_outline)(void *key, float em_size, unsigned int simulations, UINT16 glyph, + int (CDECL *get_glyph_outline)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); INT32 (CDECL *get_glyph_advance)(void *key, float em_size, UINT16 index, DWRITE_MEASURING_MODE measuring_mode, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4b135b83d68..20bb6b3159f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -835,12 +835,13 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); D2D1_POINT_2F *origins, baseline_origin = { 0 }; - struct dwrite_outline outline = {{ 0 }}; + struct dwrite_outline outline, outline_size; D2D1_BEZIER_SEGMENT segment; D2D1_POINT_2F point; DWRITE_GLYPH_RUN run; unsigned int i, j, p; HRESULT hr; + int ret; TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, count, is_sideways, is_rtl, sink); @@ -871,14 +872,32 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + memset(&outline_size, 0, sizeof(outline_size)); + memset(&outline, 0, sizeof(outline)); + for (i = 0; i < count; ++i) { outline.tags.count = outline.points.count = 0; - if (font_funcs->get_glyph_outline(iface, emSize, fontface->simulations, glyphs[i], &outline)) + + EnterCriticalSection(&fontface->cs); + if (!(ret = font_funcs->get_glyph_outline(fontface->get_font_object(fontface), emSize, fontface->simulations, + glyphs[i], &outline_size))) { - WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); - continue; + dwrite_array_reserve((void **)&outline.tags.values, &outline.tags.size, outline_size.tags.count, + sizeof(*outline.tags.values)); + dwrite_array_reserve((void **)&outline.points.values, &outline.points.size, outline_size.points.count, + sizeof(*outline.points.values)); + + if ((ret = font_funcs->get_glyph_outline(fontface->get_font_object(fontface), emSize, fontface->simulations, + glyphs[i], &outline))) + { + WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + } } + LeaveCriticalSection(&fontface->cs); + + if (ret) + continue; for (j = 0, p = 0; j < outline.tags.count; ++j) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index b19ae3616bc..503f8b04496 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -318,11 +318,8 @@ static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) { - if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, - sizeof(*outline->tags.values))) - { + if (outline->tags.size < outline->tags.count + 1) return 1; - } outline->tags.values[outline->tags.count++] = tag; @@ -331,11 +328,8 @@ static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char static int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) { - if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, - sizeof(*outline->points.values))) - { + if (outline->points.size < outline->points.count + count) return 1; - } memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); outline->points.count += count; @@ -512,30 +506,25 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -static int CDECL freetype_get_glyph_outline(void *key, float emSize, unsigned int simulations, +static int CDECL freetype_get_glyph_outline(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { - FTC_ScalerRec scaler; + FT_Face face = object; FT_Size size; - int ret; + int ret = 0; - scaler.face_id = key; - scaler.width = emSize; - scaler.height = emSize; - scaler.pixel = 1; - scaler.x_res = 0; - scaler.y_res = 0; + if (!(size = freetype_set_face_size(face, emsize))) + return 0; - RtlEnterCriticalSection(&freetype_cs); - if (!(ret = pFTC_Manager_LookupSize(cache_manager, &scaler, &size))) + if (!pFT_Load_Glyph(face, glyph, FT_LOAD_NO_BITMAP)) { - if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) - { - FT_Outline *ft_outline = &size->face->glyph->outline; - FT_Matrix m; + FT_Outline *ft_outline = &face->glyph->outline; + FT_Matrix m; + if (outline->points.values) + { if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(ft_outline, emSize); + embolden_glyph_outline(ft_outline, emsize); m.xx = 1 << 16; m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; @@ -546,8 +535,15 @@ static int CDECL freetype_get_glyph_outline(void *key, float emSize, unsigned in ret = decompose_outline(ft_outline, outline); } + else + { + /* Intentionally overestimate numbers to keep it simple. */ + outline->points.count = ft_outline->n_points * 3; + outline->tags.count = ft_outline->n_points + ft_outline->n_contours * 2; + } } - RtlLeaveCriticalSection(&freetype_cs); + + pFT_Done_Size(size); return ret; } @@ -856,7 +852,7 @@ static void CDECL null_notify_release(void *key) { } -static int CDECL null_get_glyph_outline(void *key, float emSize, unsigned int simulations, +static int CDECL null_get_glyph_outline(font_object_handle object, float emSize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline) { return 1;

1 0

Jacek Caban : win32u: Move NtUserEnumDisplayMonitors implementation from user32.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 318673405c6296342ef49177de26440f69a4b0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=318673405c6296342ef49177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:13:55 2021 +0100 win32u: Move NtUserEnumDisplayMonitors implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 --- dlls/user32/sysparams.c | 187 ++++--------------------------------------- dlls/user32/user_main.c | 8 ++ dlls/user32/user_private.h | 6 +- dlls/win32u/driver.c | 9 +-- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 71 ++++++++++++++++ dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/wrappers.c | 5 ++ include/ntuser.h | 17 ++++ include/wine/gdi_driver.h | 3 +- 12 files changed, 133 insertions(+), 199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=318673405c6296342ef4…

1 0

Nikolay Sivov : dwrite: Use CRT allocation functions.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 909f7aa7c21f82114586e98a0a9e940b13bc386a URL: https://source.winehq.org/git/wine.git/?a=commit;h=909f7aa7c21f82114586e98a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 15:37:19 2021 +0300 dwrite: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 123 ++++++++-------- dlls/dwrite/bidi.c | 41 +++--- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 337 ++++++++++++++++++++++--------------------- dlls/dwrite/gdiinterop.c | 34 ++--- dlls/dwrite/layout.c | 251 ++++++++++++++++---------------- dlls/dwrite/main.c | 87 ++++++----- dlls/dwrite/opentype.c | 38 ++--- dlls/dwrite/shape.c | 11 +- 9 files changed, 461 insertions(+), 485 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=909f7aa7c21f82114586…

1 0

Jacek Caban : win32u: Move GetMonitorInfo implementation from user32.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 45dcaf02fcd9e929b406854b4b78371bc3886031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45dcaf02fcd9e929b406854b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:13:39 2021 +0100 win32u: Move GetMonitorInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 ------ dlls/user32/sysparams.c | 44 +-------------------------------- dlls/user32/user_private.h | 1 - dlls/win32u/driver.c | 7 ------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++++ include/ntuser.h | 7 ++++++ include/wine/gdi_driver.h | 3 +-- 11 files changed, 75 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45dcaf02fcd9e929b406…

1 0

Jacek Caban : win32u: Handle invisible winstations in lock_display_devices.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: c4b258eff75d54fdc0eb9b1843db5f77318f836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b258eff75d54fdc0eb9b18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:04 2021 +0100 win32u: Handle invisible winstations in lock_display_devices. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 139 ++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 59 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d0eda54cde7..195756acea1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -224,6 +224,17 @@ static struct list monitors = LIST_INIT(monitors); static INT64 last_query_display_time; static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER; +static struct monitor virtual_monitor = +{ + .handle = NULLDRV_DEFAULT_HMONITOR, + .flags = MONITORINFOF_PRIMARY, + .rc_monitor.right = 1024, + .rc_monitor.bottom = 768, + .rc_work.right = 1024, + .rc_work.bottom = 768, + .dev.state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, +}; + static HANDLE get_display_device_init_mutex( void ) { static const WCHAR display_device_initW[] = @@ -1045,6 +1056,32 @@ static void release_display_manager_ctx( struct device_manager_ctx *ctx ) if (ctx->gpu_count) cleanup_devices(); } +static void clear_display_devices(void) +{ + struct adapter *adapter; + struct monitor *monitor; + + if (list_head( &monitors ) == &virtual_monitor.entry) + { + list_init( &monitors ); + return; + } + + while (!list_empty( &monitors )) + { + monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); + list_remove( &monitor->entry ); + free( monitor ); + } + + while (!list_empty( &adapters )) + { + adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); + list_remove( &adapter->entry ); + free( adapter ); + } +} + static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, monitor_count = 0, size; @@ -1069,19 +1106,7 @@ static BOOL update_display_cache_from_registry(void) mutex = get_display_device_init_mutex(); pthread_mutex_lock( &display_lock ); - while (!list_empty( &monitors )) - { - monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); - list_remove( &monitor->entry ); - free( monitor ); - } - - while (!list_empty( &adapters )) - { - adapter = LIST_ENTRY( list_head( &adapters ), struct adapter, entry ); - list_remove( &adapter->entry ); - free( adapter ); - } + clear_display_devices(); for (adapter_id = 0;; adapter_id++) { @@ -1161,8 +1186,27 @@ static BOOL update_display_cache(void) static BOOL lock_display_devices(void) { - if (!update_display_cache()) return FALSE; + USEROBJECTFLAGS flags; + HWINSTA winstation; + pthread_mutex_lock( &display_lock ); + + /* Report physical monitor information only if window station has visible display surfaces */ + winstation = NtUserGetProcessWindowStation(); + if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && + (flags.dwFlags & WSF_VISIBLE)) + { + pthread_mutex_unlock( &display_lock ); + if (!update_display_cache()) return FALSE; + pthread_mutex_lock( &display_lock ); + } + else + { + clear_display_devices(); + list_add_tail( &monitors, &virtual_monitor.entry ); + last_query_display_time = 0; + } + return TRUE; } @@ -1334,46 +1378,30 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc struct monitor_enum_info enum_buf[8], *enum_info = enum_buf; struct enum_display_monitor_params params; struct monitor *monitor; - ULONG count = 0, i; - USEROBJECTFLAGS flags; - HWINSTA winstation; + unsigned int count = 0, i; BOOL ret = TRUE; - /* Report physical monitor information only if window station has visible display surfaces */ - winstation = NtUserGetProcessWindowStation(); - if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && - (flags.dwFlags & WSF_VISIBLE)) - { - if (!lock_display_devices()) return FALSE; - - count = list_count( &monitors ); - if (!count || (count > ARRAYSIZE(enum_buf) && - !(enum_info = malloc( count * sizeof(*enum_info) )))) - { - unlock_display_devices(); - return FALSE; - } - - count = 0; - LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) - { - if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - enum_info[count].handle = monitor->handle; - enum_info[count].rect = monitor->rc_monitor; - count++; - } + if (!lock_display_devices()) return FALSE; + count = list_count( &monitors ); + if (!count || (count > ARRAYSIZE(enum_buf) && + !(enum_info = malloc( count * sizeof(*enum_info) )))) + { unlock_display_devices(); - if (!count) return FALSE; + return FALSE; } - else + + count = 0; + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if (!(enum_info = malloc( sizeof(*enum_info) ))) return FALSE; - enum_info->handle = NULLDRV_DEFAULT_HMONITOR; - SetRect( &enum_info->rect, 0, 0, 1024, 768 ); - count = 1; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + enum_info[count].handle = monitor->handle; + enum_info[count].rect = monitor->rc_monitor; + count++; } + unlock_display_devices(); + params.proc = proc; params.hdc = hdc; params.lparam = lparam; @@ -1397,18 +1425,6 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; - /* Fallback to report one monitor */ - if (handle == NULLDRV_DEFAULT_HMONITOR) - { - RECT default_rect = {0, 0, 1024, 768}; - info->rcMonitor = default_rect; - info->rcWork = default_rect; - info->dwFlags = MONITORINFOF_PRIMARY; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); - return TRUE; - } - if (!lock_display_devices()) return FALSE; LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) @@ -1421,7 +1437,12 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) info->rcWork = monitor->rc_work; info->dwFlags = monitor->flags; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + { + if (monitor->adapter) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitor->adapter->dev.device_name ); + else + asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); + } unlock_display_devices(); return TRUE; }

1 0

Jacek Caban : win32u: Introduce get_virtual_screen_rect.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 8731afe70f2e6efb5576604c502798e71921f96c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8731afe70f2e6efb5576604c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 01:14:12 2021 +0100 win32u: Introduce get_virtual_screen_rect. And use it in nulldrv_GetDeviceCaps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 20 ++++++-------------- dlls/win32u/ntgdi_private.h | 24 ++++++++++++++++++++++++ dlls/win32u/sysparams.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 3 ++- dlls/win32u/wrappers.c | 9 --------- 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 881e11116df..03594aa58d0 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -331,25 +331,17 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return 1; } case DESKTOPHORZRES: - if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && user_callbacks) + if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { - DPI_AWARENESS_CONTEXT context; - UINT ret; - context = user_callbacks->pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - ret = user_callbacks->pGetSystemMetrics( SM_CXVIRTUALSCREEN ); - user_callbacks->pSetThreadDpiAwarenessContext( context ); - if (ret) return ret; + RECT rect = get_virtual_screen_rect(); + return rect.right - rect.left; } return NtGdiGetDeviceCaps( dev->hdc, HORZRES ); case DESKTOPVERTRES: - if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && user_callbacks) + if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { - DPI_AWARENESS_CONTEXT context; - UINT ret; - context = user_callbacks->pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - ret = user_callbacks->pGetSystemMetrics( SM_CYVIRTUALSCREEN ); - user_callbacks->pSetThreadDpiAwarenessContext( context ); - if (ret) return ret; + RECT rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; } return NtGdiGetDeviceCaps( dev->hdc, VERTRES ); case BLTALIGNMENT: return 0; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index df7fb5e8f4e..8aaf8ba231d 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -594,6 +594,30 @@ static inline void reset_bounds( RECT *bounds ) bounds->right = bounds->bottom = INT_MIN; } +static inline void union_rect( RECT *dest, const RECT *src1, const RECT *src2 ) +{ + if (is_rect_empty( src1 )) + { + if (is_rect_empty( src2 )) + { + reset_bounds( dest ); + return; + } + else *dest = *src2; + } + else + { + if (is_rect_empty( src2 )) *dest = *src1; + else + { + dest->left = min( src1->left, src2->left ); + dest->right = max( src1->right, src2->right ); + dest->top = min( src1->top, src2->top ); + dest->bottom = max( src1->bottom, src2->bottom ); + } + } +} + static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) { if (is_rect_empty( rect )) return; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 195756acea1..2da659aa3e5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1215,6 +1215,22 @@ static void unlock_display_devices(void) pthread_mutex_unlock( &display_lock ); } +RECT get_virtual_screen_rect(void) +{ + struct monitor *monitor; + RECT rect = {0}; + + if (!lock_display_devices()) return rect; + + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + union_rect( &rect, &rect, &monitor->rc_monitor ); + } + + unlock_display_devices(); + return rect; +} + /********************************************************************** * NtUserGetDisplayConfigBufferSizes (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bebf4b531b6..159d2a722d0 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -39,7 +39,6 @@ struct user_callbacks BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); BOOL (WINAPI *pEnumDisplayMonitors)( HDC, LPRECT, MONITORENUMPROC, LPARAM ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)( DPI_AWARENESS_CONTEXT ); HWND (WINAPI *pWindowFromDC)( HDC ); }; @@ -242,6 +241,8 @@ struct unix_funcs UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); +extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; + extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index ccf70190431..f51ed303b8b 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -845,14 +845,6 @@ static BOOL WINAPI call_RedrawWindow( HWND hwnd, const RECT *rect, HRGN rgn, UIN return pRedrawWindow && pRedrawWindow( hwnd, rect, rgn, flags ); } -static DPI_AWARENESS_CONTEXT WINAPI call_SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT ctx ) -{ - static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)( DPI_AWARENESS_CONTEXT ); - if (!pSetThreadDpiAwarenessContext) - pSetThreadDpiAwarenessContext = get_user_proc( "SetThreadDpiAwarenessContext", FALSE ); - return pSetThreadDpiAwarenessContext ? pSetThreadDpiAwarenessContext( ctx ) : 0; -} - static HWND WINAPI call_WindowFromDC( HDC hdc ) { static HWND (WINAPI *pWindowFromDC)( HDC ); @@ -870,7 +862,6 @@ static const struct user_callbacks user_funcs = call_GetWindowRect, call_EnumDisplayMonitors, call_RedrawWindow, - call_SetThreadDpiAwarenessContext, call_WindowFromDC, };

1 0

Nikolay Sivov : mfplat/tests: Add a test for buffers created for d3d12 resources.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: cabc0454270e12b0e6152bd381cfdb7649008d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cabc0454270e12b0e6152bd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 21:23:43 2021 +0300 mfplat/tests: Add a test for buffers created for d3d12 resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 92 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cec27c2c23f..cee90567084 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6558,6 +6558,8 @@ static ID3D12Device *create_d3d12_device(void) ID3D12Device *device; HRESULT hr; + if (!pD3D12CreateDevice) return NULL; + hr = pD3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); if (FAILED(hr)) return NULL; @@ -6565,7 +6567,7 @@ static ID3D12Device *create_d3d12_device(void) return device; } -static void test_dxgi_surface_buffer(void) +static void test_d3d11_surface_buffer(void) { DWORD max_length, cur_length, length, color; IMFDXGIBuffer *dxgi_buffer; @@ -6791,6 +6793,72 @@ static void test_dxgi_surface_buffer(void) ID3D11Device_Release(device); } +static void test_d3d12_surface_buffer(void) +{ + IMFDXGIBuffer *dxgi_buffer; + D3D12_HEAP_PROPERTIES heap_props; + D3D12_RESOURCE_DESC desc; + ID3D12Resource *resource; + IMFMediaBuffer *buffer; + unsigned int refcount; + ID3D12Device *device; + IUnknown *obj; + HRESULT hr; + + /* d3d12 */ + if (!(device = create_d3d12_device())) + { + skip("Failed to create a D3D12 device, skipping tests.\n"); + return; + } + + memset(&heap_props, 0, sizeof(heap_props)); + heap_props.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&desc, 0, sizeof(desc)); + desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + desc.Alignment = 0; + desc.Width = 32; + desc.Height = 32; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + hr = ID3D12Device_CreateCommittedResource(device, &heap_props, D3D12_HEAP_FLAG_NONE, + &desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); +todo_wine + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D12Resource, (void **)&obj); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + ok(obj == (IUnknown *)resource, "Unexpected resource pointer.\n"); + IUnknown_Release(obj); + + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); +} + ID3D12Resource_Release(resource); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Unexpected device refcount %u.\n", refcount); +} + static void test_sample_allocator_sysmem(void) { IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; @@ -7335,7 +7403,9 @@ static void test_sample_allocator_d3d11(void) static void test_sample_allocator_d3d12(void) { IMFVideoSampleAllocator *allocator; + D3D12_HEAP_PROPERTIES heap_props; IMFDXGIDeviceManager *manager; + D3D12_HEAP_FLAGS heap_flags; IMFDXGIBuffer *dxgi_buffer; IMFMediaType *video_type; ID3D12Resource *resource; @@ -7346,12 +7416,6 @@ static void test_sample_allocator_d3d12(void) IMFSample *sample; HRESULT hr; - if (!pD3D12CreateDevice) - { - skip("Missing d3d12 support, some tests will be skipped.\n"); - return; - } - if (!(device = create_d3d12_device())) { skip("Failed to create a D3D12 device, skipping tests.\n"); @@ -7411,6 +7475,14 @@ todo_wine ok(!desc.Layout, "Unexpected layout %u.\n", desc.Layout); ok(!desc.Flags, "Unexpected flags %#x.\n", desc.Flags); + hr = ID3D12Resource_GetHeapProperties(resource, &heap_props, &heap_flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(heap_props.Type == D3D12_HEAP_TYPE_DEFAULT, "Unexpected heap type %u.\n", heap_props.Type); + ok(heap_props.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, "Unexpected page property %u.\n", + heap_props.CPUPageProperty); + ok(!heap_props.MemoryPoolPreference, "Unexpected pool preference %u.\n", heap_props.MemoryPoolPreference); + ok(heap_flags == D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES, "Unexpected heap flags %#x.\n", heap_flags); + ID3D12Resource_Release(resource); IMFDXGIBuffer_Release(dxgi_buffer); IMFSample_Release(sample); @@ -7656,6 +7728,9 @@ START_TEST(mfplat) if (!pMFCreateVideoSampleAllocatorEx) win_skip("MFCreateVideoSampleAllocatorEx() is not available. Some tests will be skipped.\n"); + if (!pD3D12CreateDevice) + skip("Missing d3d12 support, some tests will be skipped.\n"); + CoInitialize(NULL); test_startup(); @@ -7703,7 +7778,8 @@ START_TEST(mfplat) test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); test_MFMapDXGIFormatToDX9Format(); - test_dxgi_surface_buffer(); + test_d3d11_surface_buffer(); + test_d3d12_surface_buffer(); test_sample_allocator_sysmem(); test_sample_allocator_d3d9(); test_sample_allocator_d3d11();

1 0

Vijay Kiran Kamuju : ntdll: Implement RtlNumberGenericTableElements.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: df678a4ec6190223c28d9d3d646fb17b74e76c60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df678a4ec6190223c28d9d3d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 30 20:15:56 2021 -0700 ntdll: Implement RtlNumberGenericTableElements. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 4 ++-- include/ddk/ntddk.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index f77e4058378..3f05a2ad7d4 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -460,8 +460,8 @@ void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, */ ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) { - FIXME("(%p) stub!\n", table); - return 0; + TRACE("(%p)\n", table); + return table->NumberGenericTableElements; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 3a1d68b1fa8..569552bcad0 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -268,5 +268,6 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); #endif

1 0

Rémi Bernon : winebus.sys: Send PID effect state reports for SDL devices.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 3ed121bffa3d1a4394277a532edb150c6b4bebfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed121bffa3d1a4394277a53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:48 2021 +0100 winebus.sys: Send PID effect state reports for SDL devices. Checking for effect state updates periodically, as well as whenever the device state changes but not more than once every 10ms. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 62 +++++++++++++++++++++++++++++++++++++---- dlls/winebus.sys/hid.c | 8 ++++++ dlls/winebus.sys/unix_private.h | 2 ++ 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 254971e1185..76d90ab7912 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -78,7 +78,7 @@ MAKE_FUNCPTR(SDL_JoystickInstanceID); MAKE_FUNCPTR(SDL_JoystickName); MAKE_FUNCPTR(SDL_JoystickNumAxes); MAKE_FUNCPTR(SDL_JoystickOpen); -MAKE_FUNCPTR(SDL_WaitEvent); +MAKE_FUNCPTR(SDL_WaitEventTimeout); MAKE_FUNCPTR(SDL_JoystickNumButtons); MAKE_FUNCPTR(SDL_JoystickNumBalls); MAKE_FUNCPTR(SDL_JoystickNumHats); @@ -93,6 +93,7 @@ MAKE_FUNCPTR(SDL_GameControllerOpen); MAKE_FUNCPTR(SDL_GameControllerEventState); MAKE_FUNCPTR(SDL_HapticClose); MAKE_FUNCPTR(SDL_HapticDestroyEffect); +MAKE_FUNCPTR(SDL_HapticGetEffectStatus); MAKE_FUNCPTR(SDL_HapticNewEffect); MAKE_FUNCPTR(SDL_HapticOpenFromJoystick); MAKE_FUNCPTR(SDL_HapticPause); @@ -110,6 +111,7 @@ MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); +MAKE_FUNCPTR(SDL_GetTicks); static int (*pSDL_JoystickRumble)(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -136,6 +138,8 @@ struct sdl_device SDL_Haptic *sdl_haptic; int haptic_effect_id; int effect_ids[256]; + int effect_state[256]; + LONG effect_flags; }; static inline struct sdl_device *impl_from_unix_device(struct unix_device *iface) @@ -453,9 +457,11 @@ static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, US { case PID_USAGE_DC_ENABLE_ACTUATORS: pSDL_HapticSetGain(impl->sdl_haptic, 100); + InterlockedOr(&impl->effect_flags, EFFECT_STATE_ACTUATORS_ENABLED); return STATUS_SUCCESS; case PID_USAGE_DC_DISABLE_ACTUATORS: pSDL_HapticSetGain(impl->sdl_haptic, 0); + InterlockedAnd(&impl->effect_flags, ~EFFECT_STATE_ACTUATORS_ENABLED); return STATUS_SUCCESS; case PID_USAGE_DC_STOP_ALL_EFFECTS: pSDL_HapticStopAll(impl->sdl_haptic); @@ -471,9 +477,11 @@ static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, US return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_PAUSE: pSDL_HapticPause(impl->sdl_haptic); + InterlockedOr(&impl->effect_flags, EFFECT_STATE_DEVICE_PAUSED); return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_CONTINUE: pSDL_HapticUnpause(impl->sdl_haptic); + InterlockedAnd(&impl->effect_flags, ~EFFECT_STATE_DEVICE_PAUSED); return STATUS_SUCCESS; } @@ -686,6 +694,42 @@ static const struct hid_device_vtbl sdl_device_vtbl = sdl_device_physical_effect_update, }; +static void check_device_effects_state(struct sdl_device *impl) +{ + struct unix_device *iface = &impl->unix_device; + struct hid_effect_state *effect_state = &iface->hid_physical.effect_state; + ULONG effect_flags = InterlockedOr(&impl->effect_flags, 0); + unsigned int i, ret; + + if (!impl->sdl_haptic) return; + if (!(impl->effect_support & SDL_HAPTIC_STATUS)) return; + + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) + { + if (impl->effect_ids[i] == -1) continue; + ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); + if (impl->effect_state[i] == ret) continue; + impl->effect_state[i] = ret; + hid_device_set_effect_state(iface, i, effect_flags | (ret == 1 ? EFFECT_STATE_EFFECT_PLAYING : 0)); + bus_event_queue_input_report(&event_queue, iface, effect_state->report_buf, effect_state->report_len); + } +} + +static void check_all_devices_effects_state(void) +{ + static UINT last_ticks = 0; + UINT ticks = pSDL_GetTicks(); + struct sdl_device *impl; + + if (ticks - last_ticks < 10) return; + last_ticks = ticks; + + pthread_mutex_lock(&sdl_cs); + LIST_FOR_EACH_ENTRY(impl, &device_list, struct sdl_device, unix_device.entry) + check_device_effects_state(impl); + pthread_mutex_unlock(&sdl_cs); +} + static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *event) { struct unix_device *iface = &impl->unix_device; @@ -693,7 +737,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e if (impl->sdl_controller) return TRUE; /* use controller events instead */ - switch(event->type) + switch (event->type) { case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONUP: @@ -732,6 +776,8 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e default: ERR("TODO: Process Report (0x%x)\n",event->type); } + + check_device_effects_state(impl); return FALSE; } @@ -740,7 +786,7 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event struct unix_device *iface = &impl->unix_device; struct hid_device_state *state = &iface->hid_device_state; - switch(event->type) + switch (event->type) { case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONUP: @@ -786,6 +832,8 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event default: ERR("TODO: Process Report (%x)\n",event->type); } + + check_device_effects_state(impl); return FALSE; } @@ -924,7 +972,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_JoystickName); LOAD_FUNCPTR(SDL_JoystickNumAxes); LOAD_FUNCPTR(SDL_JoystickOpen); - LOAD_FUNCPTR(SDL_WaitEvent); + LOAD_FUNCPTR(SDL_WaitEventTimeout); LOAD_FUNCPTR(SDL_JoystickNumButtons); LOAD_FUNCPTR(SDL_JoystickNumBalls); LOAD_FUNCPTR(SDL_JoystickNumHats); @@ -939,6 +987,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_GameControllerEventState); LOAD_FUNCPTR(SDL_HapticClose); LOAD_FUNCPTR(SDL_HapticDestroyEffect); + LOAD_FUNCPTR(SDL_HapticGetEffectStatus); LOAD_FUNCPTR(SDL_HapticNewEffect); LOAD_FUNCPTR(SDL_HapticOpenFromJoystick); LOAD_FUNCPTR(SDL_HapticPause); @@ -956,6 +1005,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents); LOAD_FUNCPTR(SDL_PushEvent); + LOAD_FUNCPTR(SDL_GetTicks); #undef LOAD_FUNCPTR pSDL_JoystickRumble = dlsym(sdl_handle, "SDL_JoystickRumble"); pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); @@ -1013,8 +1063,8 @@ NTSTATUS sdl_bus_wait(void *args) do { if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; - if (pSDL_WaitEvent(&event) != 0) process_device_event(&event); - else WARN("SDL_WaitEvent failed: %s\n", pSDL_GetError()); + if (pSDL_WaitEventTimeout(&event, 10) != 0) process_device_event(&event); + else check_all_devices_effects_state(); } while (event.type != quit_event); TRACE("SDL main loop exiting\n"); diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 29d5debcfe2..8680f8a088c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1405,3 +1405,11 @@ void hid_device_drop_report(struct unix_device *iface) { iface->hid_device_state.dropped = TRUE; } + +void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags) +{ + struct hid_effect_state *state = &iface->hid_physical.effect_state; + struct pid_effect_state *report = (struct pid_effect_state *)(state->report_buf + 1); + report->index = index; + report->flags = flags; +} diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 564fec9fc3a..efecf6cdbe3 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -262,6 +262,8 @@ extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, L extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags) DECLSPEC_HIDDEN; + BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : dinput: Fully implement GetForceFeedbackState / GetEffectStatus.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 4604b11c25ea44b08a7e9b13c1e6db3c16eba315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4604b11c25ea44b08a7e9b13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:47 2021 +0100 dinput: Fully implement GetForceFeedbackState / GetEffectStatus. Using the PID effect state reports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- dlls/dinput/joystick_hid.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dinput8/tests/hid.c | 7 ------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cca7f796fdc..1dc3c311f2b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1765,7 +1765,7 @@ static HRESULT WINAPI dinput_device_GetForceFeedbackState( IDirectInputDevice8W struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HRESULT hr = DI_OK; - FIXME( "iface %p, out %p semi-stub!\n", iface, out ); + TRACE( "iface %p, out %p.\n", iface, out ); if (!out) return E_POINTER; *out = 0; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 9dac2b3af4b..976961c3a9f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1052,7 +1052,11 @@ static HRESULT hid_joystick_send_force_feedback_command( IDirectInputDevice8W *i case DISFFC_SETACTUATORSOFF: usage = PID_USAGE_DC_DISABLE_ACTUATORS; break; } - if (command == DISFFC_RESET) IDirectInputDevice8_EnumCreatedEffectObjects( iface, unload_effect_object, NULL, 0 ); + if (command == DISFFC_RESET) + { + IDirectInputDevice8_EnumCreatedEffectObjects( iface, unload_effect_object, NULL, 0 ); + impl->base.force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; + } count = 1; status = HidP_InitializeReportForID( HidP_Output, report->id, impl->preparsed, report_buf, report_len ); @@ -1201,10 +1205,12 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) .dwHow = DIPH_DEVICE, }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - ULONG i, count, report_len = impl->caps.InputReportByteLength; + ULONG i, index, count, report_len = impl->caps.InputReportByteLength; DIDATAFORMAT *format = impl->base.device_format; struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; + struct hid_joystick_effect *effect; + DWORD device_state, effect_state; USAGE_AND_PAGE *usages; NTSTATUS status; HRESULT hr; @@ -1258,6 +1264,43 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) if (impl->base.hEvent && memcmp( &params.old_state, impl->base.device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } + else if (report_buf[0] == impl->pid_effect_state.id) + { + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + &index, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue EFFECT_BLOCK_INDEX returned %#x\n", status ); + + EnterCriticalSection( &impl->base.crit ); + effect_state = 0; + device_state = impl->base.force_feedback_state & DIGFFS_EMPTY; + while (count--) + { + USAGE_AND_PAGE *button = impl->usages_buf + count; + if (button->UsagePage != HID_USAGE_PAGE_PID) + FIXME( "unimplemented usage page %#04x.\n", button->UsagePage ); + else switch (button->Usage) + { + case PID_USAGE_DEVICE_PAUSED: device_state |= DIGFFS_PAUSED; break; + case PID_USAGE_ACTUATORS_ENABLED: device_state |= DIGFFS_ACTUATORSON; break; + case PID_USAGE_SAFETY_SWITCH: device_state |= DIGFFS_SAFETYSWITCHON; break; + case PID_USAGE_ACTUATOR_OVERRIDE_SWITCH: device_state |= DIGFFS_USERFFSWITCHON; break; + case PID_USAGE_ACTUATOR_POWER: device_state |= DIGFFS_POWERON; break; + case PID_USAGE_EFFECT_PLAYING: effect_state = DIEGES_PLAYING; break; + default: FIXME( "unimplemented usage %#04x\n", button->Usage ); break; + } + } + if (!(device_state & DIGFFS_ACTUATORSON)) device_state |= DIGFFS_ACTUATORSOFF; + if (!(device_state & DIGFFS_SAFETYSWITCHON)) device_state |= DIGFFS_SAFETYSWITCHOFF; + if (!(device_state & DIGFFS_USERFFSWITCHON)) device_state |= DIGFFS_USERFFSWITCHOFF; + if (!(device_state & DIGFFS_POWERON)) device_state |= DIGFFS_POWEROFF; + + TRACE( "effect %u state %#x, device state %#x\n", index, effect_state, device_state ); + + LIST_FOR_EACH_ENTRY( effect, &impl->effect_list, struct hid_joystick_effect, entry ) + if (effect->index == index) effect->status = effect_state; + impl->base.force_feedback_state = device_state; + LeaveCriticalSection( &impl->base.crit ); + } memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); impl->read_ovl.hEvent = impl->base.read_event; @@ -2722,7 +2765,7 @@ static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *i struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); HRESULT hr = DI_OK; - FIXME( "iface %p, status %p semi-stub!\n", iface, status ); + TRACE( "iface %p, status %p.\n", iface, status ); if (!status) return E_POINTER; *status = 0; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2efa817f00e..0a58f215ea9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -9243,7 +9243,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_EMPTY|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); @@ -9450,7 +9449,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); @@ -9460,14 +9458,12 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_ACTUATORSOFF|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); @@ -9483,7 +9479,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); @@ -9501,7 +9496,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 ); @@ -9519,7 +9513,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_EMPTY|DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; - todo_wine ok( res == flags, "got state %#x\n", res ); set_hid_expect( file, NULL, 0 );

1 0