- Wine-Commits - list.winehq.org

Rémi Bernon : user32/tests: Add more AreDpiAwarenessContextsEqual tests.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 72ca475da2efbf42bbc7deabd98f2ff8adeaa68e URL: https://gitlab.winehq.org/wine/wine/-/commit/72ca475da2efbf42bbc7deabd98f2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 18:01:08 2024 +0200 user32/tests: Add more AreDpiAwarenessContextsEqual tests. --- dlls/user32/sysparams.c | 14 ++--- dlls/user32/tests/sysparams.c | 134 +++++++++++++++++++++++++++--------------- 2 files changed, 89 insertions(+), 59 deletions(-)

1 0

Rémi Bernon : win32u: Use NtUserCallOnParam for SetThreadDpiAwarenessContext.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: bcb33fd859286465530439001194c66f2b79a564 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcb33fd859286465530439001194c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 17:08:40 2024 +0200 win32u: Use NtUserCallOnParam for SetThreadDpiAwarenessContext. And an internal function call when possible. --- dlls/win32u/dce.c | 16 ++++++++-------- dlls/win32u/message.c | 6 +++--- dlls/win32u/sysparams.c | 10 +++++----- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 28 ++++++++++++++-------------- dlls/wineandroid.drv/window.c | 4 ++-- include/ntuser.h | 6 ++++++ 7 files changed, 39 insertions(+), 32 deletions(-)

1 0

