March 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Fix a few more test failures on ARM64EC.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 92d20c11204f2abe1de98246784bcc1587a0cfd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d20c11204f2abe1de98246784bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 11:24:42 2024 +0100 ntdll/tests: Fix a few more test failures on ARM64EC. --- dlls/ntdll/tests/exception.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2b6ddecf9e5..3fa0c1801b4 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3853,7 +3853,7 @@ static void test_thread_context(void) { ok( context.ContextFlags == (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT), "wrong flags %08lx\n", context.ContextFlags ); - ok( (context.EFlags & ~0xc5) == (expect.EFlags & ~0xc5), "wrong EFlags %lx / %I64x\n", + ok( (context.EFlags & ~0xd5) == (expect.EFlags & ~0xd5), "wrong EFlags %lx / %I64x\n", context.EFlags, expect.EFlags ); ok( context.SegCs == 0xcccc, "wrong SegCs %x\n", context.SegCs); ok( context.SegDs == 0xcccc, "wrong SegDs %x\n", context.SegDs); @@ -4845,7 +4845,8 @@ static void test_KiUserApcDispatcher(void) pNtQueueApcThread( GetCurrentThread(), apc_func, 0x1234, 0x5678, 0xdeadbeef ); SleepEx( 0, TRUE ); ok( apc_called, "APC was not called\n" ); - ok( hook_called, "hook was not called\n" ); + /* hooking is bypassed on arm64ec */ + ok( is_arm64ec ? !hook_called : hook_called, "hook was not called\n" ); VirtualProtect( pKiUserApcDispatcher, sizeof(saved_KiUserApcDispatcher), old_protect, &old_protect ); } @@ -5144,6 +5145,8 @@ static void test_syscall_clobbered_regs(void) CONTEXT context; NTSTATUS status; + if (is_arm64ec) return; /* arm64ec register handling is different */ + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); memcpy(code_mem, code, sizeof(code)); @@ -8339,10 +8342,13 @@ static void subtest_fastfail(unsigned int code) if (de.u.Exception.ExceptionRecord.ExceptionCode == STATUS_STACK_BUFFER_OVERRUN) { ok(!de.u.Exception.dwFirstChance, "must be a second chance exception\n"); - ok(de.u.Exception.ExceptionRecord.NumberParameters == 1, "expected exactly one parameter, got %lu\n", + ok(de.u.Exception.ExceptionRecord.NumberParameters == 1 || broken(is_arm64ec), + "expected exactly one parameter, got %lu\n", de.u.Exception.ExceptionRecord.NumberParameters); - ok(de.u.Exception.ExceptionRecord.ExceptionInformation[0] == code, "expected %u for code, got %Iu\n", - code, de.u.Exception.ExceptionRecord.ExceptionInformation[0]); + if (de.u.Exception.ExceptionRecord.NumberParameters >= 1) + ok(de.u.Exception.ExceptionRecord.ExceptionInformation[0] == code, + "expected %u for code, got %Iu\n", + code, de.u.Exception.ExceptionRecord.ExceptionInformation[0]); had_ff = TRUE; } @@ -10760,7 +10766,7 @@ static void test_set_live_context(void) static void test_backtrace(void) { void *buffer[1024]; - WCHAR *p, name[MAX_PATH]; + WCHAR name[MAX_PATH]; void *module; ULONG hash, hash_expect; int i, count = RtlCaptureStackBackTrace( 0, 1024, buffer, &hash ); @@ -10769,16 +10775,20 @@ static void test_backtrace(void) for (i = hash_expect = 0; i < count; i++) hash_expect += (ULONG_PTR)buffer[i]; ok( hash == hash_expect, "hash mismatch %lx / %lx\n", hash, hash_expect ); RtlPcToFileHeader( buffer[0], &module ); - ok( module == GetModuleHandleA(0), "wrong module %p/%p for %p\n", - module, GetModuleHandleA(0), buffer[0]); + if (is_arm64ec && module == hntdll) /* Windows arm64ec has an extra frame for the entry thunk */ + { + ok( count > 1, "wrong count %u\n", count ); + RtlPcToFileHeader( buffer[1], &module ); + } + GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); + ok( module == GetModuleHandleA(0), "wrong module %p %s / %p for %p\n", + module, debugstr_w(name), GetModuleHandleA(0), buffer[0]); if (count && !buffer[count - 1]) count--; /* win11 32-bit */ if (count <= 1) return; RtlPcToFileHeader( buffer[count - 1], &module ); GetModuleFileNameW( module, name, ARRAY_SIZE(name) ); - if ((p = wcsrchr( name, '\\' ))) p++; - else p = name; - ok( !wcsicmp( p, L"ntdll.dll" ), "wrong module %p %s for frame %u %p\n", + ok( module == hntdll, "wrong module %p %s for frame %u %p\n", module, debugstr_w(name), count - 1, buffer[count - 1] ); }

1 0

Alexandre Julliard : ntdll: Implement RtlGetCallersAddress.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 180bd1044b9594659bd560048859c5d2beb159d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/180bd1044b9594659bd560048859c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 17:57:30 2024 +0100 ntdll: Implement RtlGetCallersAddress. --- dlls/ntdll/exception.c | 14 ++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/exception.c | 14 ++++++++++++++ include/rtlsupportapi.h | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index ac5f403131f..bf4a53e1b6e 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -531,6 +531,20 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, void **buffer, } +/************************************************************************* + * RtlGetCallersAddress (NTDLL.@) + */ +void WINAPI RtlGetCallersAddress( void **caller, void **parent ) +{ + void *buffer[2]; + ULONG count = ARRAY_SIZE(buffer), skip = 2; /* skip our frame and the parent */ + + count = RtlWalkFrameChain( buffer, count + skip, skip << 8 ); + *caller = count > 0 ? buffer[0] : NULL; + *parent = count > 1 ? buffer[1] : NULL; +} + + /********************************************************************** * RtlGetEnabledExtendedFeatures (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3d45b3d1e9a..d40bfd33a58 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -716,7 +716,7 @@ @ stub RtlGenerate8dot3Name @ stdcall RtlGetAce(ptr long ptr) @ stdcall RtlGetActiveActivationContext(ptr) -@ stub RtlGetCallersAddress +@ stdcall RtlGetCallersAddress(ptr ptr) @ stdcall RtlGetCompressionWorkSpaceSize(long ptr ptr) @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3fa0c1801b4..d3c279ecab8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -66,6 +66,7 @@ static void * (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG static void (WINAPI *pRtlSetExtendedFeaturesMask)(CONTEXT_EX *context_ex, ULONG64 feature_mask); static ULONG64 (WINAPI *pRtlGetExtendedFeaturesMask)(CONTEXT_EX *context_ex); static void * (WINAPI *pRtlPcToFileHeader)(PVOID pc, PVOID *address); +static void (WINAPI *pRtlGetCallersAddress)(void**,void**); static NTSTATUS (WINAPI *pNtRaiseException)(EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); @@ -10784,6 +10785,18 @@ static void test_backtrace(void) ok( module == GetModuleHandleA(0), "wrong module %p %s / %p for %p\n", module, debugstr_w(name), GetModuleHandleA(0), buffer[0]); + if (pRtlGetCallersAddress) + { + void *caller, *parent; + + caller = parent = (void *)0xdeadbeef; + pRtlGetCallersAddress( &caller, &parent ); + ok( caller == (count > 1 ? buffer[1] : NULL) || broken(is_arm64ec), /* caller is entry thunk */ + "wrong caller %p / %p\n", caller, buffer[1] ); + ok( parent == (count > 2 ? buffer[2] : NULL), "wrong parent %p / %p\n", parent, buffer[2] ); + } + else win_skip( "RtlGetCallersAddress not supported\n" ); + if (count && !buffer[count - 1]) count--; /* win11 32-bit */ if (count <= 1) return; RtlPcToFileHeader( buffer[count - 1], &module ); @@ -10844,6 +10857,7 @@ START_TEST(exception) X(RtlSetExtendedFeaturesMask); X(RtlGetExtendedFeaturesMask); X(RtlPcToFileHeader); + X(RtlGetCallersAddress); X(RtlCopyContext); X(RtlCopyExtendedContext); X(KiUserApcDispatcher); diff --git a/include/rtlsupportapi.h b/include/rtlsupportapi.h index becb6179a56..a9dd5515501 100644 --- a/include/rtlsupportapi.h +++ b/include/rtlsupportapi.h @@ -24,6 +24,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); NTSYSAPI void WINAPI RtlCaptureContext2(CONTEXT*); NTSYSAPI USHORT WINAPI RtlCaptureStackBackTrace(ULONG,ULONG,void**,ULONG*); +NTSYSAPI void WINAPI RtlGetCallersAddress(void**,void**); NTSYSAPI void WINAPI RtlRaiseException(EXCEPTION_RECORD*); NTSYSAPI void CDECL RtlRestoreContext(CONTEXT*,EXCEPTION_RECORD*); NTSYSAPI void WINAPI RtlUnwind(void*,void*,EXCEPTION_RECORD*,void*);

