May 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Only keep DPI awareness context with window objects.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: a3b22d3bf7fc8202ae74487f454dc1f9dd901262 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3b22d3bf7fc8202ae74487f454dc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 23:23:22 2024 +0200 win32u: Only keep DPI awareness context with window objects. --- dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/sysparams.c | 10 ------ dlls/win32u/win32u_private.h | 1 - dlls/win32u/window.c | 32 ++++++++---------- include/ntuser.h | 2 ++ include/wine/server_protocol.h | 18 +++++----- server/protocol.def | 12 +++---- server/request.h | 16 ++++----- server/trace.c | 12 +++---- server/window.c | 77 ++++++++++++++++++++---------------------- 10 files changed, 76 insertions(+), 107 deletions(-)

1 0

Rémi Bernon : win32u: Fix SetThreadDpiAwarenessContext.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 37252fd5056566acddf4a753fd1792aeef8f25c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/37252fd5056566acddf4a753fd1792… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 15:29:27 2024 +0200 win32u: Fix SetThreadDpiAwarenessContext. --- dlls/user32/sysparams.c | 67 +++++++++++------------------- dlls/user32/tests/sysparams.c | 94 +++++++++++++++++++------------------------ dlls/win32u/sysparams.c | 49 +++++++--------------- dlls/win32u/tests/win32u.c | 3 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 4 +- dlls/wineandroid.drv/window.c | 2 +- include/ntuser.h | 4 +- 8 files changed, 87 insertions(+), 137 deletions(-)

1 0

