July 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Use syscall interface for NtUserCallHwnd and NtUserCallHwndParam.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: a23c1279c6403fda85bcb6c9ca0861b0e853b370 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23c1279c6403fda85bcb6c9ca0861… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 16:19:41 2022 +0200 win32u: Use syscall interface for NtUserCallHwnd and NtUserCallHwndParam. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 18 ++++++++++++++++++ 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 5bb8adedf44..18881afd27c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,8 +1136,6 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCallHwnd, - NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, NtUserCallOneParam, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 37d94aabcdb..ee6b3fa31d1 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -106,6 +106,8 @@ static void * const syscalls[] = NtUserAttachThreadInput, NtUserBeginPaint, NtUserBuildHwndList, + NtUserCallHwnd, + NtUserCallHwndParam, NtUserCallMsgFilter, NtUserCheckMenuItem, NtUserChildWindowFromPointEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 37d21d46a79..fa4fbbcdfe9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -768,11 +768,11 @@ @ stub NtUserBuildPropList @ stub NtUserCalcMenuBar @ stub NtUserCalculatePopupWindowPosition -@ stdcall NtUserCallHwnd(long long) +@ stdcall -syscall NtUserCallHwnd(long long) @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt -@ stdcall NtUserCallHwndParam(long ptr long) +@ stdcall -syscall NtUserCallHwndParam(long ptr long) @ stub NtUserCallHwndParamLock @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3cb16b0d300..9ef7d8906a7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,8 +186,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - ULONG_PTR (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); - ULONG_PTR (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 6f6bad05b28..2cfc6c050db 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -749,18 +749,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } -ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallHwnd( hwnd, code ); -} - -ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); -} - BOOL WINAPI NtUserCloseClipboard(void) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index aa152eeb650..71f01ce6207 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -93,6 +93,8 @@ SYSCALL_ENTRY( NtUserAttachThreadInput ) \ SYSCALL_ENTRY( NtUserBeginPaint ) \ SYSCALL_ENTRY( NtUserBuildHwndList ) \ + SYSCALL_ENTRY( NtUserCallHwnd ) \ + SYSCALL_ENTRY( NtUserCallHwndParam ) \ SYSCALL_ENTRY( NtUserCallMsgFilter ) \ SYSCALL_ENTRY( NtUserCheckMenuItem ) \ SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index db7d4d06556..948318077f4 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -220,6 +220,24 @@ NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) return status; } +NTSTATUS WINAPI wow64_NtUserCallHwnd( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + DWORD code = get_ulong( &args ); + + return NtUserCallHwnd( hwnd, code ); +} + +NTSTATUS WINAPI wow64_NtUserCallHwndParam( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + DWORD_PTR param = get_ulong( &args ); + DWORD code = get_ulong( &args ); + + FIXME( "%p %Ix %lu\n", hwnd, param, code ); + return 0; +} + NTSTATUS WINAPI wow64_NtUserCallMsgFilter( UINT *args ) { MSG32 *msg32 = get_ptr( &args );

1 0

Jacek Caban : win32u: Use syscall interface for more input functions.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 81df0bc7ef2790e36ee545adf3f05157811771fd URL: https://gitlab.winehq.org/wine/wine/-/commit/81df0bc7ef2790e36ee545adf3f051… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 15:48:11 2022 +0200 win32u: Use syscall interface for more input functions. --- dlls/win32u/gdiobj.c | 13 --- dlls/win32u/syscall.c | 13 +++ dlls/win32u/win32u.spec | 28 +++--- dlls/win32u/win32u_private.h | 14 --- dlls/win32u/wrappers.c | 79 ----------------- dlls/wow64win/syscall.h | 13 +++ dlls/wow64win/user.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 240 insertions(+), 120 deletions(-)

1 0

Jacek Caban : user32: Use syscall interface for NtUserCall* functions.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: ca630fb653a0bd73075caa4ddfa413a62617de60 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca630fb653a0bd73075caa4ddfa413… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 16:38:15 2022 +0200 user32: Use syscall interface for NtUserCall* functions. --- dlls/win32u/gdiobj.c | 4 ---- dlls/win32u/syscall.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 24 ------------------------ dlls/wow64win/syscall.h | 4 ++++ dlls/wow64win/user.c | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 18881afd27c..f6e918721a4 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,10 +1136,6 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCallNextHookEx, - NtUserCallNoParam, - NtUserCallOneParam, - NtUserCallTwoParam, NtUserChangeClipboardChain, NtUserChangeDisplaySettings, NtUserClipCursor, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ee6b3fa31d1..ffe1703e1e7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -109,6 +109,10 @@ static void * const syscalls[] = NtUserCallHwnd, NtUserCallHwndParam, NtUserCallMsgFilter, + NtUserCallNextHookEx, + NtUserCallNoParam, + NtUserCallOneParam, + NtUserCallTwoParam, NtUserCheckMenuItem, NtUserChildWindowFromPointEx, NtUserCloseDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index fa4fbbcdfe9..d12b904d3bb 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -777,10 +777,10 @@ @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe @ stdcall -syscall NtUserCallMsgFilter(ptr long) -@ stdcall NtUserCallNextHookEx(long long long long) -@ stdcall NtUserCallNoParam(long) -@ stdcall NtUserCallOneParam(long long) -@ stdcall NtUserCallTwoParam(long long long) +@ stdcall -syscall NtUserCallNextHookEx(long long long long) +@ stdcall -syscall NtUserCallNoParam(long) +@ stdcall -syscall NtUserCallOneParam(long long) +@ stdcall -syscall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground @ stdcall NtUserChangeClipboardChain(long long) @ stdcall NtUserChangeDisplaySettings(ptr ptr long long ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 9ef7d8906a7..4fa0b0e3493 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,10 +186,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); - ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); - ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); - ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); BOOL (WINAPI *pNtUserChangeClipboardChain)( HWND hwnd, HWND next ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 2cfc6c050db..c9cf89f5fe7 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,30 +725,6 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } -LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallNextHookEx( hhook, code, wparam, lparam ); -} - -ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallNoParam( code ); -} - -ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallOneParam( arg, code ); -} - -ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); -} - BOOL WINAPI NtUserCloseClipboard(void) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 71f01ce6207..8ff061ec7f8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -96,6 +96,10 @@ SYSCALL_ENTRY( NtUserCallHwnd ) \ SYSCALL_ENTRY( NtUserCallHwndParam ) \ SYSCALL_ENTRY( NtUserCallMsgFilter ) \ + SYSCALL_ENTRY( NtUserCallNextHookEx ) \ + SYSCALL_ENTRY( NtUserCallNoParam ) \ + SYSCALL_ENTRY( NtUserCallOneParam ) \ + SYSCALL_ENTRY( NtUserCallTwoParam ) \ SYSCALL_ENTRY( NtUserCheckMenuItem ) \ SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 948318077f4..68d444a7c83 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -250,6 +250,42 @@ NTSTATUS WINAPI wow64_NtUserCallMsgFilter( UINT *args ) return ret; } +NTSTATUS WINAPI wow64_NtUserCallNextHookEx( UINT *args ) +{ + HHOOK hhook = get_handle( &args ); + INT code = get_ulong( &args ); + WPARAM wparam = get_ulong( &args ); + LPARAM lparam = get_ulong( &args ); + + return NtUserCallNextHookEx( hhook, code, wparam, lparam ); +} + +NTSTATUS WINAPI wow64_NtUserCallNoParam( UINT *args ) +{ + ULONG code = get_ulong( &args ); + + return NtUserCallNoParam( code ); +} + +NTSTATUS WINAPI wow64_NtUserCallOneParam( UINT *args ) +{ + ULONG_PTR arg = get_ulong( &args ); + ULONG code = get_ulong( &args ); + + FIXME( "%Ix %lu\n", arg, code ); + return 0; +} + +NTSTATUS WINAPI wow64_NtUserCallTwoParam( UINT *args ) +{ + ULONG_PTR arg1 = get_ulong( &args ); + ULONG_PTR arg2 = get_ulong( &args ); + ULONG code = get_ulong( &args ); + + FIXME( "%Ix %Ix %lu\n", arg1, arg2, code ); + return 0; +} + NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) { HMENU handle = get_handle( &args );

1 0

Jacek Caban : winemac: Use __wine_unix_call.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 7df56c9b3a3f69ef4af497713a30c75bedfc50dc URL: https://gitlab.winehq.org/wine/wine/-/commit/7df56c9b3a3f69ef4af497713a30c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 13:01:02 2022 +0200 winemac: Use __wine_unix_call. --- dlls/winemac.drv/dllmain.c | 7 ++----- dlls/winemac.drv/macdrv_main.c | 12 ------------ dlls/winemac.drv/unixlib.h | 6 ++---- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 567485b2f03..ac03ec360ce 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -27,8 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); HMODULE macdrv_module = 0; -static unixlib_handle_t macdrv_handle; -NTSTATUS (CDECL *macdrv_unix_call)(enum macdrv_funcs code, void *params); +unixlib_handle_t macdrv_handle; struct quit_info { HWND *wins; @@ -414,12 +413,10 @@ static BOOL process_attach(void) str->len = LoadStringW(macdrv_module, str->id, (WCHAR *)&str->str, 0); params.strings = strings; - if (__wine_unix_call(macdrv_handle, unix_init, &params)) return FALSE; + if (MACDRV_CALL(init, &params)) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) ); - - macdrv_unix_call = params.unix_call; return TRUE; } diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4b79c69a6f8..7cca25cf302 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -429,9 +429,6 @@ static void load_strings(struct localized_string *str) } -static NTSTATUS CDECL unix_call( enum macdrv_funcs code, void *params ); - - /*********************************************************************** * macdrv_init */ @@ -458,8 +455,6 @@ static NTSTATUS macdrv_init(void *arg) init_user_driver(); macdrv_init_display_devices(FALSE); - - params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -658,10 +653,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); - - -/* FIXME: Use __wine_unix_call instead */ -static NTSTATUS CDECL unix_call(enum macdrv_funcs code, void *params) -{ - return __wine_unix_call_funcs[code]( params ); -} diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index d162732b08e..c5e71e188fa 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -35,9 +35,8 @@ enum macdrv_funcs unix_funcs_count }; -/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -extern NTSTATUS (CDECL *macdrv_unix_call)(enum macdrv_funcs code, void *params) DECLSPEC_HIDDEN; -#define MACDRV_CALL(func, params) macdrv_unix_call(unix_ ## func, params) +extern unixlib_handle_t macdrv_handle DECLSPEC_HIDDEN; +#define MACDRV_CALL(func, params) __wine_unix_call(macdrv_handle, unix_ ## func, params) /* macdrv_dnd_get_data params */ struct dnd_get_data_params @@ -84,7 +83,6 @@ struct localized_string struct init_params { struct localized_string *strings; - NTSTATUS (CDECL *unix_call)(enum macdrv_funcs code, void *params); }; /* macdrv_notify_icon params */

1 0

Alexandre Julliard : winetest: Remove the obsolete winetest service.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: tools Branch: master Commit: c8a37f4f3d59cab512ef9a7328337090ec9bbeb6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/c8a37f4f3d59cab512ef9a73283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 17:26:43 2022 +0200 winetest: Remove the obsolete winetest service. --- winetest/INSTALL.txt | 12 -- winetest/error.cgi | 49 -------- winetest/make-winetest | 6 - winetest/service.cgi | 328 ------------------------------------------------- 4 files changed, 395 deletions(-)

1 0

Alexandre Julliard : gitlab: Support configuring the path of the maintainers file.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: tools Branch: master Commit: acecdb925f7b2d22d62f1fd626c6cc97408a729e URL: https://gitlab.winehq.org/winehq/tools/-/commit/acecdb925f7b2d22d62f1fd626c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 11:57:12 2022 +0200 gitlab: Support configuring the path of the maintainers file. --- gitlab/gitlab-to-mail/assign.py | 4 +++- gitlab/gitlab-to-mail/example.cfg | 3 +++ gitlab/gitlab-to-mail/util.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 6b35f577..a4d8709d 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -44,7 +44,9 @@ def append_user(user_map, line, id_array, name_array, verbose=False): print("Cannot find GitLab account for [{}]".format(name), file=sys.stderr) def get_maintainers_map(verbose=False): - url = urljoin(settings.GITLAB_URL, f"{settings.GITLAB_PROJECT_NAME}/-/raw/master/MAINTAINERS") + if settings.MAINTAINERS is None: + return [] + url = urljoin(settings.GITLAB_URL, f"{settings.GITLAB_PROJECT_NAME}/-/raw/master/{settings.MAINTAINERS}") r = requests.get(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}) r = requests.get(url) r.raise_for_status() diff --git a/gitlab/gitlab-to-mail/example.cfg b/gitlab/gitlab-to-mail/example.cfg index a4e4f238..49ee8c7d 100644 --- a/gitlab/gitlab-to-mail/example.cfg +++ b/gitlab/gitlab-to-mail/example.cfg @@ -41,3 +41,6 @@ MAXIMUM_PATCHES = 50 # Configure runner.py behavior. A minimum delay of 30 seconds is enforced. RUNNER_COMMAND = ./gitlabtomail.py RUNNER_INTERVAL = 300 + +# Name of maintainers file for reviewers assignments +MAINTAINERS = "MAINTAINERS" diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index 231e8e21..b83b10b2 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -30,7 +30,7 @@ class Settings: sys.exit(1) for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', - 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', + 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', 'MAINTAINERS', 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD', 'RUNNER_COMMAND']: if s in self.cp['settings']: self.__dict__[s] = self.cp['settings'][s].strip('"')

1 0

Hugh McMaster : regedit: Pass updated REG_MULTI_SZ data via 'struct edit_params'.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: becf11084fa59b9b0e814e28af61c5ecfcb03597 URL: https://gitlab.winehq.org/wine/wine/-/commit/becf11084fa59b9b0e814e28af61c5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 18 22:27:01 2022 +1000 regedit: Pass updated REG_MULTI_SZ data via 'struct edit_params'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 224 +++++++++++++++++++++++++----------------------- 1 file changed, 119 insertions(+), 105 deletions(-)

1 0

Jacek Caban : win32u: Get rid of no longer needed NtUserSetCallbacks.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 88462d9127f68519e6ba3db019466e60f28d36c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/88462d9127f68519e6ba3db019466e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 20 01:02:52 2022 +0200 win32u: Get rid of no longer needed NtUserSetCallbacks. --- dlls/user32/user_main.c | 20 -------------------- dlls/win32u/gdiobj.c | 3 --- dlls/win32u/ntuser_private.h | 10 ---------- dlls/win32u/sysparams.c | 3 --- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/window.c | 2 +- include/ntuser.h | 1 - 7 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 7125e32b154..d3940d4a95c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -119,23 +119,6 @@ static void dpiaware_init(void) } } -static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, - void (CALLBACK *finally_func)( BOOL )) -{ - NTSTATUS status; - __TRY - { - status = func( arg ); - } - __FINALLY( finally_func ); - return status; -} - -static const struct user_callbacks user_funcs = -{ - try_finally, -}; - static NTSTATUS WINAPI User32CopyImage( const struct copy_image_params *params, ULONG size ) { HANDLE ret = CopyImage( params->hwnd, params->type, params->dx, params->dy, params->flags ); @@ -247,9 +230,6 @@ static BOOL process_attach(void) { NtCurrentTeb()->Peb->KernelCallbackTable = kernel_callback_table; - /* FIXME: should not be needed */ - NtUserCallOneParam( (UINT_PTR)&user_funcs, NtUserSetCallbacks ); - dpiaware_init(); winproc_init(); register_desktop_class(); diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 30c507275fc..b20e3a7ddbb 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -50,8 +50,6 @@ static GDI_HANDLE_ENTRY *next_unused; static LONG debug_count; SYSTEM_BASIC_INFORMATION system_info; -const struct user_callbacks *user_callbacks = NULL; - static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared->Handles; @@ -1283,7 +1281,6 @@ NTSTATUS gdi_init(void) NTSTATUS callbacks_init( void *args ) { - user_callbacks = *(const struct user_callbacks **)args; *(const struct unix_funcs **)args = &unix_funcs; return 0; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 69adad822a0..313382505d4 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -25,16 +25,6 @@ #include "ntuser.h" #include "wine/list.h" -struct dce; -struct tagWND; - -struct hardware_msg_data; - -struct user_callbacks -{ - NTSTATUS (CDECL *try_finally)( NTSTATUS (CDECL *func)( void *), void *arg, - void (CALLBACK *finally_func)( BOOL )); -}; #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e8b55616f6a..8bb6b46397e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4953,9 +4953,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) default: user_check_not_lock(); return 0; } - case NtUserSetCallbacks: - return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg ); - case NtUserSpyGetVKeyName: return (UINT_PTR)debugstr_vkey_name( arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 262d46d3d7c..bdc8235a831 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -32,8 +32,6 @@ #include "wine/debug.h" #include "wine/server.h" -extern const struct user_callbacks *user_callbacks DECLSPEC_HIDDEN; - struct unix_funcs { /* win32u functions */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index fee1617ef10..a2ef9e72a06 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3438,7 +3438,7 @@ BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) /* child windows get WM_CHILDACTIVATE message */ if ((get_window_long( winpos->hwnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) == WS_CHILD) send_message( winpos->hwnd, WM_CHILDACTIVATE, 0, 0 ); - else if (user_callbacks) + else set_foreground_window( winpos->hwnd, FALSE ); } diff --git a/include/ntuser.h b/include/ntuser.h index 67058defb6f..59916d25d6d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -924,7 +924,6 @@ enum NtUserGetDeskPattern, NtUserGetWinProcPtr, NtUserLock, - NtUserSetCallbacks, NtUserSpyGetVKeyName, };

1 0

Jacek Caban : win32u: Use syscall interface for NtUserMessageCall and NtUserTrackPopupMenuEx.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: e52e42b8756ff4453889e05e16a8cfc3c299eefc URL: https://gitlab.winehq.org/wine/wine/-/commit/e52e42b8756ff4453889e05e16a8cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 17:29:57 2022 +0200 win32u: Use syscall interface for NtUserMessageCall and NtUserTrackPopupMenuEx. try_finally() hack is no longer needed. We don't expect exceptions from unixlib code and client callbacks' exceptions are not propagated anyway. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/menu.c | 42 +----------------------------------------- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 14 -------------- dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 26 ++++++++++++++++++++++++++ 8 files changed, 33 insertions(+), 63 deletions(-)

1 0

Hugh McMaster : regedit: Use a separate dialog proc function for string data types.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: b00a4b66b93e24e00c6638fd0b18716908885d06 URL: https://gitlab.winehq.org/wine/wine/-/commit/b00a4b66b93e24e00c6638fd0b1871… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 8 10:44:21 2022 +1000 regedit: Use a separate dialog proc function for string data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 4cb48799090..d668425b137 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -81,6 +81,35 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) va_end(ap); } +static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + HWND hwndValue; + unsigned int len; + + switch (msg) + { + case WM_INITDIALOG: + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wparam)) + { + case IDOK: + hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); + len = GetWindowTextLengthW(hwndValue); + stringValueData = realloc(stringValueData, (len + 1) * sizeof(WCHAR)); + if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) + *stringValueData = 0; + /* fall through */ + case IDCANCEL: + EndDialog(hwndDlg, wparam); + return TRUE; + } + } + return FALSE; +} + static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { WCHAR buf[128]; @@ -268,7 +297,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { - if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc) == IDOK) { lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (lstrlenW(stringValueData) + 1) * sizeof(WCHAR)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);

1 0