Rémi Bernon : user32: Test and implement GetDpiFromDpiAwarenessContext.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 9f834614a94232fb3a6789dee19d702efec5a8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/9f834614a94232fb3a6789dee19d70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 10:52:45 2024 +0200 user32: Test and implement GetDpiFromDpiAwarenessContext. --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/tests/sysparams.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 58 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4bca30cce9a..ad117c12d03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -700,6 +700,15 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT } } +/*********************************************************************** + * GetDpiFromDpiAwarenessContext (USER32.@) + */ +UINT WINAPI GetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT handle ) +{ + UINT context = get_ntuser_dpi_context( handle ); + return NTUSER_DPI_CONTEXT_GET_DPI( context ); +} + /*********************************************************************** * IsValidDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 27189474027..468ef3e6486 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -50,6 +50,7 @@ static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*); static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*); static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE); static BOOL (WINAPI *pAreDpiAwarenessContextsEqual)(DPI_AWARENESS_CONTEXT,DPI_AWARENESS_CONTEXT); +static LONG (WINAPI *pGetDpiFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; @@ -4156,6 +4157,50 @@ static void test_IsValidDpiAwarenessContext(void) } } +static void test_GetDpiFromDpiAwarenessContext(void) +{ + UINT ret; + + if (!pGetDpiFromDpiAwarenessContext) + { + win_skip( "GetDpiFromDpiAwarenessContext missing, skipping tests\n" ); + return; + } + + ret = pGetDpiFromDpiAwarenessContext( 0 ); + ok( !ret, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x11 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x22 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6010 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6011 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6111 ); + ok( ret == 97, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x7811 ); + ok( ret == 120, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x10011 ); + ok( ret == 256, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x40006010 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ok( ret == real_dpi, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; @@ -4591,6 +4636,7 @@ START_TEST(sysparams) pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); pAreDpiAwarenessContextsEqual = (void*)GetProcAddress(hdll, "AreDpiAwarenessContextsEqual"); + pGetDpiFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetDpiFromDpiAwarenessContext"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); @@ -4623,6 +4669,7 @@ START_TEST(sysparams) test_GetAutoRotationState( ); test_SetThreadDpiAwarenessContext(); test_IsValidDpiAwarenessContext(); + test_GetDpiFromDpiAwarenessContext(); change_counter = 0; change_last_param = 0; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 21fa904082c..20ca6219bcd 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -302,6 +302,7 @@ @ stdcall GetDpiForMonitorInternal(long long ptr ptr) NtUserGetDpiForMonitor @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) +@ stdcall GetDpiFromDpiAwarenessContext(long) @ stdcall GetFocus() @ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) diff --git a/include/winuser.h b/include/winuser.h index 7c387e69f54..7d7a2dc557d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4116,6 +4116,7 @@ WINUSERAPI DWORD WINAPI GetAppCompatFlags(HTASK); WINUSERAPI SHORT WINAPI GetAsyncKeyState(INT); WINUSERAPI BOOL WINAPI GetAutoRotationState(AR_STATE*); WINUSERAPI DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext(DPI_AWARENESS_CONTEXT); +WINUSERAPI UINT WINAPI GetDpiFromDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI HWND WINAPI GetCapture(void); WINUSERAPI UINT WINAPI GetCaretBlinkTime(void); WINUSERAPI BOOL WINAPI GetCaretPos(LPPOINT);

1 0

Aida Jonikienė : dxdiagn: Add AGP properties.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 8857aa79bca2d5517f0e52f730739a9c21f42deb URL: https://gitlab.winehq.org/wine/wine/-/commit/8857aa79bca2d5517f0e52f730739a… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun May 26 10:08:50 2024 +0300 dxdiagn: Add AGP properties. Ground Control II complains about AGP acceleration being missing if these properties don't exist. --- dlls/dxdiagn/provider.c | 12 ++++++++++++ dlls/dxdiagn/tests/container.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index e64adbbd25f..05fe76849a2 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1003,6 +1003,18 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; + hr = add_bool_property(display_adapter, L"bAGPEnabled", hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, L"bAGPExistenceValid", hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, L"bAGPExists", hardware_accel); + if (FAILED(hr)) + goto cleanup; + hr = add_bool_property(display_adapter, L"bDDAccelerationEnabled", hardware_accel); if (FAILED(hr)) goto cleanup; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 353a830082f..146c83070d8 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -878,6 +878,9 @@ static void test_DxDiag_DisplayDevices(void) {L"szManufacturer", VT_BSTR}, {L"b3DAccelerationExists", VT_BOOL}, {L"b3DAccelerationEnabled", VT_BOOL}, + {L"bAGPEnabled", VT_BOOL}, + {L"bAGPExistenceValid", VT_BOOL}, + {L"bAGPExists", VT_BOOL}, {L"bDDAccelerationEnabled", VT_BOOL}, {L"iAdapter", VT_UI4}, };

1 0

Rémi Bernon : win32u: Get rid of the UpdateDisplayDevices force parameter.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 04470e1edad54ce77f47107b731ae00f1a1e0789 URL: https://gitlab.winehq.org/wine/wine/-/commit/04470e1edad54ce77f47107b731ae0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 16 12:56:05 2024 +0200 win32u: Get rid of the UpdateDisplayDevices force parameter. --- dlls/win32u/driver.c | 6 ++--- dlls/win32u/sysparams.c | 24 +++++++++----------- dlls/wineandroid.drv/init.c | 47 +++++++++++++++++---------------------- dlls/winemac.drv/display.c | 4 +--- dlls/winemac.drv/macdrv.h | 3 +-- dlls/winewayland.drv/display.c | 7 ++---- dlls/winewayland.drv/waylanddrv.h | 3 +-- dlls/winex11.drv/display.c | 4 +--- dlls/winex11.drv/x11drv.h | 3 +-- include/wine/gdi_driver.h | 2 +- 10 files changed, 43 insertions(+), 60 deletions(-)

1 0

Piotr Caban : ntdll: Fix UNC path handling in alloc_module.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 9ff41324ae33164a4bee90772a2ba5dfd5545c4a URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff41324ae33164a4bee90772a2ba5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 24 13:11:56 2024 +0200 ntdll: Fix UNC path handling in alloc_module. --- dlls/ntdll/loader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 31bfe60d121..5c59d102dd9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1518,8 +1518,17 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name InitializeListHead(&wm->ldr.DdagNode->Modules); InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); - memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); - buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + if (nt_name->Length >= 8 * sizeof(WCHAR) && !wcsncmp(nt_name->Buffer + 4, L"UNC\\", 4)) + { + buffer[0] = '\\'; + memcpy( buffer + 1, nt_name->Buffer + 7 /* \??\UNC prefix */, nt_name->Length - 7 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 6] = 0; + } + else + { + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + } if ((p = wcsrchr( buffer, '\\' ))) p++; else p = buffer; RtlInitUnicodeString( &wm->ldr.FullDllName, buffer );