1 0

Alexandre Julliard : kernelbase: Remove no longer needed DllMainCRTStartup function.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 866907ee3dab7231cf0c87da66a35fbbac36e848 URL: https://gitlab.winehq.org/wine/wine/-/commit/866907ee3dab7231cf0c87da66a35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 17:22:39 2024 +0100 kernelbase: Remove no longer needed DllMainCRTStartup function. --- dlls/kernelbase/main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 0309ec91589..60173ba6513 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -55,15 +55,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } -/************************************************************* - * DllMainCRTStartup - */ -BOOL WINAPI DllMainCRTStartup( HANDLE inst, DWORD reason, LPVOID reserved ) -{ - return DllMain( inst, reason, reserved ); -} - - /*********************************************************************** * MulDiv (kernelbase.@) */

1 0

Rémi Bernon : win32u: Add an adapter struct to the device manager context.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 737e9d7ffc95dc476cab9f564fa2aa9e2c5a9520 URL: https://gitlab.winehq.org/wine/wine/-/commit/737e9d7ffc95dc476cab9f564fa2aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 10:19:36 2024 +0100 win32u: Add an adapter struct to the device manager context. --- dlls/win32u/sysparams.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6c4223f0cdb..dee9632d527 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -125,7 +125,8 @@ struct adapter unsigned int id; struct gpu *gpu; const WCHAR *config_key; - unsigned int mode_count; + UINT monitor_count; + UINT mode_count; DEVMODEW *modes; }; @@ -994,13 +995,12 @@ static unsigned int format_date( WCHAR *bufferW, LONGLONG time ) struct device_manager_ctx { - unsigned int gpu_count; - unsigned int video_count; - unsigned int monitor_count; - unsigned int output_count; - unsigned int mode_count; + UINT gpu_count; + UINT adapter_count; + UINT monitor_count; HANDLE mutex; struct gpu gpu; + struct adapter adapter; HKEY adapter_key; /* for the virtual desktop settings */ BOOL is_primary; @@ -1276,9 +1276,6 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) lstrcpyW( ctx->gpu.name, gpu->name ); ctx->gpu.vulkan_uuid = gpu->vulkan_uuid; - ctx->monitor_count = 0; - ctx->mode_count = 0; - sprintf( ctx->gpu.path, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, ctx->gpu.index ); if (!(hkey = reg_create_ascii_key( enum_key, ctx->gpu.path, 0, NULL ))) return; @@ -1329,7 +1326,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) static void add_adapter( const struct gdi_adapter *adapter, void *param ) { struct device_manager_ctx *ctx = param; - unsigned int adapter_index, video_index, len; + unsigned int adapter_index, len; char name[64], buffer[MAX_PATH]; WCHAR bufferW[MAX_PATH]; HKEY hkey; @@ -1343,24 +1340,23 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) } adapter_index = ctx->gpu.adapter_count++; - video_index = ctx->video_count++; - ctx->monitor_count = 0; - ctx->mode_count = 0; - snprintf( buffer, ARRAY_SIZE(buffer), "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%s\\%04x", - ctx->gpu.guid, adapter_index ); + memset( &ctx->adapter, 0, sizeof(ctx->adapter) ); + ctx->adapter.gpu = &ctx->gpu; + ctx->adapter.id = ctx->adapter_count++; + + snprintf( buffer, ARRAY_SIZE(buffer), "%s\\Video\\%s\\%04x", control_keyA, ctx->gpu.guid, adapter_index ); len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); if (!hkey) hkey = reg_create_ascii_key( NULL, buffer, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); - sprintf( name, "\\Device\\Video%u", video_index ); + sprintf( name, "\\Device\\Video%u", ctx->adapter.id ); set_reg_ascii_value( video_key, name, buffer ); if (hkey) { - sprintf( buffer, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class\\" - "%s\\%04X", guid_devclass_displayA, ctx->gpu_count - 1 ); + sprintf( buffer, "%s\\Class\\%s\\%04X", control_keyA, guid_devclass_displayA, ctx->gpu.index ); len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); set_reg_value( hkey, symbolic_link_valueW, REG_LINK, bufferW, len ); NtClose( hkey ); @@ -1387,8 +1383,8 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) HKEY hkey, subkey; unsigned int len; - monitor_index = ctx->monitor_count++; - output_index = ctx->output_count++; + monitor_index = ctx->adapter.monitor_count++; + output_index = ctx->monitor_count++; TRACE( "%u %s %s\n", monitor_index, wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); @@ -1399,7 +1395,7 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) strcpy( monitor_id_string, "Default_Monitor" ); sprintf( buffer, "MonitorID%u", monitor_index ); - sprintf( instance, "DISPLAY\\%s\\%04X&%04X", monitor_id_string, ctx->video_count - 1, monitor_index ); + sprintf( instance, "DISPLAY\\%s\\%04X&%04X", monitor_id_string, ctx->adapter.id, monitor_index ); set_reg_ascii_value( ctx->adapter_key, buffer, instance ); hkey = reg_create_ascii_key( enum_key, instance, 0, NULL ); @@ -1491,10 +1487,10 @@ static void add_mode( const DEVMODEW *mode, BOOL current, void *param ) nopos_mode.dmPosition.y = 0; nopos_mode.dmFields &= ~DM_POSITION; - if (write_adapter_mode( ctx->adapter_key, ctx->mode_count, &nopos_mode )) + if (write_adapter_mode( ctx->adapter_key, ctx->adapter.mode_count, &nopos_mode )) { - ctx->mode_count++; - set_reg_value( ctx->adapter_key, mode_countW, REG_DWORD, &ctx->mode_count, sizeof(ctx->mode_count) ); + ctx->adapter.mode_count++; + set_reg_value( ctx->adapter_key, mode_countW, REG_DWORD, &ctx->adapter.mode_count, sizeof(ctx->adapter.mode_count) ); if (current) { if (!read_adapter_mode( ctx->adapter_key, ENUM_REGISTRY_SETTINGS, &nopos_mode ))

