April 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dx10/tests: Port some additional D3DX10GetImageInfoFromMemory() tests from d3dx11.
by Alexandre Julliard April 7, 2023

April 7, 2023

Module: wine Branch: master Commit: 2666d020dedc2a8866f21567200659b73690a40b URL: https://gitlab.winehq.org/wine/wine/-/commit/2666d020dedc2a8866f21567200659… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 31 17:10:11 2023 -0500 d3dx10/tests: Port some additional D3DX10GetImageInfoFromMemory() tests from d3dx11. --- dlls/d3dx10_43/tests/d3dx10.c | 303 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 297 insertions(+), 6 deletions(-)

1 0

Paul Gofman : win32u: Set DEVPKEY_Device_BusNumber for GPUs.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: bee387dc8a2c19cc82f2f12973159fcdf738d455 URL: https://gitlab.winehq.org/wine/wine/-/commit/bee387dc8a2c19cc82f2f12973159f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 20 13:02:31 2023 -0600 win32u: Set DEVPKEY_Device_BusNumber for GPUs. --- dlls/gdi32/tests/driver.c | 12 ++++++++++++ dlls/win32u/sysparams.c | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 092bde0e5c1..eabd3ed15b8 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -1006,6 +1006,7 @@ static void test_gpu_device_properties_guid(const GUID *devinterface_guid) WCHAR device_id[256]; DEVPROPTYPE type; unsigned int i; + UINT32 value; HDEVINFO set; BOOL ret; @@ -1030,6 +1031,17 @@ static void test_gpu_device_properties_guid(const GUID *devinterface_guid) ok(ret, "Got unexpected ret %d, GetLastError() %lu.\n", ret, GetLastError()); ok(type == DEVPROP_TYPE_STRING, "Got type %ld.\n", type); + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_BusNumber, &type, + (BYTE *)&value, sizeof(value), NULL, 0); + if (!wcsicmp(device_id, L"root\\basicrender") || !wcsicmp(device_id, L"root\\basicdisplay")) + { + ok(!ret, "Found Bus Id.\n"); + } + else + { + ok(ret, "Got unexpected ret %d, GetLastError() %lu, %s.\n", ret, GetLastError(), debugstr_w(device_id)); + ok(type == DEVPROP_TYPE_UINT32, "Got type %ld.\n", type); + } ++i; } SetupDiDestroyDeviceInfoList(set); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3967976f54d..863d39dad95 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -101,6 +101,14 @@ static const WCHAR devpkey_device_matching_device_id[] = '\\','0','0','0','8' }; +static const WCHAR devpkey_device_bus_number[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','A','4','5','C','2','5','4','E','-','D','F','1','C','-','4','E','F','D', + '-','8','0','2','0','-','6','7','D','1','4','6','A','8','5','0','E','0','}', + '\\','0','0','1','7' +}; + static const WCHAR devpropkey_device_ispresentW[] = { 'P','r','o','p','e','r','t','i','e','s', @@ -1237,6 +1245,17 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) NtClose( subkey ); } + if (gpu->vendor_id && gpu->device_id) + { + if ((subkey = reg_create_key( hkey, devpkey_device_bus_number, + sizeof(devpkey_device_bus_number), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, + &gpu_index, sizeof(gpu_index) ); + NtClose( subkey ); + } + } + desc = gpu->name; if (!desc[0]) desc = wine_adapterW; set_reg_value( hkey, device_descW, REG_SZ, desc, (lstrlenW( desc ) + 1) * sizeof(WCHAR) );

1 0