Rémi Bernon : win32u: Get the thread DPI context instead of the awareness.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: cda7027bc8b67da3ef316008fed1670f23b355d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda7027bc8b67da3ef316008fed167… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 22:51:36 2024 +0200 win32u: Get the thread DPI context instead of the awareness. --- dlls/user32/sysparams.c | 10 +++++----- dlls/win32u/sysparams.c | 32 +++++++++++++------------------- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 2 +- include/ntuser.h | 2 +- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0248a4d905f..7208535186a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -757,7 +757,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) struct ntuser_thread_info *info = NtUserGetThreadInfo(); ULONG context; - if (info->dpi_awareness) return ULongToHandle( info->dpi_awareness ); + if (info->dpi_context) return ULongToHandle( info->dpi_context ); context = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); return UlongToHandle( NTUSER_DPI_CONTEXT_GET_AWARENESS( context ) | 0x10 ); @@ -777,15 +777,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (!(prev = info->dpi_awareness)) + if (!(prev = info->dpi_context)) { ULONG process_ctx = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); prev = NTUSER_DPI_CONTEXT_GET_AWARENESS( process_ctx ) | 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_context = 0; else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22) - info->dpi_awareness = 0x22; - else info->dpi_awareness = val | 0x10; + info->dpi_context = 0x22; + else info->dpi_context = val | 0x10; return ULongToHandle( prev ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 26ed8b1d1ac..f107f114af6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(system); +static LONG dpi_context; /* process DPI awareness context */ static HKEY video_key, enum_key, control_key, config_key, volatile_base_key; @@ -2160,18 +2161,13 @@ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CON } } -/********************************************************************** - * get_thread_dpi_awareness - */ -DPI_AWARENESS get_thread_dpi_awareness(void) +UINT get_thread_dpi_awareness_context(void) { struct ntuser_thread_info *info = NtUserGetThreadInfo(); - ULONG_PTR context = info->dpi_awareness; - - if (context == 0) /* process default */ - return NtUserGetProcessDpiAwarenessContext( NULL ) & 3; + UINT context; - return get_awareness_from_dpi_awareness_context((DPI_AWARENESS_CONTEXT)context); + if (!(context = info->dpi_context)) context = ReadNoFence( &dpi_context ); + return context ? context : NTUSER_DPI_UNAWARE; } DWORD get_process_layout(void) @@ -2184,7 +2180,7 @@ DWORD get_process_layout(void) */ UINT get_thread_dpi(void) { - switch (get_thread_dpi_awareness()) + switch (NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() )) { case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; @@ -2195,7 +2191,8 @@ UINT get_thread_dpi(void) /* see GetDpiForSystem */ UINT get_system_dpi(void) { - if (get_thread_dpi_awareness() == DPI_AWARENESS_UNAWARE) return USER_DEFAULT_SCREEN_DPI; + DPI_AWARENESS awareness = NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() ); + if (awareness == DPI_AWARENESS_UNAWARE) return USER_DEFAULT_SCREEN_DPI; return system_dpi; } @@ -2210,15 +2207,15 @@ UINT set_thread_dpi_awareness_context( UINT context ) RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return 0; } - if (!(prev = info->dpi_awareness)) + if (!(prev = info->dpi_context)) { prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3; prev |= 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_context = 0; else if (context == HandleToUlong( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ) || context == 0x22) - info->dpi_awareness = 0x22; - else info->dpi_awareness = val | 0x10; + info->dpi_context = 0x22; + else info->dpi_context = val | 0x10; return prev; } @@ -3733,7 +3730,7 @@ BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT * RtlSetLastWin32Error( ERROR_INVALID_ADDRESS ); return FALSE; } - switch (get_thread_dpi_awareness()) + switch (NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() )) { case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; @@ -6226,9 +6223,6 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va return TRUE; } - -static LONG dpi_context; - /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 222db6fb5f7..aecd60bae63 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -175,7 +175,7 @@ extern UINT get_system_dpi(void); extern int get_system_metrics( int index ); extern UINT get_thread_dpi(void); extern UINT set_thread_dpi_awareness_context( UINT context ); -extern DPI_AWARENESS get_thread_dpi_awareness(void); +extern UINT get_thread_dpi_awareness_context(void); extern RECT get_virtual_screen_rect( UINT dpi ); extern BOOL is_exiting_thread( DWORD tid ); extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 321c81069c4..f7026654a50 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4911,7 +4911,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, HINSTANCE instance, BOOL ansi, DWORD style, DWORD ex_style ) { - DPI_AWARENESS awareness = get_thread_dpi_awareness(); + DPI_AWARENESS awareness = NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() ); HWND handle = 0, full_parent = 0, full_owner = 0; struct tagCLASS *class = NULL; int extra_bytes = 0; diff --git a/include/ntuser.h b/include/ntuser.h index 392ab21ec0d..b58413ac4db 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -83,7 +83,7 @@ struct ntuser_thread_info UINT receive_flags; /* currently received message flags */ UINT top_window; /* desktop window */ UINT msg_window; /* HWND_MESSAGE parent window */ - DPI_AWARENESS dpi_awareness; /* DPI awareness */ + UINT dpi_context; /* DPI awareness context */ UINT default_imc; /* default input context */ UINT64 client_imm; /* client IMM thread info */ UINT64 wmchar_data; /* client data for WM_CHAR mappings */

1 0

Eric Pouech : conhost: Fix display of font preview in 64-bit mode.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: b3fa23e88db19b831161d49c98a390e4fbc60782 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3fa23e88db19b831161d49c98a390… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 28 16:32:27 2024 +0200 conhost: Fix display of font preview in 64-bit mode. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 043ecd5510f..a5dd9979534 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1367,7 +1367,7 @@ static COLORREF get_color( struct dialog_info *di, unsigned int idc ) { LONG_PTR index; - index = GetWindowLongPtrW(GetDlgItem( di->dialog, idc ), 0); + index = GetWindowLongW(GetDlgItem( di->dialog, idc ), 0); return di->config.color_map[index]; }

1 0