1 0

Rémi Bernon : win32u: Split writing monitor to registry to a separate helper.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: 3bcd6f1aabdf96132d529ef110efc500e13b692e URL: https://gitlab.winehq.org/wine/wine/-/commit/3bcd6f1aabdf96132d529ef110efc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 16:42:02 2024 +0100 win32u: Split writing monitor to registry to a separate helper. --- dlls/win32u/sysparams.c | 89 ++++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index dee9632d527..2be223a8a46 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -148,6 +148,7 @@ struct edid_monitor_info struct monitor { struct list entry; + char path[MAX_PATH]; struct display_device dev; struct adapter *adapter; HANDLE handle; @@ -1372,45 +1373,24 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) sizeof(adapter->state_flags) ); } -static void add_monitor( const struct gdi_monitor *monitor, void *param ) +static BOOL write_monitor_to_registry( struct monitor *monitor, const BYTE *edid, UINT edid_len ) { - struct device_manager_ctx *ctx = param; - char buffer[MAX_PATH], instance[64]; - unsigned int monitor_index, output_index; - struct edid_monitor_info monitor_info; - char monitor_id_string[16]; - WCHAR bufferW[MAX_PATH]; + char buffer[1024], *tmp; + WCHAR bufferW[1024]; HKEY hkey, subkey; unsigned int len; - monitor_index = ctx->adapter.monitor_count++; - output_index = ctx->monitor_count++; - - TRACE( "%u %s %s\n", monitor_index, wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); - - get_monitor_info_from_edid( &monitor_info, monitor->edid, monitor->edid_len ); - if (monitor_info.flags & MONITOR_INFO_HAS_MONITOR_ID) - strcpy( monitor_id_string, monitor_info.monitor_id_string ); - else - strcpy( monitor_id_string, "Default_Monitor" ); - - sprintf( buffer, "MonitorID%u", monitor_index ); - sprintf( instance, "DISPLAY\\%s\\%04X&%04X", monitor_id_string, ctx->adapter.id, monitor_index ); - set_reg_ascii_value( ctx->adapter_key, buffer, instance ); - - hkey = reg_create_ascii_key( enum_key, instance, 0, NULL ); - if (!hkey) return; - - link_device( instance, guid_devinterface_monitorA ); + if (!(hkey = reg_create_ascii_key( enum_key, monitor->path, 0, NULL ))) return FALSE; set_reg_ascii_value( hkey, "DeviceDesc", "Generic Non-PnP Monitor" ); set_reg_ascii_value( hkey, "Class", "Monitor" ); - sprintf( buffer, "%s\\%04X", guid_devclass_monitorA, output_index ); + sprintf( buffer, "%s\\%04X", guid_devclass_monitorA, monitor->output_id ); set_reg_ascii_value( hkey, "Driver", buffer ); set_reg_ascii_value( hkey, "ClassGUID", guid_devclass_monitorA ); - sprintf( buffer, "MONITOR\\%s", monitor_id_string ); + sprintf( buffer, "MONITOR\\%s", monitor->path + 8 ); + if ((tmp = strrchr( buffer, '\\' ))) *tmp = 0; len = asciiz_to_unicode( bufferW, buffer ); bufferW[len / sizeof(WCHAR)] = 0; set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, bufferW, len + sizeof(WCHAR) ); @@ -1420,8 +1400,8 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static const WCHAR edidW[] = {'E','D','I','D',0}; - if (monitor->edid_len) - set_reg_value( subkey, edidW, REG_BINARY, monitor->edid, monitor->edid_len ); + if (edid_len) + set_reg_value( subkey, edidW, REG_BINARY, edid, edid_len ); else set_reg_value( subkey, bad_edidW, REG_BINARY, NULL, 0 ); NtClose( subkey ); @@ -1448,7 +1428,7 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) if ((subkey = reg_create_ascii_key( hkey, devpropkey_monitor_gpu_luidA, 0, NULL ))) { set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_INT64, - &ctx->gpu.luid, sizeof(ctx->gpu.luid) ); + &monitor->adapter->gpu->luid, sizeof(monitor->adapter->gpu->luid) ); NtClose( subkey ); } @@ -1456,15 +1436,54 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) if ((subkey = reg_create_ascii_key( hkey, devpropkey_monitor_output_idA, 0, NULL ))) { set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, - &output_index, sizeof(output_index) ); + &monitor->output_id, sizeof(monitor->output_id) ); NtClose( subkey ); } NtClose( hkey ); - sprintf( buffer, "Class\\%s\\%04X", guid_devclass_monitorA, output_index ); - hkey = reg_create_ascii_key( control_key, buffer, 0, NULL ); - if (hkey) NtClose( hkey ); + + sprintf( buffer, "Class\\%s\\%04X", guid_devclass_monitorA, monitor->output_id ); + if (!(hkey = reg_create_ascii_key( control_key, buffer, 0, NULL ))) return FALSE; + NtClose( hkey ); + + link_device( monitor->path, guid_devinterface_monitorA ); + + return TRUE; +} + +static void add_monitor( const struct gdi_monitor *gdi_monitor, void *param ) +{ + struct device_manager_ctx *ctx = param; + struct monitor monitor = {0}; + char buffer[MAX_PATH]; + char monitor_id_string[16]; + + monitor.adapter = &ctx->adapter; + monitor.id = ctx->adapter.monitor_count; + monitor.output_id = ctx->monitor_count; + monitor.rc_monitor = gdi_monitor->rc_monitor; + monitor.rc_work = gdi_monitor->rc_work; + + TRACE( "%u %s %s\n", monitor.id, wine_dbgstr_rect(&gdi_monitor->rc_monitor), wine_dbgstr_rect(&gdi_monitor->rc_work) ); + + get_monitor_info_from_edid( &monitor.edid_info, gdi_monitor->edid, gdi_monitor->edid_len ); + if (monitor.edid_info.flags & MONITOR_INFO_HAS_MONITOR_ID) + strcpy( monitor_id_string, monitor.edid_info.monitor_id_string ); + else + strcpy( monitor_id_string, "Default_Monitor" ); + + sprintf( buffer, "MonitorID%u", monitor.id ); + sprintf( monitor.path, "DISPLAY\\%s\\%04X&%04X", monitor_id_string, ctx->adapter.id, monitor.id ); + set_reg_ascii_value( ctx->adapter_key, buffer, monitor.path ); + + if (!write_monitor_to_registry( &monitor, gdi_monitor->edid, gdi_monitor->edid_len )) + WARN( "Failed to write monitor to registry\n" ); + else + { + ctx->adapter.monitor_count++; + ctx->monitor_count++; + } } static void add_mode( const DEVMODEW *mode, BOOL current, void *param )

