December 2021 - Wine-Commits

Derek Lesho : kernelbase: Fix parameter order of FindResourceExW call for non-localized path.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 472763c5237febcb8745835c96f8b49b000564de URL: https://source.winehq.org/git/wine.git/?a=commit;h=472763c5237febcb8745835c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Dec 6 10:58:18 2021 +0100 kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d670df27690..7ca3ecdc712 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -781,8 +781,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), @@ -887,8 +887,8 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),

1 0

Huw Davies : wineps: Build with nameless structs and unions.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 78bd41afb3021a348d9e53931aaf75d00db8b12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78bd41afb3021a348d9e5393… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 6 09:58:11 2021 +0000 wineps: Build with nameless structs and unions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 84 +++++++++++++++++++++++------------------------- dlls/wineps.drv/init.c | 55 +++++++++++++------------------ dlls/wineps.drv/ps.c | 12 +++---- 3 files changed, 68 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78bd41afb3021a348d9e…

1 0

Piotr Caban : vcruntime140_1: Add support for exception separated code segments.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 9ccd84b945c4935e200becfe08a9a5bdb4799bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ccd84b945c4935e200becfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 4 18:15:06 2021 +0100 vcruntime140_1: Add support for exception separated code segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51396 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 62 ++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index f50847d886d..b29a2baa696 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -74,6 +74,7 @@ typedef struct #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 +#define CATCHBLOCK_SEPARATED 0x08 #define CATCHBLOCK_RET_ADDR_MASK 0x30 #define CATCHBLOCK_RET_ADDR 0x10 #define CATCHBLOCK_TWO_RET_ADDRS 0x20 @@ -219,13 +220,14 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) } } -static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) +static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci, DWORD func_rva) { BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | + CATCHBLOCK_SEPARATED | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; @@ -241,10 +243,20 @@ static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[0] = decode_uint(b); - if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[1] = decode_uint(b); + if (ci->header & CATCHBLOCK_SEPARATED) + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = read_rva(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = read_rva(b); + } + else + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b) + func_rva; + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b) + func_rva; + } return TRUE; } @@ -320,7 +332,8 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT for (j = 0; j < ti.catchblock_count; j++) { catchblock_info ci; - if (!read_catchblock_info(&catchblock, &ci)) return FALSE; + if (!read_catchblock_info(&catchblock, &ci, + dispatch->FunctionEntry->BeginAddress)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), @@ -614,7 +627,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, { catchblock_info ci; - read_catchblock_info(&catchblock, &ci); + read_catchblock_info(&catchblock, &ci, dispatch->FunctionEntry->BeginAddress); if (info) { @@ -652,11 +665,15 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; if (ci.ret_addr[0]) + { catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0], dispatch->ImageBase); + } if (ci.ret_addr[1]) + { catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[1], dispatch->ImageBase); + } RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } } @@ -808,8 +825,9 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, rec->ExceptionCode != STATUS_LONGJUMP) return ExceptionContinueSearch; /* handle only c++ exceptions */ - if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_UNWIND_MAP | - FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | FUNC_DESCR_NO_EXCEPT)) + if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_IS_SEPARATED | + FUNC_DESCR_UNWIND_MAP | FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | + FUNC_DESCR_NO_EXCEPT)) { FIXME("unsupported flags: %x\n", descr.header); return ExceptionContinueSearch; @@ -831,6 +849,26 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, descr.tryblock_map += count_end - count; } descr.ip_map = read_rva(&p); + if (descr.header & FUNC_DESCR_IS_SEPARATED) + { + UINT i, num, func; + BYTE *map; + + map = rva_to_ptr(descr.ip_map, dispatch->ImageBase); + num = decode_uint(&map); + for (i = 0; i < num; i++) + { + func = read_rva(&map); + descr.ip_map = read_rva(&map); + if (func == dispatch->FunctionEntry->BeginAddress) + break; + } + if (i == num) + { + FIXME("function ip_map not found\n"); + return ExceptionContinueSearch; + } + } count_end = count = rva_to_ptr(descr.ip_map, dispatch->ImageBase); descr.ip_count = decode_uint(&count_end); descr.ip_map += count_end - count;

1 0