Paul Gofman : win32u: Set DEVPKEY_Device_RemovalPolicy for GPUs.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: c4073d5abf5fdb069cb8c7ffa633f622fb0da22b URL: https://gitlab.winehq.org/wine/wine/-/commit/c4073d5abf5fdb069cb8c7ffa633f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 20 13:18:26 2023 -0600 win32u: Set DEVPKEY_Device_RemovalPolicy for GPUs. --- dlls/gdi32/tests/driver.c | 8 ++++++++ dlls/win32u/sysparams.c | 19 +++++++++++++++++++ include/cfgmgr32.h | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eabd3ed15b8..a618b5e51a4 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -33,6 +33,7 @@ #include "setupapi.h" #include "ntddvdeo.h" #include "devpkey.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -1042,6 +1043,13 @@ static void test_gpu_device_properties_guid(const GUID *devinterface_guid) ok(ret, "Got unexpected ret %d, GetLastError() %lu, %s.\n", ret, GetLastError(), debugstr_w(device_id)); ok(type == DEVPROP_TYPE_UINT32, "Got type %ld.\n", type); } + + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_RemovalPolicy, &type, + (BYTE *)&value, sizeof(value), NULL, 0); + ok(ret, "Got unexpected ret %d, GetLastError() %lu, %s.\n", ret, GetLastError(), debugstr_w(device_id)); + ok(value == CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL || value == CM_REMOVAL_POLICY_EXPECT_ORDERLY_REMOVAL + || value == CM_REMOVAL_POLICY_EXPECT_SURPRISE_REMOVAL, "Got value %d.\n", value); + ok(type == DEVPROP_TYPE_UINT32, "Got type %ld.\n", type); ++i; } SetupDiDestroyDeviceInfoList(set); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 863d39dad95..374fcf9c11b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -32,6 +32,7 @@ #include "ntgdi_private.h" #include "ntuser_private.h" #include "devpropdef.h" +#include "cfgmgr32.h" #include "wine/wingdi16.h" #include "wine/server.h" @@ -109,6 +110,14 @@ static const WCHAR devpkey_device_bus_number[] = '\\','0','0','1','7' }; +static const WCHAR devpkey_device_removal_policy[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','A','4','5','C','2','5','4','E','-','D','F','1','C','-','4','E','F','D', + '-','8','0','2','0','-','6','7','D','1','4','6','A','8','5','0','E','0','}', + '\\','0','0','2','1' +}; + static const WCHAR devpropkey_device_ispresentW[] = { 'P','r','o','p','e','r','t','i','e','s', @@ -1256,6 +1265,16 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) } } + if ((subkey = reg_create_key( hkey, devpkey_device_removal_policy, + sizeof(devpkey_device_removal_policy), 0, NULL ))) + { + unsigned int removal_policy = CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL; + + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, + &removal_policy, sizeof(removal_policy) ); + NtClose( subkey ); + } + desc = gpu->name; if (!desc[0]) desc = wine_adapterW; set_reg_value( hkey, device_descW, REG_SZ, desc, (lstrlenW( desc ) + 1) * sizeof(WCHAR) ); diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index b78f118622e..04f1f80b174 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -180,6 +180,10 @@ typedef DWORD CONFIGRET; #define CM_REGISTRY_USER 0x0100 #define CM_REGISTRY_CONFIG 0x0200 +#define CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL 1 +#define CM_REMOVAL_POLICY_EXPECT_ORDERLY_REMOVAL 2 +#define CM_REMOVAL_POLICY_EXPECT_SURPRISE_REMOVAL 3 + typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE;

1 0