1 0

Rémi Bernon : win32u: Get rid of the monitor display_device.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: caf9585c3cb31c5ea59d279d1e61a9dc65d99f93 URL: https://gitlab.winehq.org/wine/wine/-/commit/caf9585c3cb31c5ea59d279d1e61a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:32:27 2024 +0100 win32u: Get rid of the monitor display_device. --- dlls/win32u/sysparams.c | 225 ++++++++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 103 deletions(-)

1 0

Rémi Bernon : win32u: Get rid of the monitor state_flags.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: e6a8fc244896ae479d85f25c46f31515480e3af5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6a8fc244896ae479d85f25c46f315… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 12:38:12 2024 +0100 win32u: Get rid of the monitor state_flags. --- dlls/win32u/sysparams.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 588657e4de3..9b3d6b3e3ae 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -153,7 +153,6 @@ struct monitor RECT rc_monitor; RECT rc_work; BOOL is_clone; - UINT state_flags; struct edid_monitor_info edid_info; }; @@ -1552,6 +1551,15 @@ static void clear_display_devices(void) } } +static BOOL is_monitor_active( struct monitor *monitor ) +{ + struct adapter *adapter; + /* services do not have any adapters, only a virtual monitor */ + if (!(adapter = monitor->adapter)) return TRUE; + if (!(adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) return FALSE; + return !IsRectEmpty( &monitor->rc_monitor ); +} + static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) ) { char buffer[1024]; @@ -1682,14 +1690,11 @@ static BOOL update_display_cache_from_registry(void) monitor->id = monitor_id; monitor->adapter = adapter_acquire( adapter ); - monitor->state_flags |= DISPLAY_DEVICE_ATTACHED; if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { - if (!IsRectEmpty(&monitor->rc_monitor)) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; - LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) { - if (!(monitor2->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (!is_monitor_active( monitor2 )) continue; if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) { monitor->is_clone = TRUE; @@ -2248,7 +2253,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (!is_monitor_active( monitor )) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); } @@ -2269,8 +2274,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) { RECT monrect; - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; + if (!is_monitor_active( monitor )) continue; monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), get_thread_dpi() ); @@ -2357,8 +2361,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in { LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; + if (!is_monitor_active( monitor )) continue; count++; } unlock_display_devices(); @@ -2541,8 +2544,7 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAY LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; + if (!is_monitor_active( monitor )) continue; if (!monitor->adapter) continue; @@ -2727,8 +2729,12 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, } if (info->cb >= offsetof(DISPLAY_DEVICEW, StateFlags) + sizeof(info->StateFlags)) { - if (monitor) info->StateFlags = monitor->state_flags; - else info->StateFlags = adapter->dev.state_flags; + if (!monitor) info->StateFlags = adapter->dev.state_flags; + else + { + info->StateFlags = DISPLAY_DEVICE_ATTACHED; + if (is_monitor_active( monitor )) info->StateFlags |= DISPLAY_DEVICE_ACTIVE; + } } if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) { @@ -3329,7 +3335,8 @@ static unsigned int active_monitor_count(void) LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - if ((monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) count++; + if (!is_monitor_active( monitor )) continue; + count++; } return count; } @@ -3414,7 +3421,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc { RECT monrect; - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (!is_monitor_active( monitor )) continue; monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), get_thread_dpi() ); @@ -3460,7 +3467,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { if (monitor->handle != handle) continue; - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) break; + if (!is_monitor_active( monitor )) continue; /* FIXME: map dpi */ info->rcMonitor = monitor->rc_monitor; @@ -3512,7 +3519,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { RECT intersect, monitor_rect; - if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (!is_monitor_active( monitor )) continue; monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r ))