Dmitry Timoshkov : user32/tests: Add a test to show that SendMessage(LB_SETCOUNT) adds a scrollbar.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 7103be9c1b6cb21b074d7710f7316433ae46444b URL: https://gitlab.winehq.org/wine/wine/-/commit/7103be9c1b6cb21b074d7710f73164… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 28 18:39:28 2024 +0300 user32/tests: Add a test to show that SendMessage(LB_SETCOUNT) adds a scrollbar. In addition to existing tests this shows that the call SendMessage(listbox, LB_SETCOUNT, 100, 0); adds a scrollbar to the listbox however it doesn't add a nonclient area to an update region because the call ValidateRect(listbox, NULL); validates a client area, and after that a window no longer has an update region. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/listbox.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c78171ff4d8..747e3dae192 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1939,11 +1939,17 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( IsRectEmpty( &r ), "got non-empty rect\n"); + ret = GetWindowLongA( listbox, GWL_STYLE ); + ok((ret & (WS_VSCROLL | WS_HSCROLL)) == 0, "Listbox should not have scroll bars\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); ok( ret == 0, "got %ld\n", ret ); ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); ok( ret == 100, "got %ld\n", ret ); + ret = GetWindowLongA( listbox, GWL_STYLE ); + ok((ret & (WS_VSCROLL | WS_HSCROLL)) == WS_VSCROLL, "Listbox should have vertical scroll bar\n"); + GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n");

1 0

Danyil Blyschak : wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 11a386960ebcc7de0e194912bae28c99ff2f899e URL: https://gitlab.winehq.org/wine/wine/-/commit/11a386960ebcc7de0e194912bae28c… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Fri May 24 16:13:46 2024 -0500 wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found. In the PSDRV_MergeDevmodes and merge_devmodes functions, there is a check earlier to update dmDefaultSource only if a slot is found, and so this member should not be updated again with no such check. --- dlls/wineps.drv/driver.c | 2 -- dlls/wineps.drv/unixlib.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index d56118e5e2c..1170e161b17 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -181,8 +181,6 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, PRINTERINFO * TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource); } - if (dm2->dmFields & DM_DEFAULTSOURCE ) - dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; if (dm2->dmFields & DM_PRINTQUALITY ) dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality; if (dm2->dmFields & DM_COLOR ) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index e9b009b0e87..a96f919c02a 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -422,8 +422,6 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource); } - if (dm2->dmFields & DM_DEFAULTSOURCE) - dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; if (dm2->dmFields & DM_PRINTQUALITY) dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality; if (dm2->dmFields & DM_COLOR)

1 0

Rémi Bernon : win32u: Pass the DPI awareness context in win_proc_params.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: dc05a4499e6c25af22e45e247114ceb464c6b554 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc05a4499e6c25af22e45e247114ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 15:58:02 2024 +0200 win32u: Pass the DPI awareness context in win_proc_params. --- dlls/user32/winproc.c | 2 +- dlls/win32u/message.c | 4 ++-- dlls/wow64win/user.c | 4 ++-- include/ntuser.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 4525f604beb..5678e75b4e9 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -698,7 +698,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN LRESULT dispatch_win_proc_params( struct win_proc_params *params ) { - DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness ); + DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( ULongToHandle( params->dpi_context ) ); LRESULT result = 0; if (!params->ansi) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index bf393e2b7c9..877be545810 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -379,7 +379,7 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN params->lparam = lparam; params->ansi = params->ansi_dst = ansi; params->mapping = WMCHAR_MAP_CALLWINDOWPROC; - params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) ); + params->dpi_context = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, TRUE ); return TRUE; } @@ -410,7 +410,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->lparam = lParam; params->ansi = ansi; params->mapping = mapping; - params->dpi_awareness = ULongToHandle( get_window_dpi_awareness_context( params->hwnd ) ); + params->dpi_context = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, !is_dialog ); return TRUE; } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9a293826ba9..33d4d786714 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -355,7 +355,7 @@ struct win_proc_params32 BOOL ansi; BOOL ansi_dst; enum wm_char_mapping mapping; - ULONG dpi_awareness; + ULONG dpi_context; ULONG procA; ULONG procW; }; @@ -471,7 +471,7 @@ static void win_proc_params_64to32( const struct win_proc_params *src, struct wi params.ansi = src->ansi; params.ansi_dst = src->ansi_dst; params.mapping = src->mapping; - params.dpi_awareness = HandleToUlong( src->dpi_awareness ); + params.dpi_context = src->dpi_context; params.procA = PtrToUlong( src->procA ); params.procW = PtrToUlong( src->procW ); memcpy( dst, &params, sizeof(params) ); diff --git a/include/ntuser.h b/include/ntuser.h index b58413ac4db..88453c46749 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,7 +160,7 @@ struct win_proc_params BOOL ansi; BOOL ansi_dst; enum wm_char_mapping mapping; - DPI_AWARENESS_CONTEXT dpi_awareness; + UINT dpi_context; WNDPROC procA; WNDPROC procW; };