Jacek Caban : win32u: Directly use sysparams in nulldrv_GetDeviceCaps.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 4ca8d676fb15dddceb6e286dfaa8bc7109d77cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca8d676fb15dddceb6e286d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:16:10 2021 +0100 win32u: Directly use sysparams 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 | 50 ++++++++------------------------------------ dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 20 +++++++++++++++++- dlls/win32u/win32u_private.h | 5 ++--- dlls/win32u/wrappers.c | 28 ------------------------- 5 files changed, 30 insertions(+), 74 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 158e844cccb..5fa1a2ca236 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -83,28 +83,6 @@ const struct gdi_dc_funcs *get_display_driver(void) return &user_driver->dc_funcs; } -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); - user_callbacks->pGetMonitorInfoW( monitor, (MONITORINFO *)&mi ); - if (!wcsicmp( info->name, mi.szDevice )) - { - info->rect = mi.rcMonitor; - return FALSE; - } - - return TRUE; -} - static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) { return 0; @@ -224,41 +202,31 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case HORZRES: { DC *dc = get_nulldrv_dc( dev ); - struct monitor_info info; + RECT rect; int ret; - if (!user_callbacks) return 640; - if (dc->display[0]) { - info.name = dc->display; - SetRectEmpty( &info.rect ); - user_callbacks->pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); - if (!IsRectEmpty( &info.rect )) - return info.rect.right - info.rect.left; + rect = get_display_rect( dc->display ); + if (!IsRectEmpty( &rect )) return rect.right - rect.left; } - ret = user_callbacks->pGetSystemMetrics( SM_CXSCREEN ); + ret = get_system_metrics( SM_CXSCREEN ); return ret ? ret : 640; } case VERTRES: { DC *dc = get_nulldrv_dc( dev ); - struct monitor_info info; + RECT rect; int ret; - if (!user_callbacks) return 480; - - if (dc->display[0] && user_callbacks) + if (dc->display[0]) { - info.name = dc->display; - SetRectEmpty( &info.rect ); - user_callbacks->pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); - if (!IsRectEmpty( &info.rect )) - return info.rect.bottom - info.rect.top; + rect = get_display_rect( dc->display ); + if (!IsRectEmpty( &rect )) return rect.bottom - rect.top; } - ret = user_callbacks->pGetSystemMetrics( SM_CYSCREEN ); + ret = get_system_metrics( SM_CYSCREEN ); return ret ? ret : 480; } case BITSPIXEL: diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 534687cb60b..13c365c075d 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -372,7 +372,6 @@ extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; extern HGDIOBJ get_stock_object( INT obj ) DECLSPEC_HIDDEN; extern DWORD get_gdi_object_type( HGDIOBJ obj ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e1f52461ca9..2072597a968 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1462,6 +1462,24 @@ RECT get_virtual_screen_rect( UINT dpi ) return rect; } +RECT get_display_rect( const WCHAR *display ) +{ + struct monitor *monitor; + RECT rect = {0}; + + if (!lock_display_devices()) return rect; + + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + if (!monitor->adapter || wcsicmp( monitor->adapter->dev.device_name, display )) continue; + rect = monitor->rc_monitor; + break; + } + + unlock_display_devices(); + return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); +} + static RECT get_primary_monitor_rect(void) { struct monitor *monitor; @@ -3907,7 +3925,7 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w #undef WINE_SPI_WARN } -static int get_system_metrics( int index ) +int get_system_metrics( int index ) { NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3728c3b4065..7e867d4f736 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -33,10 +33,7 @@ struct user_callbacks { HWND (WINAPI *pGetDesktopWindow)(void); - BOOL (WINAPI *pGetMonitorInfoW)( HMONITOR, LPMONITORINFO ); - INT (WINAPI *pGetSystemMetrics)(INT); BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - BOOL (WINAPI *pEnumDisplayMonitors)( HDC, LPRECT, MONITORENUMPROC, LPARAM ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); HWND (WINAPI *pWindowFromDC)( HDC ); @@ -245,7 +242,9 @@ struct unix_funcs struct window_surface *surface ); }; +extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; +extern int get_system_metrics( int index ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect( UINT dpi ) DECLSPEC_HIDDEN; extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e81b202fc78..9bdd3ec3634 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -958,22 +958,6 @@ static HWND WINAPI call_GetDesktopWindow(void) return pGetDesktopWindow ? pGetDesktopWindow() : NULL; } -static BOOL WINAPI call_GetMonitorInfoW( HMONITOR monitor, MONITORINFO *info ) -{ - static BOOL (WINAPI *pGetMonitorInfoW)( HMONITOR, LPMONITORINFO ); - if (!pGetMonitorInfoW) - pGetMonitorInfoW = get_user_proc( "GetMonitorInfoW", FALSE ); - return pGetMonitorInfoW && pGetMonitorInfoW( monitor, info ); -} - -static INT WINAPI call_GetSystemMetrics( INT metric ) -{ - static INT (WINAPI *pGetSystemMetrics)(INT); - if (!pGetSystemMetrics) - pGetSystemMetrics = get_user_proc( "GetSystemMetrics", FALSE ); - return pGetSystemMetrics ? pGetSystemMetrics( metric ) : 0; -} - static BOOL WINAPI call_GetWindowRect( HWND hwnd, LPRECT rect ) { static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); @@ -982,15 +966,6 @@ static BOOL WINAPI call_GetWindowRect( HWND hwnd, LPRECT rect ) return pGetWindowRect && pGetWindowRect( hwnd, rect ); } -static BOOL WINAPI call_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, - LPARAM lparam ) -{ - static BOOL (WINAPI *pEnumDisplayMonitors)( HDC, LPRECT, MONITORENUMPROC, LPARAM ); - if (!pEnumDisplayMonitors) - pEnumDisplayMonitors = get_user_proc( "EnumDisplayMonitors", FALSE ); - return pEnumDisplayMonitors && pEnumDisplayMonitors( hdc, rect, proc, lparam ); -} - static BOOL WINAPI call_RedrawWindow( HWND hwnd, const RECT *rect, HRGN rgn, UINT flags ) { static BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); @@ -1019,10 +994,7 @@ static HWND WINAPI call_WindowFromDC( HDC hdc ) static const struct user_callbacks user_funcs = { call_GetDesktopWindow, - call_GetMonitorInfoW, - call_GetSystemMetrics, call_GetWindowRect, - call_EnumDisplayMonitors, call_RedrawWindow, call_SendMessageTimeoutW, call_WindowFromDC,

1 0

Jacek Caban : win32u: Move DPI mapping from EnumDisplayMonitors.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 3570b0913340047a246eb0ad9af68a29b631f106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3570b0913340047a246eb0ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:10:01 2021 +0100 win32u: Move DPI mapping from EnumDisplayMonitors. 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/sysparams.c | 51 +++++++------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/sysparams.c | 29 +++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 56f1c444072..bbeea5317b6 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -327,7 +327,7 @@ RECT get_virtual_screen_rect(void) { RECT rect = {0}; - EnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); + NtUserEnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); return rect; } @@ -348,7 +348,7 @@ RECT get_primary_monitor_rect(void) { RECT rect = {0}; - EnumDisplayMonitors( 0, NULL, get_primary_monitor_proc, (LPARAM)&rect ); + NtUserEnumDisplayMonitors( 0, NULL, get_primary_monitor_proc, (LPARAM)&rect ); return rect; } @@ -364,7 +364,7 @@ static INT get_monitor_count(void) { INT count = 0; - EnumDisplayMonitors( 0, NULL, get_monitor_count_proc, (LPARAM)&count ); + NtUserEnumDisplayMonitors( 0, NULL, get_monitor_count_proc, (LPARAM)&count ); return count; } @@ -1747,7 +1747,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (!spi_loaded[spi_idx]) { work_area = get_primary_monitor_rect(); - EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); + NtUserEnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } *(RECT*)pvParam = work_area; @@ -3469,7 +3469,7 @@ HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) info.rect.bottom = info.rect.top + 1; } - if (!EnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; + if (!NtUserEnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; if (!info.ret) { if (flags & MONITOR_DEFAULTTOPRIMARY) info.ret = info.primary; @@ -3546,13 +3546,6 @@ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, NtUserGetMonitorInfo ); } -struct enum_mon_data -{ - LPARAM lparam; - POINT origin; - RECT limit; -}; - #ifdef __i386__ /* Some apps pass a non-stdcall callback to EnumDisplayMonitors, * so we need a small assembly wrapper to call it. @@ -3580,44 +3573,14 @@ __ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, BOOL WINAPI User32CallEnumDisplayMonitor( struct enum_display_monitor_params *params, ULONG size ) { - struct enum_mon_data *data = (struct enum_mon_data *)params->lparam; - RECT monrect = map_dpi_rect( params->rect, get_monitor_dpi( params->monitor ), get_thread_dpi() ); - - /* FIXME: move DPI conversion and rect filtering to win32u */ - OffsetRect( &monrect, -data->origin.x, -data->origin.y ); - if (!IntersectRect( &monrect, &monrect, &data->limit )) return TRUE; #ifdef __i386__ return enum_mon_callback_wrapper( params->proc, params->monitor, params->hdc, - &monrect, data->lparam ); + &params->rect, params->lparam ); #else - return params->proc( params->monitor, params->hdc, &monrect, data->lparam ); + return params->proc( params->monitor, params->hdc, &params->rect, params->lparam ); #endif } -/*********************************************************************** - * EnumDisplayMonitors (USER32.@) - */ -BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - struct enum_mon_data data; - - data.lparam = lp; - - if (hdc) - { - if (!GetDCOrgEx( hdc, &data.origin )) return FALSE; - if (GetClipBox( hdc, &data.limit ) == ERROR) return FALSE; - } - else - { - data.origin.x = data.origin.y = 0; - data.limit.left = data.limit.top = INT_MIN; - data.limit.right = data.limit.bottom = INT_MAX; - } - if (rect && !IntersectRect( &data.limit, &data.limit, rect )) return TRUE; - return NtUserEnumDisplayMonitors( hdc, rect, proc, (LPARAM)&data ); -} - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0f5e880263f..d82c4949c68 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -223,7 +223,7 @@ @ stub EnumDisplayDeviceModesW @ stdcall EnumDisplayDevicesA(str long ptr long) @ stdcall EnumDisplayDevicesW(wstr long ptr long) -@ stdcall EnumDisplayMonitors(long ptr ptr long) +@ stdcall EnumDisplayMonitors(long ptr ptr long) NtUserEnumDisplayMonitors @ stdcall EnumDisplaySettingsA(str long ptr) @ stdcall EnumDisplaySettingsExA(str long ptr long) @ stdcall EnumDisplaySettingsExW(wstr long ptr long) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4ff6f81846a..8efe17aed3c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1741,8 +1741,27 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc struct enum_display_monitor_params params; struct monitor *monitor; unsigned int count = 0, i; + POINT origin; + RECT limit; BOOL ret = TRUE; + if (hdc) + { + DC *dc; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + origin.x = dc->attr->vis_rect.left; + origin.y = dc->attr->vis_rect.top; + release_dc_ptr( dc ); + if (NtGdiGetAppClipBox( hdc, &limit ) == ERROR) return FALSE; + } + else + { + origin.x = origin.y = 0; + limit.left = limit.top = INT_MIN; + limit.right = limit.bottom = INT_MAX; + } + if (rect && !intersect_rect( &limit, &limit, rect )) return TRUE; + if (!lock_display_devices()) return FALSE; count = list_count( &monitors ); @@ -1756,9 +1775,17 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc count = 0; LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { + RECT monrect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + + monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + get_thread_dpi() ); + offset_rect( &monrect, -origin.x, -origin.y ); + if (!intersect_rect( &monrect, &monrect, &limit )) continue; + enum_info[count].handle = monitor->handle; - enum_info[count].rect = monitor->rc_monitor; + enum_info[count].rect = monrect; count++; }

1 0

Jacek Caban : win32u: Move NtUserGetDpiForMonitor implementation from user32.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: b877c78ec53b072c94211198ba08140b5b04489f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b877c78ec53b072c94211198… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:09:07 2021 +0100 win32u: Move NtUserGetDpiForMonitor 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/sysparams.c | 24 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++ include/ntuser.h | 1 + 8 files changed, 76 insertions(+), 26 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 36375dabd42..11a2532411d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3328,30 +3328,6 @@ UINT WINAPI GetDpiForSystem(void) return system_dpi; } -/*********************************************************************** - * GetDpiForMonitorInternal (USER32.@) - */ -BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) -{ - if (type > 2) - { - SetLastError( ERROR_BAD_ARGUMENTS ); - return FALSE; - } - if (!x || !y) - { - SetLastError( ERROR_INVALID_ADDRESS ); - return FALSE; - } - switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) - { - case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; - case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; - default: *x = *y = get_monitor_dpi( monitor ); break; - } - return TRUE; -} - /********************************************************************** * GetThreadDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 20d89c14a84..0f5e880263f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -298,7 +298,7 @@ @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() -@ stdcall GetDpiForMonitorInternal(long long ptr ptr) +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) NtUserGetDpiForMonitor @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e85633b041c..2e8b2408f31 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -112,6 +112,7 @@ static void * const syscalls[] = NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, NtUserGetCursor, + NtUserGetDpiForMonitor, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index edc37e7e80f..74ab94aa818 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1345,6 +1345,43 @@ RECT get_virtual_screen_rect(void) return rect; } +/********************************************************************** + * get_monitor_dpi + */ +static UINT get_monitor_dpi( HMONITOR monitor ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + +/********************************************************************** + * get_thread_dpi_awareness + */ +static DPI_AWARENESS get_thread_dpi_awareness(void) +{ + struct user_thread_info *info = get_user_thread_info(); + ULONG_PTR context = info->dpi_awareness; + + if (!context) context = NtUserGetProcessDpiAwarenessContext( NULL ); + + switch (context) + { + case 0x10: + case 0x11: + case 0x12: + case 0x80000010: + case 0x80000011: + case 0x80000012: + return context & 3; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: + return ~context; + default: + return DPI_AWARENESS_INVALID; + } +} + /********************************************************************** * NtUserGetDisplayConfigBufferSizes (win32u.@) */ @@ -1764,6 +1801,30 @@ ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ) return system_dpi; } +/*********************************************************************** + * NtUserGetDpiForMonitor (win32u.@) + */ +BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ) +{ + if (type > 2) + { + SetLastError( ERROR_BAD_ARGUMENTS ); + return FALSE; + } + if (!x || !y) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + switch (get_thread_dpi_awareness()) + { + case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; + case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; + default: *x = *y = get_monitor_dpi( monitor ); break; + } + return TRUE; +} + /* retrieve the cached base keys for a given entry */ static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index a95d6eca565..c073f14896b 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -924,7 +924,7 @@ @ stdcall NtUserGetDisplayConfigBufferSizes(long ptr ptr) @ stub NtUserGetDoubleClickTime @ stub NtUserGetDpiForCurrentProcess -@ stub NtUserGetDpiForMonitor +@ stdcall -syscall NtUserGetDpiForMonitor(long long ptr ptr) @ stub NtUserGetExtendedPointerDeviceProperty @ stub NtUserGetForegroundWindow @ stub NtUserGetGUIThreadInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 95a3df42805..bea1b00ebed 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -99,6 +99,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetCursor ) \ + SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1026bc94843..eb739181812 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -315,3 +315,13 @@ NTSTATUS WINAPI wow64_NtUserGetSystemDpiForProcess( UINT *args ) return NtUserGetSystemDpiForProcess( process ); } + +NTSTATUS WINAPI wow64_NtUserGetDpiForMonitor( UINT *args ) +{ + HMONITOR monitor = get_handle( &args ); + UINT type = get_ulong( &args ); + UINT *x = get_ptr( &args ); + UINT *y = get_ptr( &args ); + + return NtUserGetDpiForMonitor( monitor, type, x, y ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 2b747a856e8..5049926aa78 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -115,6 +115,7 @@ HWND WINAPI NtUserGetClipboardViewer(void); HCURSOR WINAPI NtUserGetCursor(void); LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info ); +BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Jacek Caban : win32u: Implement NtUserGetProcessDpiAwarenessContext and NtUserSetProcessDpiAwarenessContext.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: aab62429c2aac5dbd6539c0aa7b0b6767ad95540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab62429c2aac5dbd6539c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:08:21 2021 +0100 win32u: Implement NtUserGetProcessDpiAwarenessContext and NtUserSetProcessDpiAwarenessContext. And use them in 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/sysparams.c | 45 ++++++++++++++++++++++----------------------- dlls/win32u/syscall.c | 2 ++ dlls/win32u/sysparams.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 4 ++-- dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 15 +++++++++++++++ include/ntuser.h | 9 +++++++++ 7 files changed, 90 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aab62429c2aac5dbd653…

1 0

Jacek Caban : win32u: Move DPI mapping from GetMonitorInfoW.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 7aab49d736449d9f8e72a588111df934bb822f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aab49d736449d9f8e72a588… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:09:37 2021 +0100 win32u: Move DPI mapping from GetMonitorInfoW. 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/sysparams.c | 17 +---------------- dlls/win32u/sysparams.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 11a2532411d..56f1c444072 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3543,22 +3543,7 @@ BOOL WINAPI GetMonitorInfoA( HMONITOR monitor, LPMONITORINFO info ) */ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) { - BOOL ret; - UINT dpi_from, dpi_to; - - ret = NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, NtUserGetMonitorInfo ); - if (ret) - { - if ((dpi_to = get_thread_dpi())) - { - dpi_from = get_monitor_dpi( monitor ); - info->rcMonitor = map_dpi_rect( info->rcMonitor, dpi_from, dpi_to ); - info->rcWork = map_dpi_rect( info->rcWork, dpi_from, dpi_to ); - } - TRACE( "flags %04x, monitor %s, work %s\n", info->dwFlags, - wine_dbgstr_rect(&info->rcMonitor), wine_dbgstr_rect(&info->rcWork)); - } - return ret; + return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, NtUserGetMonitorInfo ); } struct enum_mon_data diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 74ab94aa818..4ff6f81846a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1382,6 +1382,34 @@ static DPI_AWARENESS get_thread_dpi_awareness(void) } } +/********************************************************************** + * get_thread_dpi + */ +static UINT get_thread_dpi(void) +{ + switch (get_thread_dpi_awareness()) + { + case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; + case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; + default: return 0; /* no scaling */ + } +} + +/********************************************************************** + * map_dpi_rect + */ +RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) +{ + if (dpi_from && dpi_to && dpi_from != dpi_to) + { + rect.left = muldiv( rect.left, dpi_to, dpi_from ); + rect.top = muldiv( rect.top, dpi_to, dpi_from ); + rect.right = muldiv( rect.right, dpi_to, dpi_from ); + rect.bottom = muldiv( rect.bottom, dpi_to, dpi_from ); + } + return rect; +} + /********************************************************************** * NtUserGetDisplayConfigBufferSizes (win32u.@) */ @@ -1756,6 +1784,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) { struct monitor *monitor; + UINT dpi_from, dpi_to; if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; @@ -1778,6 +1807,15 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) asciiz_to_unicode( ((MONITORINFOEXW *)info)->szDevice, "WinDisc" ); } unlock_display_devices(); + + if ((dpi_to = get_thread_dpi())) + { + dpi_from = get_monitor_dpi( handle ); + info->rcMonitor = map_dpi_rect( info->rcMonitor, dpi_from, dpi_to ); + info->rcWork = map_dpi_rect( info->rcWork, dpi_from, dpi_to ); + } + TRACE( "flags %04x, monitor %s, work %s\n", info->dwFlags, + wine_dbgstr_rect(&info->rcMonitor), wine_dbgstr_rect(&info->rcWork)); return TRUE; }

1 0

Jacek Caban : win32u: Add partial wow64 support.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: ac9119badbd2d600430d93670219e6b9de0af5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac9119badbd2d600430d9367… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:07:35 2021 +0100 win32u: Add partial wow64 support. 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/syscall.c | 18 ++++++ dlls/win32u/wrappers.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 157 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9119badbd2d600430d…

1 0

Gijs Vermeulen : mfplat/tests: Skip test_d3d11_surface_buffer if D3D11 device can't be created.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: fbce38c5daff9472c5becae20e3e08a083049954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbce38c5daff9472c5becae2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Dec 4 14:04:38 2021 +0100 mfplat/tests: Skip test_d3d11_surface_buffer if D3D11 device can't be created. Lets tests run successfully on macOS. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cee90567084..4dfdc18bb52 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6589,7 +6589,12 @@ static void test_d3d11_surface_buffer(void) return; } - device = create_d3d11_device(); + /* d3d11 */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } memset(&desc, 0, sizeof(desc)); desc.Width = 64;

1 0