1 0

Rémi Bernon : win32u: Get rid of the adapter display_device.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: d77d36b1f4b60cb958efc0c49e2e762f6ae3431e URL: https://gitlab.winehq.org/wine/wine/-/commit/d77d36b1f4b60cb958efc0c49e2e76… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 11 08:32:23 2024 +0100 win32u: Get rid of the adapter display_device. --- dlls/win32u/sysparams.c | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 70 deletions(-)

1 0

Rémi Bernon : win32u: Get rid of the monitor flags.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: b4e4921cb6fc43dbf4d7256762badde181751e08 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4e4921cb6fc43dbf4d7256762badd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 12:40:27 2024 +0100 win32u: Get rid of the monitor flags. --- dlls/win32u/sysparams.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index cf1af54275d..fe1c77afe79 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -137,7 +137,6 @@ struct monitor struct adapter *adapter; HANDLE handle; unsigned int id; - unsigned int flags; unsigned int output_id; RECT rc_monitor; RECT rc_work; @@ -157,7 +156,6 @@ BOOL enable_thunk_lock = FALSE; static struct monitor virtual_monitor = { .handle = VIRTUAL_HMONITOR, - .flags = MONITORINFOF_PRIMARY, .rc_monitor.right = 1024, .rc_monitor.bottom = 768, .rc_work.right = 1024, @@ -663,15 +661,12 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; - BOOL is_primary = !!(adapter->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *value_str = (WCHAR *)value->Data; HKEY hkey, subkey; DWORD size; UINT i; - monitor->flags = is_primary ? MONITORINFOF_PRIMARY : 0; - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) return FALSE; @@ -1530,6 +1525,14 @@ static BOOL is_monitor_active( struct monitor *monitor ) return !IsRectEmpty( &monitor->rc_monitor ); } +static BOOL is_monitor_primary( struct monitor *monitor ) +{ + struct adapter *adapter; + /* services do not have any adapters, only a virtual monitor */ + if (!(adapter = monitor->adapter)) return TRUE; + return !!(adapter->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); +} + static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) ) { char buffer[1024]; @@ -2304,7 +2307,7 @@ RECT get_primary_monitor_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->flags & MONITORINFOF_PRIMARY)) continue; + if (!is_monitor_primary( monitor )) continue; rect = monitor->rc_monitor; break; } @@ -3471,7 +3474,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) /* FIXME: map dpi */ info->rcMonitor = monitor->rc_monitor; info->rcWork = monitor->rc_work; - info->dwFlags = monitor->flags; + info->dwFlags = is_monitor_primary( monitor ) ? MONITORINFOF_PRIMARY : 0; if (info->cbSize >= sizeof(MONITORINFOEXW)) { char buffer[CCHDEVICENAME]; @@ -3550,7 +3553,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) } } - if (monitor->flags & MONITORINFOF_PRIMARY) primary = monitor->handle; + if (is_monitor_primary( monitor )) primary = monitor->handle; } unlock_display_devices(); @@ -5120,7 +5123,7 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->flags & MONITORINFOF_PRIMARY)) continue; + if (!is_monitor_primary( monitor )) continue; work_area = monitor->rc_work; break; }

