[PATCH v3 0/8] MR6396: win32u: Stop setting DPI_PER_MONITOR_AWARE by default.
This activates the new DPI scaling, and stops pretending that every window is per-monitor DPI aware. It uses the GDI scaled surfaces for DPI-unaware windows, instead of the current higher resolution surfaces, which gives more blurry results but this is the same as Windows for DPI-unaware cases. -- v3: win32u: Stop setting DPI_PER_MONITOR_AWARE by default. explorer: Make the desktop thread per-monitor DPI aware. user32: Move dpiaware_init to SYSPARAMS_Init. server: Pass window's per-monitor DPI in set_window_pos. win32u: Pass window_from_point dpi to list_children_from_point. win32u: Map rect to window DPI in expose_window_surface. winex11: Map message pos to physical DPI in move_resize_window. winewayland: Remove unnecessary logical to physical DPI mapping. https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> This is now properly handled in win32u and all the drivers are now working with physical DPI coordinates directly. Note that there's still an additional mapping from Wine (window) to Wayland (surface) coordinates, that is handled by coords_from_window and coords_to_window. --- dlls/winewayland.drv/wayland_pointer.c | 46 ++------------------------ dlls/winewayland.drv/window.c | 2 +- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 1d8acaeabd2..355fc3b486f 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -74,9 +74,6 @@ static void pointer_handle_motion_internal(wl_fixed_t sx, wl_fixed_t sy) pthread_mutex_unlock(&surface->mutex); - /* Hardware input events are in physical coordinates. */ - if (!NtUserLogicalToPerMonitorDPIPhysicalPoint(hwnd, &screen)) return; - input.type = INPUT_MOUSE; input.mi.dx = screen.x; input.mi.dy = screen.y; @@ -249,22 +246,19 @@ static const struct wl_pointer_listener pointer_listener = }; static void relative_pointer_v1_relative_motion(void *data, - struct zwp_relative_pointer_v1 *zwp_relative_pointer_v1, + struct zwp_relative_pointer_v1 *zwp_relative_pointer_v1, uint32_t utime_hi, uint32_t utime_lo, wl_fixed_t dx, wl_fixed_t dy, wl_fixed_t dx_unaccel, wl_fixed_t dy_unaccel) { INPUT input = {0}; HWND hwnd; - POINT screen, origin; + POINT screen; struct wayland_surface *surface; - RECT window_rect; if (!(hwnd = wayland_pointer_get_focused_hwnd())) return; if (!(surface = wayland_surface_lock_hwnd(hwnd))) return; - window_rect = surface->window.rect; - wayland_surface_coords_to_window(surface, wl_fixed_to_double(dx), wl_fixed_to_double(dy), @@ -272,42 +266,6 @@ static void relative_pointer_v1_relative_motion(void *data, pthread_mutex_unlock(&surface->mutex); - /* We clip the relative motion within the window rectangle so that - * the NtUserLogicalToPerMonitorDPIPhysicalPoint calls later succeed. - * TODO: Avoid clipping by using a more versatile dpi mapping function. */ - if (screen.x >= 0) - { - origin.x = window_rect.left; - screen.x += origin.x; - if (screen.x >= window_rect.right) screen.x = window_rect.right - 1; - } - else - { - origin.x = window_rect.right; - screen.x += origin.x; - if (screen.x < window_rect.left) screen.x = window_rect.left; - } - - if (screen.y >= 0) - { - origin.y = window_rect.top; - screen.y += origin.y; - if (screen.y >= window_rect.bottom) screen.y = window_rect.bottom - 1; - } - else - { - origin.y = window_rect.bottom; - screen.y += origin.y; - if (screen.y < window_rect.top) screen.y = window_rect.top; - } - - /* Transform the relative motion from window coordinates to physical - * coordinates required for the input event. */ - if (!NtUserLogicalToPerMonitorDPIPhysicalPoint(hwnd, &screen)) return; - if (!NtUserLogicalToPerMonitorDPIPhysicalPoint(hwnd, &origin)) return; - screen.x -= origin.x; - screen.y -= origin.y; - input.type = INPUT_MOUSE; input.mi.dx = screen.x; input.mi.dy = screen.y; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 73a8de37f77..a6285ab592c 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -184,7 +184,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, } conf->state = window_state; - conf->scale = NtUserGetDpiForWindow(data->hwnd) / 96.0; + conf->scale = get_win_monitor_dpi(data->hwnd) / 96.0; conf->visible = (style & WS_VISIBLE) == WS_VISIBLE; conf->managed = data->managed; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ee0191630f7..5941eabd5d0 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1461,7 +1461,10 @@ void move_resize_window( HWND hwnd, int dir ) if (!(win = X11DRV_get_whole_window( hwnd ))) return; pt = NtUserGetThreadInfo()->message_pos; - pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) ); + pos.x = (short)LOWORD( pt ); + pos.y = (short)HIWORD( pt ); + NtUserLogicalToPerMonitorDPIPhysicalPoint( hwnd, &pos ); + pos = virtual_screen_to_root( pos.x, pos.y ); if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1; else if (NtUserGetKeyState( VK_MBUTTON ) & 0x8000) button = 2; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/window.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 05a353ae53a..28935030347 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2141,6 +2141,7 @@ static BOOL expose_window_surface( HWND hwnd, UINT flags, const RECT *rect, UINT { struct window_surface *surface; struct window_rects rects; + RECT window_rect; HRGN region = 0; WND *win; @@ -2149,14 +2150,20 @@ static BOOL expose_window_surface( HWND hwnd, UINT flags, const RECT *rect, UINT rects = win->rects; release_win_ptr( win ); + if (rect) + { + window_rect = map_dpi_rect( *rect, dpi, get_dpi_for_window( hwnd ) ); + InflateRect( &window_rect, 1, 1 ); /* compensate rounding errors */ + } + if (surface) { window_surface_lock( surface ); - if (!rect) add_bounds_rect( &surface->bounds, rect ); + if (!rect) add_bounds_rect( &surface->bounds, &surface->rect ); else { - RECT dirty = *rect; + RECT dirty = window_rect; OffsetRect( &dirty, rects.client.left - rects.visible.left, rects.client.top - rects.visible.top ); if (!(region = expose_window_surface_rect( surface, flags, dirty ))) flags = 0; else NtGdiOffsetRgn( region, rects.client.left - rects.visible.left, rects.client.top - rects.visible.top ); @@ -2168,7 +2175,7 @@ static BOOL expose_window_surface( HWND hwnd, UINT flags, const RECT *rect, UINT window_surface_release( surface ); } - if (flags) NtUserRedrawWindow( hwnd, rect, region, flags ); + if (flags) NtUserRedrawWindow( hwnd, rect ? &window_rect : NULL, region, flags ); if (region) NtGdiDeleteObjectApp( region ); return TRUE; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> It may be per-monitor, which window_from_point checks but not list_children_from_point. --- dlls/win32u/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 28935030347..173672030f3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2439,7 +2439,7 @@ done: * Point is in screen coordinates. * Returned list must be freed by caller. */ -static HWND *list_children_from_point( HWND hwnd, POINT pt ) +static HWND *list_children_from_point( HWND hwnd, POINT pt, UINT dpi ) { int i, size = 128; HWND *list; @@ -2455,7 +2455,7 @@ static HWND *list_children_from_point( HWND hwnd, POINT pt ) req->parent = wine_server_user_handle( hwnd ); req->x = pt.x; req->y = pt.y; - req->dpi = get_thread_dpi(); + req->dpi = dpi; wine_server_set_reply( req, list, (size-1) * sizeof(user_handle_t) ); if (!wine_server_call( req )) count = reply->count; } @@ -2492,7 +2492,7 @@ HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) *hittest = HTNOWHERE; - if (!(list = list_children_from_point( hwnd, pt ))) return 0; + if (!(list = list_children_from_point( hwnd, pt, dpi ))) return 0; /* now determine the hittest */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/window.c | 1 + server/protocol.def | 1 + server/window.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 173672030f3..77471213431 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2008,6 +2008,7 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, stru req->handle = wine_server_user_handle( hwnd ); req->previous = wine_server_user_handle( insert_after ); req->swp_flags = swp_flags; + req->monitor_dpi = monitor_dpi; req->window = wine_server_rectangle( new_rects->window ); req->client = wine_server_rectangle( new_rects->client ); if (!EqualRect( &new_rects->window, &new_rects->visible ) || new_surface || valid_rects) diff --git a/server/protocol.def b/server/protocol.def index 2c791cbdd46..f260bae2d21 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2592,6 +2592,7 @@ enum message_type @REQ(set_window_pos) unsigned short swp_flags; /* SWP_* flags */ unsigned short paint_flags; /* paint flags (see below) */ + unsigned int monitor_dpi; /* DPI of the window's monitor */ user_handle_t handle; /* handle to the window */ user_handle_t previous; /* previous window in Z order */ rectangle_t window; /* window rectangle (in parent coords) */ diff --git a/server/window.c b/server/window.c index 564c69bf18d..16c2656b8f2 100644 --- a/server/window.c +++ b/server/window.c @@ -84,6 +84,7 @@ struct window unsigned int alpha; /* alpha value for a layered window */ unsigned int layered_flags; /* flags for a layered window */ unsigned int dpi_context; /* DPI awareness context */ + unsigned int monitor_dpi; /* DPI of the window monitor */ lparam_t user_data; /* user-specific data */ WCHAR *text; /* window caption text */ data_size_t text_len; /* length of window caption */ @@ -245,20 +246,17 @@ static inline void update_pixel_format_flags( struct window *win ) win->paint_flags |= PAINT_PIXEL_FORMAT_CHILD; } -static unsigned int get_window_dpi( struct window *win ) +/* get the per-monitor DPI for a window */ +static unsigned int get_monitor_dpi( struct window *win ) { - unsigned int dpi; - if ((dpi = NTUSER_DPI_CONTEXT_GET_DPI( win->dpi_context ))) return dpi; - /* FIXME: return the window monitor DPI? */ - return USER_DEFAULT_SCREEN_DPI; + while (win->parent && !is_desktop_window( win->parent )) win = win->parent; + return win->monitor_dpi; } -/* get the per-monitor DPI for a window */ -static unsigned int get_monitor_dpi( struct window *win ) +static unsigned int get_window_dpi( struct window *win ) { - /* FIXME: we return the desktop window DPI for now */ - while (!is_desktop_window( win )) win = win->parent; - return get_window_dpi( win ); + if (NTUSER_DPI_CONTEXT_IS_MONITOR_AWARE( win->dpi_context )) return get_monitor_dpi( win ); + return NTUSER_DPI_CONTEXT_GET_DPI( win->dpi_context ); } /* link a window at the right place in the siblings list */ @@ -578,6 +576,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->is_layered = 0; win->is_orphan = 0; win->dpi_context = NTUSER_DPI_PER_MONITOR_AWARE; + win->monitor_dpi = USER_DEFAULT_SCREEN_DPI; win->user_data = 0; win->text = NULL; win->text_len = 0; @@ -2476,6 +2475,7 @@ DECL_HANDLER(set_window_pos) win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); + win->monitor_dpi = req->monitor_dpi; set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, &surface_rect, &valid_rect ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> Making sure it only executes after system_dpi is initialized. Otherwise SetProcessDpiAwarenessContext calls will fail to translate system DPI aware context aliases to the NTUSER_DPI_CONTEXT values with explicit system DPI values. --- dlls/user32/sysparams.c | 48 ++++++++++++++++++++++++++++++++++ dlls/user32/user_main.c | 57 ----------------------------------------- 2 files changed, 48 insertions(+), 57 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 273dccc6930..cc459f39572 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -161,7 +161,55 @@ void release_display_dc( HDC hdc ) */ void SYSPARAMS_Init(void) { + WCHAR buffer[256]; + DWORD option; + system_dpi = NtUserGetSystemDpiForProcess( NULL ); + + if (!LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, + L"dpiAwareness", REG_DWORD, &option, sizeof(option), NULL )) + { + TRACE( "got option %lx\n", option ); + if (option <= 2) + { + SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~(ULONG_PTR)option ); + return; + } + } + + if (QueryActCtxSettingsW( 0, NULL, L"http://schemas.microsoft.com/SMI/2016/WindowsSettings", + L"dpiAwareness", buffer, ARRAY_SIZE(buffer), NULL )) + { + static const WCHAR * const types[] = { L"unaware", L"system", L"permonitor", L"permonitorv2" }; + WCHAR *p, *start, *end; + ULONG_PTR i; + + TRACE( "got dpiAwareness=%s\n", debugstr_w(buffer) ); + for (start = buffer; *start; start = end) + { + start += wcsspn( start, L" \t\r\n" ); + if (!(end = wcschr( start, ',' ))) end = start + lstrlenW(start); + else *end++ = 0; + if ((p = wcspbrk( start, L" \t\r\n" ))) *p = 0; + for (i = 0; i < ARRAY_SIZE(types); i++) + { + if (wcsicmp( start, types[i] )) continue; + SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); + return; + } + } + } + else if (QueryActCtxSettingsW( 0, NULL, L"http://schemas.microsoft.com/SMI/2005/WindowsSettings", + L"dpiAware", buffer, ARRAY_SIZE(buffer), NULL )) + { + TRACE( "got dpiAware=%s\n", debugstr_w(buffer) ); + if (!wcsicmp( buffer, L"true" )) + SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + else if (!wcsicmp( buffer, L"true/pm" ) || !wcsicmp( buffer, L"per monitor" )) + SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + else + SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + } } static BOOL update_desktop_wallpaper(void) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 03b88c07bed..20b3fa8b1f6 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -44,62 +44,6 @@ UINT WINAPI UserRealizePalette( HDC hdc ) } -/*********************************************************************** - * dpiaware_init - * - * Initialize the DPI awareness style. - */ -static void dpiaware_init(void) -{ - WCHAR buffer[256]; - DWORD option; - - if (!LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, - L"dpiAwareness", REG_DWORD, &option, sizeof(option), NULL )) - { - TRACE( "got option %lx\n", option ); - if (option <= 2) - { - SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~(ULONG_PTR)option ); - return; - } - } - - if (QueryActCtxSettingsW( 0, NULL, L"http://schemas.microsoft.com/SMI/2016/WindowsSettings", - L"dpiAwareness", buffer, ARRAY_SIZE(buffer), NULL )) - { - static const WCHAR * const types[] = { L"unaware", L"system", L"permonitor", L"permonitorv2" }; - WCHAR *p, *start, *end; - ULONG_PTR i; - - TRACE( "got dpiAwareness=%s\n", debugstr_w(buffer) ); - for (start = buffer; *start; start = end) - { - start += wcsspn( start, L" \t\r\n" ); - if (!(end = wcschr( start, ',' ))) end = start + lstrlenW(start); - else *end++ = 0; - if ((p = wcspbrk( start, L" \t\r\n" ))) *p = 0; - for (i = 0; i < ARRAY_SIZE(types); i++) - { - if (wcsicmp( start, types[i] )) continue; - SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); - return; - } - } - } - else if (QueryActCtxSettingsW( 0, NULL, L"http://schemas.microsoft.com/SMI/2005/WindowsSettings", - L"dpiAware", buffer, ARRAY_SIZE(buffer), NULL )) - { - TRACE( "got dpiAware=%s\n", debugstr_w(buffer) ); - if (!wcsicmp( buffer, L"true" )) - SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - else if (!wcsicmp( buffer, L"true/pm" ) || !wcsicmp( buffer, L"per monitor" )) - SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - else - SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); - } -} - static NTSTATUS WINAPI User32CopyImage( void *args, ULONG size ) { const struct copy_image_params *params = args; @@ -255,7 +199,6 @@ static BOOL process_attach(void) NtCurrentTeb()->Peb->KernelCallbackTable = kernel_callback_table; winproc_init(); - dpiaware_init(); SYSPARAMS_Init(); return TRUE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> As it deals with display settings and virtual desktop updates, we need it to work with physical coordinates. --- programs/explorer/explorer.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/explorer.manifest b/programs/explorer/explorer.manifest index a4b573f0b41..b9839d8ab61 100644 --- a/programs/explorer/explorer.manifest +++ b/programs/explorer/explorer.manifest @@ -15,7 +15,7 @@ </dependency> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings> - <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> </windowsSettings> </application> </assembly> -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 52 ++++++++++++----------------------- dlls/win32u/sysparams.c | 1 - dlls/win32u/tests/win32u.c | 10 +++---- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 930d6ac6c5b..870b7f1cc93 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -219,7 +219,7 @@ static DWORD get_real_dpi(void) if (pSetThreadDpiAwarenessContext) { ctx = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); + ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); dpi = pGetDpiForSystem(); ok( dpi, "GetDpiForSystem failed\n" ); /* restore process-wide DPI awareness context */ @@ -3831,7 +3831,7 @@ static void test_SetProcessDpiAwarenessContext( ULONG arg ) winetest_push_context( "%#lx", arg ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); + ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); SetLastError( 0xdeadbeef ); ret = pSetProcessDpiAwarenessContext( 0 ); @@ -3874,14 +3874,13 @@ static void test_SetProcessDpiAwarenessContext( ULONG arg ) ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); + ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); SetLastError( 0xdeadbeef ); ret = pSetProcessDpiAwarenessContext( context ); - todo_wine ok( ret, "SetProcessDpiAwarenessContext failed, error %lu\n", GetLastError() ); - todo_wine ok( GetLastError() == 0xdeadbeef, "got %#lx\n", GetLastError() ); + ok( ret, "SetProcessDpiAwarenessContext failed, error %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "got %#lx\n", GetLastError() ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); for (i = 0; i < ARRAY_SIZE(contexts); i++) @@ -3891,16 +3890,13 @@ static void test_SetProcessDpiAwarenessContext( ULONG arg ) ok( !ret, "SetProcessDpiAwarenessContext succeeded\n" ); ok( GetLastError() == ERROR_ACCESS_DENIED, "got %#lx\n", GetLastError() ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); } /* thread DPI context overrides process DPI context */ ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); - todo_wine_if( arg != 0x12 && arg != 0x80000012 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( old_ctx == (DPI_AWARENESS_CONTEXT)ULongToHandle( 0x80000000 | (UINT_PTR)expect_ctx ), "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); ok( ctx == (DPI_AWARENESS_CONTEXT)0x12, "got %p\n", ctx ); @@ -3922,25 +3918,18 @@ static void test_SetProcessDpiAwarenessContext( ULONG arg ) old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006010 ); ok( old_ctx == ctx, "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)((UINT_PTR)0x80000011 | (real_dpi << 8)) ); - todo_wine_if( arg != 0x12 && arg != 0x80000012 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( old_ctx == ULongToHandle( 0x80000000 | (UINT_PTR)expect_ctx ), "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000012 ); - todo_wine_if( arg != 0x12 && arg != 0x80000012 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( old_ctx == ULongToHandle( 0x80000000 | (UINT_PTR)expect_ctx ), "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000022 ); - todo_wine_if( arg != 0x12 && arg != 0x80000012 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( old_ctx == ULongToHandle( 0x80000000 | (UINT_PTR)expect_ctx ), "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); - todo_wine_if( arg != 0x12 && context != DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ) ok( ctx == expect_ctx, "got %p\n", ctx ); winetest_pop_context(); @@ -3957,7 +3946,7 @@ static void test_SetThreadDpiAwarenessContext(void) } ctx = pGetThreadDpiAwarenessContext(); - todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); + ok( ctx == (DPI_AWARENESS_CONTEXT)0x6010, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( 0 ); ok( !old_ctx, "SetThreadDpiAwarenessContext succeeded\n" ); @@ -3965,7 +3954,7 @@ static void test_SetThreadDpiAwarenessContext(void) ok( !old_ctx, "SetThreadDpiAwarenessContext succeeded\n" ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); - todo_wine ok( old_ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", old_ctx ); + ok( old_ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", old_ctx ); ctx = pGetThreadDpiAwarenessContext(); ok( ctx == (DPI_AWARENESS_CONTEXT)0x12, "got %p\n", ctx ); old_ctx = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x22 ); @@ -4292,12 +4281,10 @@ static void test_dpi_context(void) HDC hdc = GetDC( 0 ); context = pGetThreadDpiAwarenessContext(); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x6010, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x6010, "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); - todo_wine - ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); - todo_wine - ok( !pIsProcessDPIAware(), "already aware\n" ); + ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); + ok( !pIsProcessDPIAware(), "already aware\n" ); dpi = pGetDpiForSystem(); todo_wine_if (real_dpi != USER_DEFAULT_SCREEN_DPI) ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); @@ -4313,7 +4300,6 @@ static void test_dpi_context(void) ok( !ret, "got %d\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - todo_wine ok( ret, "got %d\n", ret ); ok( pIsProcessDPIAware(), "not aware\n" ); real_dpi = pGetDpiForSystem(); @@ -4334,11 +4320,9 @@ static void test_dpi_context(void) ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %lu\n", GetLastError() ); ret = pGetProcessDpiAwarenessInternal( 0, &awareness ); ok( ret, "got %d\n", ret ); - todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong value %d\n", awareness ); ret = pGetProcessDpiAwarenessInternal( GetCurrentProcess(), &awareness ); ok( ret, "got %d\n", ret ); - todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong value %d\n", awareness ); SetLastError(0xdeadbeef); ret = pGetProcessDpiAwarenessInternal( (HANDLE)0xdeadbeef, &awareness ); @@ -4354,9 +4338,8 @@ static void test_dpi_context(void) ret = pIsProcessDPIAware(); ok(ret, "got %d\n", ret); context = pGetThreadDpiAwarenessContext(); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); - todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); SetLastError( 0xdeadbeef ); context = pSetThreadDpiAwarenessContext( 0 ); @@ -4367,9 +4350,8 @@ static void test_dpi_context(void) ok( !context, "got %p\n", context ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); - todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); dpi = pGetDpiForSystem(); ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); @@ -4406,17 +4388,17 @@ static void test_dpi_context(void) context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006010 ); ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006011 ); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x80006011, "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( context ); ok( context == (DPI_AWARENESS_CONTEXT)0x12, "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - todo_wine ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)0x6011, "wrong context %p\n", context ); if (real_dpi != USER_DEFAULT_SCREEN_DPI) test_dpi_stock_objects( hdc ); ReleaseDC( 0, hdc ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index cd9e2a37e6c..2ed1395de02 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4925,7 +4925,6 @@ void sysparams_init(void) /* FIXME: what do the DpiScalingVer flags mean? */ get_dword_entry( (union sysparam_all_entry *)&entry_DPISCALINGVER, 0, &dpi_scaling, 0 ); - if (!dpi_scaling) NtUserSetProcessDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE, 0 ); if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ { diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 3d0061fce96..a125cc9e1ba 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -2049,7 +2049,7 @@ static DWORD get_real_dpi(void) DWORD dpi; ctx = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - todo_wine ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); + ok( ctx == (DPI_AWARENESS_CONTEXT)0x80006010, "got %p\n", ctx ); dpi = GetDpiForSystem(); ok( dpi, "GetDpiForSystem failed\n" ); /* restore process-wide DPI awareness context */ @@ -2077,7 +2077,7 @@ static void test_NtUserSetProcessDpiAwarenessContext( ULONG context ) winetest_push_context( "%#lx", context ); ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); - todo_wine ok( ret == 0x6010, "got %#x\n", ret ); + ok( ret == 0x6010, "got %#x\n", ret ); SetLastError( 0xdeadbeef ); ret = NtUserSetProcessDpiAwarenessContext( 0, 0 ); @@ -2142,12 +2142,11 @@ static void test_NtUserSetProcessDpiAwarenessContext( ULONG context ) ok( ret == 0, "got %#x\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "got %#lx\n", GetLastError() ); ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); - todo_wine ok( ret == 0x6010, "got %#x\n", ret ); + ok( ret == 0x6010, "got %#x\n", ret ); ret = NtUserSetProcessDpiAwarenessContext( context, 0 ); - todo_wine ok( ret == 1, "got %#x\n", ret ); + ok( ret == 1, "got %#x\n", ret ); ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); - todo_wine_if( context != 0x12 ) ok( ret == context, "got %#x\n", ret ); for (i = 0; i < ARRAY_SIZE(contexts); i++) @@ -2155,7 +2154,6 @@ static void test_NtUserSetProcessDpiAwarenessContext( ULONG context ) ret = NtUserSetProcessDpiAwarenessContext( contexts[i], 0 ); ok( !ret, "got %#x\n", ret ); ret = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); - todo_wine_if( context != 0x12 ) ok( ret == context, "got %#x\n", ret ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6396
This seems weird though, because we don't have true per-monitor DPI support. Shouldn't system DPI awareness enough to get rid of scaling, since we only have only one DPI setting (in winecfg)? This sounds like a bug to me unless I've missed something.
Yes there was indeed a bug, thanks for pointing that out. It should be fixed now and system DPI awareness is enough to avoid the DPI scaling for now. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6396#note_80723
v3: Fix the broken process DPI awareness initialization from the application manifest, which should fix the builtin applications too. Also compensate rounding a bit in exposed rectangle, which should fix the 1px lines. Fwiw there's still some minor scaling artifacts with very large factors but I believe this is caused by the partial bilinear filtering, which I tried to compensate before by rounding the flushed rectangle up a bit, but that's not good enough. It's not much noticeable though, so hopefully not a big deal. I think we could do better scaling would need with accelerated compositing, but that'll need more work. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6396#note_80724
Indeed there's a fair number of scaling artifacts, when dragging cards around in Solitaire for instance. It's good enough for now, but yes, we'll need better scaling. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6396#note_80725
participants (2)
-
Alexandre Julliard (＠julliard) -
Rémi Bernon