Eric Pouech : psapi: Test filesystem redirection with EnumProcessModulesEx.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: e658a30a917b0403a1e8f7ed86a8fc0138d990a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e658a30a917b0403a1e8f7ed86a8fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:01:57 2023 +0200 psapi: Test filesystem redirection with EnumProcessModulesEx. To make it short: redirection has no impact on EnumProcessModules*() behavior. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/psapi/tests/psapi_main.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 860598c39c5..8d7b169703a 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -222,8 +222,10 @@ struct moduleex_snapshot static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snapshot* mxsnap, unsigned numsnap) { + void* cookie; DWORD needed; char buffer[80]; + char buffer2[80]; MODULEINFO info; int i, j; BOOL ret; @@ -243,6 +245,14 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); + if (wow64) + { + pWow64DisableWow64FsRedirection(&cookie); + ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer2, sizeof(buffer2)); + ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); + pWow64RevertWow64FsRedirection(cookie); + ok(!strcmp(buffer, buffer2), "Didn't FS redirection to come into play %s <> %s\n", buffer, buffer2); + } memset(&info, 0, sizeof(info)); ret = GetModuleInformation(proc, mxsnap[i].modules[j], &info, sizeof(info)); ok(ret, "GetModuleInformation failed: %lu\n", GetLastError()); @@ -252,6 +262,30 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap } winetest_pop_context(); } + + if (wow64) + { + HMODULE modules[128]; + DWORD num; + + pWow64DisableWow64FsRedirection(&cookie); + for (i = 0; i < numsnap; i++) + { + modules[0] = (void *)0xdeadbeef; + ret = EnumProcessModulesEx(proc, modules, sizeof(modules), &needed, mxsnap[i].list); + ok(ret, "didn't succeed %lu\n", GetLastError()); + ok(needed % sizeof(HMODULE) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%ld\n", needed); + num = min(needed, sizeof(modules)) / sizeof(HMODULE); + /* It happens that modules are still loading... so check that msxsnap[i].modules is a subset of modules[]. + * Crossing fingers that no module is unloaded + */ + ok(num >= mxsnap[i].num_modules, "Mismatch in module count %lu %lu\n", num, mxsnap[i].num_modules); + num = min(num, mxsnap[i].num_modules); + for (j = 0; j < num; j++) + ok(modules[j] == mxsnap[i].modules[j], "Mismatch in modules handle\n"); + } + pWow64RevertWow64FsRedirection(cookie); + } return ret; }

1 0

Paul Gofman : win32u: Set DEVPKEY_Device_MatchingDeviceId for GPUs.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 80910517d7470b5eb070c7ea8c8224af860265bc URL: https://gitlab.winehq.org/wine/wine/-/commit/80910517d7470b5eb070c7ea8c8224… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 20 11:59:14 2023 -0600 win32u: Set DEVPKEY_Device_MatchingDeviceId for GPUs. --- dlls/gdi32/tests/driver.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 19 ++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 94f93d61207..092bde0e5c1 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "setupapi.h" #include "ntddvdeo.h" +#include "devpkey.h" #include "wine/test.h" @@ -996,6 +997,54 @@ static void test_D3DKMTQueryVideoMemoryInfo(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); } +static void test_gpu_device_properties_guid(const GUID *devinterface_guid) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + WCHAR device_id[256]; + DEVPROPTYPE type; + unsigned int i; + HDEVINFO set; + BOOL ret; + + /* Make sure display devices are initialized. */ + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %lu.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, devinterface_guid, i, &iface)) + { + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, &device_data ); + ok(ret, "Got unexpected ret %d, GetLastError() %lu.\n", ret, GetLastError()); + + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_MatchingDeviceId, &type, + (BYTE *)device_id, sizeof(device_id), NULL, 0); + ok(ret, "Got unexpected ret %d, GetLastError() %lu.\n", ret, GetLastError()); + ok(type == DEVPROP_TYPE_STRING, "Got type %ld.\n", type); + + ++i; + } + SetupDiDestroyDeviceInfoList(set); +} + +static void test_gpu_device_properties(void) +{ + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_gpu_device_properties_guid(&GUID_DEVINTERFACE_DISPLAY_ADAPTER); + winetest_pop_context(); + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_gpu_device_properties_guid(&GUID_DISPLAY_DEVICE_ARRIVAL); + winetest_pop_context(); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -1025,6 +1074,7 @@ START_TEST(driver) test_D3DKMTCheckOcclusion(); test_D3DKMTOpenAdapterFromDeviceName(); test_D3DKMTQueryVideoMemoryInfo(); + test_gpu_device_properties(); FreeLibrary(dwmapi); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 32b20682d24..3967976f54d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -93,6 +93,14 @@ static const WCHAR devpropkey_gpu_luidW[] = '\\','0','0','0','2' }; +static const WCHAR devpkey_device_matching_device_id[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','A','8','B','8','6','5','D','D','-','2','E','3','D','-','4','0','9','4', + '-','A','D','9','7','-','E','5','9','3','A','7','0','C','7','5','D','6','}', + '\\','0','0','0','8' +}; + static const WCHAR devpropkey_device_ispresentW[] = { 'P','r','o','p','e','r','t','i','e','s', @@ -1218,6 +1226,17 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) bufferW[size / sizeof(WCHAR)] = 0; /* for REG_MULTI_SZ */ set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, bufferW, size + sizeof(WCHAR) ); + if ((subkey = reg_create_key( hkey, devpkey_device_matching_device_id, + sizeof(devpkey_device_matching_device_id), 0, NULL ))) + { + if (gpu->vendor_id && gpu->device_id) + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_STRING, bufferW, size ); + else + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_STRING, bufferW, + asciiz_to_unicode( bufferW, "ROOT\\BasicRender" )); + NtClose( subkey ); + } + desc = gpu->name; if (!desc[0]) desc = wine_adapterW; set_reg_value( hkey, device_descW, REG_SZ, desc, (lstrlenW( desc ) + 1) * sizeof(WCHAR) );

1 0

Alexandros Frantzis : winex11.drv: Do not call desktop get_current_mode() from UpdateDisplayDevices.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 83b1d167bd4cf10e9a7b4a7c91b3a2d1e9621d89 URL: https://gitlab.winehq.org/wine/wine/-/commit/83b1d167bd4cf10e9a7b4a7c91b3a2… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Apr 5 20:10:35 2023 +0300 winex11.drv: Do not call desktop get_current_mode() from UpdateDisplayDevices. We don't need to set the win32u current mode when we are in virtual desktop mode, and, additionally, skipping this avoids a deadlock, since the virtual desktop get_current_mode() implementation recurses into win32u. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Fixes: 4232312dffe1cd115aa6bfd755f5b7c6a403e3fc Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54781 --- dlls/winex11.drv/display.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 75b585ff201..c75977002ef 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -542,10 +542,12 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage INT gpu, adapter, monitor; DEVMODEW *modes, *mode; UINT mode_count; + BOOL virtual_desktop; if (!force && !force_display_devices_refresh) return TRUE; force_display_devices_refresh = FALSE; - handler = is_virtual_desktop() ? &desktop_handler : &host_handler; + virtual_desktop = is_virtual_desktop(); + handler = virtual_desktop ? &desktop_handler : &host_handler; TRACE("via %s\n", wine_dbgstr_a(handler->name)); @@ -585,7 +587,11 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage asciiz_to_unicode( devname, buffer ); if (!settings_handler.get_id( devname, is_primary, &settings_id )) break; - settings_handler.get_current_mode( settings_id, &current_mode ); + /* We don't need to set the win32u current mode when we are in + * virtual desktop mode, and, additionally, skipping this avoids a + * deadlock, since the desktop get_current_mode() implementation + * recurses into win32u. */ + if (!virtual_desktop) settings_handler.get_current_mode( settings_id, &current_mode ); if (!settings_handler.get_modes( settings_id, EDS_ROTATEDMODE, &modes, &mode_count )) continue;

1 0

Alexandros Frantzis : winex11.drv: Use a distinct type for the settings id.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 2c02d6e8177f88e88001f9fb6fd2f342b3649fc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c02d6e8177f88e88001f9fb6fd2f3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Apr 6 13:22:29 2023 +0300 winex11.drv: Use a distinct type for the settings id. This helps us avoid using an id from a different namespace (e.g., from the host handler id namespace) as a settings id. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winex11.drv/desktop.c | 10 +++++----- dlls/winex11.drv/display.c | 36 ++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 11 +++++++---- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++---------------- dlls/winex11.drv/xvidmode.c | 14 +++++++------- 5 files changed, 53 insertions(+), 50 deletions(-)

1 0

Alexandros Frantzis : winex11.drv: Use the proper id with the settings handler.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 239bc1b756df1618560e08eea3f4906dc31cd9d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/239bc1b756df1618560e08eea3f490… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Apr 5 17:18:23 2023 +0300 winex11.drv: Use the proper id with the settings handler. The adapter ids used by the host and settings handlers are not guaranteed to be compatible, so ensure we are using the proper id with each handler. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winex11.drv/display.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cd36c3c559c..75b585ff201 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -564,6 +564,10 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (adapter = 0; adapter < adapter_count; adapter++) { DEVMODEW current_mode = {.dmSize = sizeof(current_mode)}; + WCHAR devname[32]; + char buffer[32]; + ULONG_PTR settings_id; + BOOL is_primary = adapters[adapter].state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE; device_manager->add_adapter( &adapters[adapter], param ); @@ -576,8 +580,13 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage handler->free_monitors(monitors, monitor_count); - settings_handler.get_current_mode( adapters[adapter].id, &current_mode ); - if (!settings_handler.get_modes( adapters[adapter].id, EDS_ROTATEDMODE, &modes, &mode_count )) + /* Get the settings handler id for the adapter */ + snprintf( buffer, sizeof(buffer), "\\\\.\\DISPLAY%d", adapter + 1 ); + asciiz_to_unicode( devname, buffer ); + if (!settings_handler.get_id( devname, is_primary, &settings_id )) break; + + settings_handler.get_current_mode( settings_id, &current_mode ); + if (!settings_handler.get_modes( settings_id, EDS_ROTATEDMODE, &modes, &mode_count )) continue; for (mode = modes; mode_count; mode_count--)

1 0

Alexandre Julliard : msvcrt: Use the fma()/fmaf() implementation from the bundled musl library.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: a44bf343ba72ff86e16602ba4e97ebf1b627f846 URL: https://gitlab.winehq.org/wine/wine/-/commit/a44bf343ba72ff86e16602ba4e97eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 12:25:24 2023 +0200 msvcrt: Use the fma()/fmaf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 257 ---------------------------------------------- dlls/msvcrt/msvcrt.spec | 2 - libs/musl/src/math/fma.c | 26 +++-- libs/musl/src/math/fmaf.c | 2 +- 4 files changed, 16 insertions(+), 271 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the atan2()/atan2f() implementation from the bundled musl library.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 6148bf503ba32e65364d96efa3e46183940d41f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6148bf503ba32e65364d96efa3e461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 15:00:21 2023 +0200 msvcrt: Use the atan2()/atan2f() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 144 ----------------------------------------------------- 1 file changed, 144 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5efdc6fc12e..25cf2e05ccd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -797,77 +797,6 @@ float CDECL atanf( float x ) return sign ? -z : z; } -/********************************************************************* - * atan2f (MSVCRT.@) - * - * Copied from musl: src/math/atan2f.c - */ -float CDECL atan2f( float y, float x ) -{ - static const float pi = 3.1415927410e+00, - pi_lo = -8.7422776573e-08; - - float z; - unsigned int m, ix, iy; - - if (isnan(x) || isnan(y)) - return x + y; - ix = *(unsigned int*)&x; - iy = *(unsigned int*)&y; - if (ix == 0x3f800000) /* x=1.0 */ - return atanf(y); - m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ - ix &= 0x7fffffff; - iy &= 0x7fffffff; - - /* when y = 0 */ - if (iy == 0) { - switch (m) { - case 0: - case 1: return y; /* atan(+-0,+anything)=+-0 */ - case 2: return pi; /* atan(+0,-anything) = pi */ - case 3: return -pi; /* atan(-0,-anything) =-pi */ - } - } - /* when x = 0 */ - if (ix == 0) - return m & 1 ? -pi / 2 : pi / 2; - /* when x is INF */ - if (ix == 0x7f800000) { - if (iy == 0x7f800000) { - switch (m) { - case 0: return pi / 4; /* atan(+INF,+INF) */ - case 1: return -pi / 4; /* atan(-INF,+INF) */ - case 2: return 3 * pi / 4; /*atan(+INF,-INF)*/ - case 3: return -3 * pi / 4; /*atan(-INF,-INF)*/ - } - } else { - switch (m) { - case 0: return 0.0f; /* atan(+...,+INF) */ - case 1: return -0.0f; /* atan(-...,+INF) */ - case 2: return pi; /* atan(+...,-INF) */ - case 3: return -pi; /* atan(-...,-INF) */ - } - } - } - /* |y/x| > 0x1p26 */ - if (ix + (26 << 23) < iy || iy == 0x7f800000) - return m & 1 ? -pi / 2 : pi / 2; - - /* z = atan(|y/x|) with correct underflow */ - if ((m & 2) && iy + (26 << 23) < ix) /*|y/x| < 0x1p-26, x < 0 */ - z = 0.0; - else - z = atanf(fabsf(y / x)); - switch (m) { - case 0: return z; /* atan(+,+) */ - case 1: return -z; /* atan(-,+) */ - case 2: return pi - (z - pi_lo); /* atan(+,-) */ - default: /* case 3 */ - return (z - pi_lo) - pi; /* atan(-,-) */ - } -} - /* Copied from musl: src/math/__rem_pio2f.c */ static int __rem_pio2f(float x, double *y) { @@ -1822,79 +1751,6 @@ double CDECL atan( double x ) return sign ? -z : z; } -/********************************************************************* - * atan2 (MSVCRT.@) - * - * Copied from musl: src/math/atan2.c - */ -double CDECL atan2( double y, double x ) -{ - static const double pi = 3.1415926535897931160E+00, - pi_lo = 1.2246467991473531772E-16; - - double z; - unsigned int m, lx, ly, ix, iy; - - if (isnan(x) || isnan(y)) - return x+y; - ix = *(ULONGLONG*)&x >> 32; - lx = *(ULONGLONG*)&x; - iy = *(ULONGLONG*)&y >> 32; - ly = *(ULONGLONG*)&y; - if (((ix - 0x3ff00000) | lx) == 0) /* x = 1.0 */ - return atan(y); - m = ((iy >> 31) & 1) | ((ix >> 30) & 2); /* 2*sign(x)+sign(y) */ - ix = ix & 0x7fffffff; - iy = iy & 0x7fffffff; - - /* when y = 0 */ - if ((iy | ly) == 0) { - switch(m) { - case 0: - case 1: return y; /* atan(+-0,+anything)=+-0 */ - case 2: return pi; /* atan(+0,-anything) = pi */ - case 3: return -pi; /* atan(-0,-anything) =-pi */ - } - } - /* when x = 0 */ - if ((ix | lx) == 0) - return m & 1 ? -pi / 2 : pi / 2; - /* when x is INF */ - if (ix == 0x7ff00000) { - if (iy == 0x7ff00000) { - switch(m) { - case 0: return pi / 4; /* atan(+INF,+INF) */ - case 1: return -pi / 4; /* atan(-INF,+INF) */ - case 2: return 3 * pi / 4; /* atan(+INF,-INF) */ - case 3: return -3 * pi / 4; /* atan(-INF,-INF) */ - } - } else { - switch(m) { - case 0: return 0.0; /* atan(+...,+INF) */ - case 1: return -0.0; /* atan(-...,+INF) */ - case 2: return pi; /* atan(+...,-INF) */ - case 3: return -pi; /* atan(-...,-INF) */ - } - } - } - /* |y/x| > 0x1p64 */ - if (ix + (64 << 20) < iy || iy == 0x7ff00000) - return m & 1 ? -pi / 2 : pi / 2; - - /* z = atan(|y/x|) without spurious underflow */ - if ((m & 2) && iy + (64 << 20) < ix) /* |y/x| < 0x1p-64, x<0 */ - z = 0; - else - z = atan(fabs(y / x)); - switch (m) { - case 0: return z; /* atan(+,+) */ - case 1: return -z; /* atan(-,+) */ - case 2: return pi - (z - pi_lo); /* atan(+,-) */ - default: /* case 3 */ - return (z - pi_lo) - pi; /* atan(-,-) */ - } -} - /* Copied from musl: src/math/rint.c */ static double __rint(double x) {

1 0