1 0

Rémi Bernon : win32u: Enumerate monitors from their device keys.
by Alexandre Julliard 14 Mar '24

14 Mar '24

Module: wine Branch: master Commit: b59619d2e4df7bf2db4889cf7c80b9147627b975 URL: https://gitlab.winehq.org/wine/wine/-/commit/b59619d2e4df7bf2db4889cf7c80b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:33:21 2024 +0100 win32u: Enumerate monitors from their device keys. --- dlls/win32u/sysparams.c | 135 ++++++++++++++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 50 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fe1c77afe79..efcf8f64841 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -74,6 +74,9 @@ static const WCHAR guid_devclass_displayW[] = {'{','4','D','3','6','E','9','6','8','-','E','3','2','5','-','1','1','C','E','-', 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; +static const WCHAR guid_devclass_monitorW[] = + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-', + 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devinterface_display_adapterA[] = "{5B45201D-F2F2-4F3B-85BB-30FF1F953599}"; static const char guid_display_device_arrivalA[] = "{1CA05180-A699-450A-9A0C-DE4FBE3DDD89}"; @@ -658,28 +661,14 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i return TRUE; } -static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) +static BOOL read_monitor_from_registry( struct monitor *monitor ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; - WCHAR *value_str = (WCHAR *)value->Data; HKEY hkey, subkey; DWORD size; - UINT i; - - if (!(hkey = reg_open_key( config_key, adapter->config_key, - lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) - return FALSE; - - /* Interface name */ - sprintf( buffer, "MonitorID%u", index ); - size = query_reg_ascii_value( hkey, buffer, value, sizeof(buffer) ); - NtClose( hkey ); - if (!size || value->Type != REG_SZ) return FALSE; - for (i = 0; i < value->DataLength / sizeof(WCHAR); i++) monitor->path[i] = value_str[i]; - if (!(hkey = reg_open_key( enum_key, value_str, value->DataLength - sizeof(WCHAR) ))) - return FALSE; + if (!(hkey = reg_open_ascii_key( enum_key, monitor->path ))) return FALSE; /* Output ID */ size = query_reg_subkey_value( hkey, devpropkey_monitor_output_idA, @@ -723,6 +712,22 @@ static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct m return TRUE; } +static BOOL read_adapter_monitor_path( HKEY hkey, UINT index, char *path ) +{ + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + WCHAR *value_str = (WCHAR *)value->Data; + DWORD size; + UINT i; + + sprintf( buffer, "MonitorID%u", index ); + size = query_reg_ascii_value( hkey, buffer, value, sizeof(buffer) ); + if (!size || value->Type != REG_SZ) return FALSE; + + for (i = 0; i < value->DataLength / sizeof(WCHAR); i++) path[i] = value_str[i]; + return TRUE; +} + static void reg_empty_key( HKEY root, const char *key_name ) { char buffer[4096]; @@ -1598,16 +1603,36 @@ static struct gpu *find_gpu_from_path( const char *path ) return NULL; } +static void enum_monitors( const char *path ) +{ + struct monitor *monitor; + if (!(monitor = calloc( 1, sizeof(*monitor) ))) return; + strcpy( monitor->path, path ); + list_add_tail( &monitors, &monitor->entry ); +} + +static struct monitor *find_monitor_from_path( const char *path ) +{ + struct monitor *monitor; + + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + if (!strcmp( monitor->path, path )) return monitor; + + ERR( "Failed to find monitor with path %s\n", debugstr_a(path) ); + return NULL; +} + static BOOL update_display_cache_from_registry(void) { char path[MAX_PATH]; DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_BASIC_INFORMATION key; struct adapter *adapter; - struct monitor *monitor, *monitor2; + struct monitor *monitor; HANDLE mutex = NULL; NTSTATUS status; struct gpu *gpu; + HKEY hkey; BOOL ret; /* If user driver did initialize the registry, then exit */ @@ -1629,6 +1654,7 @@ static BOOL update_display_cache_from_registry(void) clear_display_devices(); enum_device_keys( "PCI", guid_devclass_displayW, sizeof(guid_devclass_displayW), enum_gpus ); + enum_device_keys( "DISPLAY", guid_devclass_monitorW, sizeof(guid_devclass_monitorW), enum_monitors ); LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) { @@ -1636,6 +1662,12 @@ static BOOL update_display_cache_from_registry(void) WARN( "Failed to read gpu from registry\n" ); } + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + if (!read_monitor_from_registry( monitor )) + WARN( "Failed to read monitor from registry\n" ); + } + for (adapter_id = 0;; adapter_id++) { if (!(adapter = calloc( 1, sizeof(*adapter) ))) break; @@ -1651,34 +1683,24 @@ static BOOL update_display_cache_from_registry(void) } list_add_tail( &adapters, &adapter->entry ); + + size = lstrlenW( adapter->config_key ) * sizeof(WCHAR); + if (!(hkey = reg_open_key( config_key, adapter->config_key, size ))) continue; + for (monitor_id = 0;; monitor_id++) { - if (!(monitor = calloc( 1, sizeof(*monitor) ))) break; - if (!read_monitor_settings( adapter, monitor_id, monitor )) - { - free( monitor ); - break; - } + struct monitor *monitor; + + if (!read_adapter_monitor_path( hkey, monitor_id, path )) break; + if (!(monitor = find_monitor_from_path( path ))) continue; monitor->id = monitor_id; monitor->adapter = adapter_acquire( adapter ); - - if (adapter->state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) - { - LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) - { - if (!is_monitor_active( monitor2 )) continue; - if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) - { - monitor->is_clone = TRUE; - break; - } - } - } - monitor->handle = UlongToHandle( ++monitor_count ); - list_add_tail( &monitors, &monitor->entry ); + if (adapter->monitor_count++) monitor->is_clone = TRUE; } + + NtClose( hkey ); } if ((ret = !list_empty( &adapters ) && !list_empty( &monitors ))) @@ -3378,6 +3400,18 @@ INT get_display_depth( UNICODE_STRING *name ) return depth; } +static BOOL should_enumerate_monitor( struct monitor *monitor, const POINT *origin, + const RECT *limit, RECT *rect ) +{ + if (!is_monitor_active( monitor )) return FALSE; + if (monitor->is_clone) return FALSE; + + *rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + get_thread_dpi() ); + OffsetRect( rect, -origin->x, -origin->y ); + return intersect_rect( rect, rect, limit ); +} + /*********************************************************************** * NtUserEnumDisplayMonitors (win32u.@) */ @@ -3419,21 +3453,22 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc } count = 0; + + /* enumerate primary monitors first */ LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - RECT monrect; - - if (!is_monitor_active( monitor )) continue; - - monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - get_thread_dpi() ); - OffsetRect( &monrect, -origin.x, -origin.y ); - if (!intersect_rect( &monrect, &monrect, &limit )) continue; - if (monitor->is_clone) continue; + if (!is_monitor_primary( monitor )) continue; + if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + enum_info[count++].handle = monitor->handle; + break; + } - enum_info[count].handle = monitor->handle; - enum_info[count].rect = monrect; - count++; + /* then non-primary monitors */ + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + { + if (is_monitor_primary( monitor )) continue; + if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + enum_info[count++].handle = monitor->handle; } unlock_display_devices();

1 0