1 0

Aida Jonikienė : dxdiagn: Add bIsD3DDebugRuntime property.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 952a2c5b7bfb3cee1b08aa76fc734278ed9942f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/952a2c5b7bfb3cee1b08aa76fc7342… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sat May 25 22:37:36 2024 +0300 dxdiagn: Add bIsD3DDebugRuntime property. Ground Control II complains about D3D debug runtime being present if this property doesn't exist. --- dlls/dxdiagn/provider.c | 4 ++++ dlls/dxdiagn/tests/container.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0a6111fff25..e64adbbd25f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -636,6 +636,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bool_property(node, L"bIsD3DDebugRuntime", FALSE); + if (FAILED(hr)) + return hr; + hr = add_bool_property(node, L"bNECPC98", FALSE); if (FAILED(hr)) return hr; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 31047337148..353a830082f 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -792,6 +792,7 @@ static void test_DxDiag_SystemInfo(void) {L"dwDirectXVersionMinor", VT_UI4}, {L"szDirectXVersionLetter", VT_BSTR}, {L"bDebug", VT_BOOL}, + {L"bIsD3DDebugRuntime", VT_BOOL}, {L"bNECPC98", VT_BOOL}, {L"ullPhysicalMemory", VT_BSTR}, {L"ullUsedPageFile", VT_BSTR},

1 0

Rémi Bernon : user32: Test and fix IsValidDpiAwarenessContext.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 1172c4a94e5d72790659cc68b66e4ed00c6a04e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1172c4a94e5d72790659cc68b66e4e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 20 13:20:57 2024 +0200 user32: Test and fix IsValidDpiAwarenessContext. --- dlls/user32/sysparams.c | 32 +++++++++++++- dlls/user32/tests/sysparams.c | 100 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 123 insertions(+), 9 deletions(-)

1 0

Fabian Maurer : userenv: Add CreateAppContainerProfile stub.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 4537dbdcd503406fb0238e08f2c8e8fc8ee0097c URL: https://gitlab.winehq.org/wine/wine/-/commit/4537dbdcd503406fb0238e08f2c8e8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun May 26 06:41:10 2024 +0200 userenv: Add CreateAppContainerProfile stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56724 --- dlls/userenv/userenv.spec | 1 + dlls/userenv/userenv_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 4d8bc4ec407..6395bba1949 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,5 +1,6 @@ 138 stdcall @(long str str str str long str long long str str long) USERENV_138 +@ stdcall CreateAppContainerProfile(wstr wstr wstr ptr long ptr) @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stdcall DestroyEnvironmentBlock(ptr) @ stdcall EnterCriticalPolicySection(long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index cadb45c1a74..dd04c40446e 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -688,3 +688,13 @@ BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, return FALSE; } + +HRESULT WINAPI CreateAppContainerProfile(PCWSTR container_name, PCWSTR display_name, PCWSTR description, + SID_AND_ATTRIBUTES *capabilities, DWORD capability_count, + SID **container_sid) +{ + FIXME("(%s, %s, %s, %p, %ld, %p): stub\n", debugstr_w(container_name), debugstr_w(display_name), + debugstr_w(description), capabilities, capability_count, container_sid); + + return E_NOTIMPL; +}

1 0

Rémi Bernon : win32u: Get rid of the drivers force_display_devices_refresh flag.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: f7f213bdf84a161008b5729f3034782b4f6f9bdf URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f213bdf84a161008b5729f303478… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:37:46 2024 +0200 win32u: Get rid of the drivers force_display_devices_refresh flag. --- dlls/win32u/sysparams.c | 3 +++ dlls/wineandroid.drv/init.c | 13 +++---------- dlls/winemac.drv/display.c | 10 +++------- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- dlls/winewayland.drv/display.c | 13 ++++--------- dlls/winewayland.drv/wayland.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winewayland.drv/window.c | 2 +- dlls/winex11.drv/display.c | 8 ++------ dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/xrandr.c | 2 +- include/ntuser.h | 1 + 14 files changed, 24 insertions(+), 40 deletions(-)

1 0