1 0

Zhiyi Zhang : comctl32/ipaddress: Delete font when destroying the control.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 23c5d4c065d5b7cfa14f43d9136650ff4534652d URL: https://gitlab.winehq.org/wine/wine/-/commit/23c5d4c065d5b7cfa14f43d9136650… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 14 12:30:28 2024 +0800 comctl32/ipaddress: Delete font when destroying the control. For bug for bug compatibility, delete the font set by WM_SETFONT when destroying the control even if the font is not owned by the control according to tests. --- dlls/comctl32/ipaddress.c | 7 +++++++ dlls/comctl32/tests/misc.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 493ea77f618..be7e45def97 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -55,6 +55,7 @@ typedef struct HWND Self; HWND Notify; BOOL Enabled; + HFONT hFont; IPPART_INFO Part[4]; } IPADDRESS_INFO; @@ -269,6 +270,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)part->OrigProc); } + if (infoPtr->hFont) + DeleteObject (infoPtr->hFont); SetWindowLongPtrW (infoPtr->Self, 0, 0); theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); @@ -651,6 +654,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) IPADDRESS_SetFocusToField (infoPtr, 0); break; + case WM_SETFONT: + infoPtr->hFont = (HFONT)wParam; + return 0; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 0ecf240ae4d..ff6336f31af 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1239,14 +1239,9 @@ static void test_WM_SETFONT(void) ret = GetObjectA(hfont, sizeof(lf), &lf); if (!lstrcmpA(tests[i].class_name, WC_IPADDRESSA)) - { - todo_wine ok(ret == 0, "GetObjectA succeeded.\n"); - } else - { ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); - } winetest_pop_context(); }

1 0

Zhiyi Zhang : comctl32/tooltips: Don't duplicate font when handling WM_SETFONT.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: c9452db7693970eb182f841f5bcb43cd4e03501a URL: https://gitlab.winehq.org/wine/wine/-/commit/c9452db7693970eb182f841f5bcb43… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 14 12:24:31 2024 +0800 comctl32/tooltips: Don't duplicate font when handling WM_SETFONT. This reverts 06effbf0. --- dlls/comctl32/tests/misc.c | 1 - dlls/comctl32/tooltips.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c57f4581a4b..0ecf240ae4d 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1231,7 +1231,6 @@ static void test_WM_SETFONT(void) if (tests[i].use_system_font) ok(hfont2 == NULL, "Got unexpected font %p.\n", hfont2); else - todo_wine_if(!lstrcmpA(tests[i].class_name, TOOLTIPS_CLASSA)) ok(hfont2 == hfont, "Got unexpected font %p.\n", hfont2); ret = GetObjectA(hfont, sizeof(lf), &lf); ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError()); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 95ef8da6794..2353d4018ac 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -131,6 +131,7 @@ typedef struct COLORREF clrBk; COLORREF clrText; HFONT hFont; + HFONT hStatusFont; HFONT hTitleFont; INT xTrackPos; INT yTrackPos; @@ -194,14 +195,16 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) infoPtr->clrBk = comctl32_color.clrInfoBk; infoPtr->clrText = comctl32_color.clrInfoText; - DeleteObject (infoPtr->hFont); + DeleteObject (infoPtr->hStatusFont); nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); - infoPtr->hFont = CreateFontIndirectW (&nclm.lfStatusFont); + infoPtr->hStatusFont = CreateFontIndirectW (&nclm.lfStatusFont); DeleteObject (infoPtr->hTitleFont); nclm.lfStatusFont.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW (&nclm.lfStatusFont); + + infoPtr->hFont = infoPtr->hStatusFont; } /* Custom draw routines */ @@ -1854,7 +1857,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) DeleteObject(infoPtr->hTitleIcon); /* delete fonts */ - DeleteObject (infoPtr->hFont); + DeleteObject (infoPtr->hStatusFont); DeleteObject (infoPtr->hTitleFont); /* free tool tips info data */ @@ -1952,8 +1955,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) if(!GetObjectW(hFont, sizeof(lf), &lf)) return 0; - DeleteObject (infoPtr->hFont); - infoPtr->hFont = CreateFontIndirectW(&lf); + infoPtr->hFont = hFont; DeleteObject (infoPtr->hTitleFont); lf.lfWeight = FW_BOLD;

1 0

Paul Gofman : mf: Implement audio capture device enumeration in MFEnumDeviceSources().
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: b32c69b0866a369e67d3abaae22e6f302cbd24c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b32c69b0866a369e67d3abaae22e6f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 24 19:08:52 2024 -0600 mf: Implement audio capture device enumeration in MFEnumDeviceSources(). --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 23 +++++++-- dlls/mf/mf_private.h | 2 + dlls/mf/sac.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 10 ++-- 5 files changed, 157 insertions(+), 10 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 8eb1809be9b..d9f0123767d 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -13,6 +13,7 @@ SOURCES = \ mf.idl \ mf.rc \ quality.c \ + sac.c \ samplegrabber.c \ sar.c \ scheme_handler.c \ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 92558a86b30..e74a4ae8e4c 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -747,16 +747,29 @@ HRESULT WINAPI MFShutdownObject(IUnknown *object) /*********************************************************************** * MFEnumDeviceSources (mf.@) */ -HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count) +HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *ret_count) { - FIXME("%p, %p, %p.\n", attributes, sources, count); + GUID source_type; + HRESULT hr; + + TRACE("%p, %p, %p.\n", attributes, sources, ret_count); - if (!attributes || !sources || !count) + if (!attributes || !sources || !ret_count) return E_INVALIDARG; - *count = 0; + if (FAILED(hr = IMFAttributes_GetGUID(attributes, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &source_type))) + return hr; - return S_OK; + if (IsEqualGUID(&source_type, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID)) + { + FIXME("Not implemented for video capture devices.\n"); + *ret_count = 0; + return S_OK; + } + if (IsEqualGUID(&source_type, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID)) + return enum_audio_capture_sources(attributes, sources, ret_count); + + return E_INVALIDARG; } struct simple_type_handler diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 401e1f55b49..7d169c0711f 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -122,3 +122,5 @@ extern HRESULT create_topology(TOPOID id, IMFTopology **topology); extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj); extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler); extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); + +extern HRESULT enum_audio_capture_sources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *ret_count); diff --git a/dlls/mf/sac.c b/dlls/mf/sac.c new file mode 100644 index 00000000000..d5c6518a72c --- /dev/null +++ b/dlls/mf/sac.c @@ -0,0 +1,131 @@ +/* + * Copyright 2024 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "mfapi.h" +#include "mfidl.h" +#include "mf_private.h" +#include "mmdeviceapi.h" +#include "audioclient.h" + +#include "initguid.h" +#include "devpkey.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static HRESULT audio_capture_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + FIXME("%p, %p, %p stub.\n", attributes, user_context, obj); + + return E_NOTIMPL; +} + +static void audio_capture_shutdown_object(void *user_context, IUnknown *obj) +{ + TRACE("%p %p.\n", user_context, obj); +} + +static void audio_capture_free_private(void *user_context) +{ + TRACE("%p.\n", user_context); +} + +static const struct activate_funcs audio_capture_activate_funcs = +{ + audio_capture_create_object, + audio_capture_shutdown_object, + audio_capture_free_private, +}; + +HRESULT enum_audio_capture_sources(IMFAttributes *attributes, IMFActivate ***ret_sources, UINT32 *ret_count) +{ + IMMDeviceEnumerator *devenum = NULL; + IMMDeviceCollection *devices = NULL; + UINT32 i, count, created_count = 0; + IMFActivate **sources = NULL; + ERole role; + HRESULT hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, + (void **)&devenum))) + goto done; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE, (UINT32 *)&role))) + FIXME("Specifying role (%d) is not supported.\n", role); + if (FAILED(hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, eCapture, DEVICE_STATE_ACTIVE, &devices))) + goto done; + if (FAILED(hr = IMMDeviceCollection_GetCount(devices, &count))) + goto done; + sources = CoTaskMemAlloc(count * sizeof(*sources)); + for (i = 0; i < count; ++i) + { + IMMDevice *device = NULL; + IPropertyStore *ps; + WCHAR *str = NULL; + PROPVARIANT pv; + + if (FAILED(hr = create_activation_object(NULL, &audio_capture_activate_funcs, &sources[i]))) + goto done; + ++created_count; + + hr = IMFActivate_SetGUID(sources[i], &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID); + if (SUCCEEDED(hr)) + hr = IMMDeviceCollection_Item(devices, i, &device); + if (SUCCEEDED(hr)) + hr = IMMDevice_GetId(device, &str); + if (SUCCEEDED(hr)) + hr = IMFActivate_SetString(sources[i], &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID, str); + CoTaskMemFree(str); + + PropVariantInit(&pv); + if (SUCCEEDED(hr) && SUCCEEDED((hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps)))) + { + hr = IPropertyStore_GetValue(ps, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + IPropertyStore_Release(ps); + } + if (device) + IMMDevice_Release(device); + + if (SUCCEEDED(hr) && pv.vt != VT_LPWSTR) + hr = E_FAIL; + + if (SUCCEEDED(hr)) + hr = IMFActivate_SetString(sources[i], &MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, pv.pwszVal); + PropVariantClear(&pv); + if (FAILED(hr)) + goto done; + } + *ret_count = count; + *ret_sources = sources; + +done: + if (FAILED(hr)) + { + for (i = 0; i < created_count; ++i) + IMFActivate_Release(sources[i]); + CoTaskMemFree(sources); + } + if (devices) + IMMDeviceCollection_Release(devices); + if (devenum) + IMMDeviceEnumerator_Release(devenum); + TRACE("ret %#lx, *ret_count %u.\n", hr, *ret_count); + return hr; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6847030b329..a2f183e5cc4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6446,8 +6446,8 @@ static void test_MFEnumDeviceSources(void) sources = (void *)0xdeadbeef; count = 0xdeadbeef; hr = MFEnumDeviceSources(attrs, &sources, &count); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); - todo_wine ok(count == 0xdeadbeef, "got %#x.\n", count); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got %#lx.\n", hr); + ok(count == 0xdeadbeef, "got %#x.\n", count); ok(sources == (void *)0xdeadbeef, "got %p.\n", sources); hr = CoInitialize(NULL); @@ -6456,7 +6456,7 @@ static void test_MFEnumDeviceSources(void) hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE); ok(hr == S_OK, "got %#lx.\n", hr); hr = MFEnumDeviceSources(attrs, &sources, &count); - todo_wine ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + ok(hr == E_INVALIDARG, "got %#lx.\n", hr); hr = IMFAttributes_SetGUID(attrs, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID); ok(hr == S_OK, "got %#lx.\n", hr); @@ -6474,7 +6474,7 @@ static void test_MFEnumDeviceSources(void) ok(hr == S_OK, "got %#lx.\n", hr); hr = IMMDeviceCollection_GetCount(devices, &count2); ok(hr == S_OK, "got %#lx.\n", hr); - todo_wine ok(count2 == count, "got %u, %u.\n", count, count2); + ok(count2 == count, "got %u, %u.\n", count, count2); for (i = 0; i < count; ++i) { @@ -6493,7 +6493,7 @@ static void test_MFEnumDeviceSources(void) ok(!wcscmp(str, device_id), "got %s, %s.\n", debugstr_w(str), debugstr_w(device_id)); hr = IMFActivate_GetString(source, &MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK, str, sizeof(str), NULL); - ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got %#lx.\n", hr); + todo_wine ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got %#lx.\n", hr); if (hr == S_OK) { swprintf(expect_str, ARRAY_SIZE(expect_str), L"%s%s#%s", mmdev_path_prefix, device_id, devinterface_audio_capture_wstr);

1 0