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

Dmitry Timoshkov : dllhost: Add ISurrogate stub implementation.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 6b7686946b07caf55e3d38548394a1072559ae3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b7686946b07caf55e3d3854… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 24 11:50:37 2022 +0300 dllhost: Add ISurrogate stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dllhost/Makefile.in | 2 +- programs/dllhost/dllhost.c | 84 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in index a92add9c2f0..bca6c208cdc 100644 --- a/programs/dllhost/Makefile.in +++ b/programs/dllhost/Makefile.in @@ -1,5 +1,5 @@ MODULE = dllhost.exe -IMPORTS = ole32 +IMPORTS = ole32 uuid EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 39d2194db4b..a0d3b9937f1 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -18,6 +18,8 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <objbase.h> @@ -26,24 +28,104 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct surrogate +{ + ISurrogate ISurrogate_iface; + LONG ref; +}; + +static inline struct surrogate *impl_from_ISurrogate(ISurrogate *iface) +{ + return CONTAINING_RECORD(iface, struct surrogate, ISurrogate_iface); +} + +static HRESULT WINAPI surrogate_QueryInterface(ISurrogate *iface, + REFIID iid, void **ppv) +{ + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISurrogate)) + { + ISurrogate_AddRef(&surrogate->ISurrogate_iface); + *ppv = &surrogate->ISurrogate_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI surrogate_AddRef(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI surrogate_Release(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const ISurrogateVtbl Surrogate_Vtbl = +{ + surrogate_QueryInterface, + surrogate_AddRef, + surrogate_Release, + surrogate_LoadDllServer, + surrogate_FreeSurrogate +}; + int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) { HRESULT hr; CLSID clsid; + struct surrogate surrogate; if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) return 0; cmdline += 11; + surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; + surrogate.ref = 1; + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CLSIDFromString(cmdline, &clsid); if (hr == S_OK) { - FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + CoRegisterSurrogate(&surrogate.ISurrogate_iface); + + hr = ISurrogate_LoadDllServer(&surrogate.ISurrogate_iface, &clsid); + if (hr != S_OK) + { + ERR("Can't create instance of %s\n", wine_dbgstr_guid(&clsid)); + goto cleanup; + } + + /* FIXME: wait for FreeSurrogate being called */ + Sleep(INFINITE); } +cleanup: CoUninitialize(); return 0;

1 0

Dmitry Timoshkov : dllhost: Add stub implementation.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 36ac0c1cfbd298bb8d82a465c00adacdb387599c URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ac0c1cfbd298bb8d82a465… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 24 11:50:34 2022 +0300 dllhost: Add stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/dllhost/Makefile.in | 7 +++++++ programs/dllhost/dllhost.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/configure b/configure index ad2ef2e7b8d..305f71e18d8 100755 --- a/configure +++ b/configure @@ -1556,6 +1556,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dllhost enable_dplaysvr enable_dpnsvr enable_dpvsetup @@ -21984,6 +21985,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dllhost enable_dllhost wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dpvsetup enable_dpvsetup diff --git a/configure.ac b/configure.ac index 4245f7efb0f..5a85fce12a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3251,6 +3251,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dllhost) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in new file mode 100644 index 00000000000..a92add9c2f0 --- /dev/null +++ b/programs/dllhost/Makefile.in @@ -0,0 +1,7 @@ +MODULE = dllhost.exe +IMPORTS = ole32 + +EXTRADLLFLAGS = -mwindows -municode + +C_SRCS = \ + dllhost.c diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c new file mode 100644 index 00000000000..39d2194db4b --- /dev/null +++ b/programs/dllhost/dllhost.c @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dllhost); + +int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) +{ + HRESULT hr; + CLSID clsid; + + if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) + return 0; + + cmdline += 11; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CLSIDFromString(cmdline, &clsid); + if (hr == S_OK) + { + FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + } + + CoUninitialize(); + + return 0; +}

1 0

Huw Davies : maintainers: Add dllhost.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 1d1253ba55338a33a4bf99b1b755a250675311d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1253ba55338a33a4bf99b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 8 15:41:49 2022 +0000 maintainers: Add dllhost. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a90c91b60b7..9ceae9e80bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -233,6 +233,7 @@ F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c +F: programs/dllhost/ OLE Storage M: Esme Povirk <esme(a)codeweavers.com>

1 0

Jacek Caban : win32u: Move is_window_drawable implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 9daec6fd94b1b750779f385417fe64649b0c39fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9daec6fd94b1b750779f3854… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:28 2022 +0100 win32u: Move is_window_drawable implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 90 ++-------------------------------------------------- dlls/win32u/window.c | 32 +++++++++++++++++++ include/ntuser.h | 2 ++ 3 files changed, 36 insertions(+), 88 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a22b80da6a9..a5d1a640335 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -287,76 +287,6 @@ static HWND *list_window_children( HDESK desktop, HWND hwnd, UNICODE_STRING *cla } -/******************************************************************* - * list_window_parents - * - * Build an array of all parents of a given window, starting with - * the immediate parent. The array must be freed with HeapFree. - */ -static HWND *list_window_parents( HWND hwnd ) -{ - WND *win; - HWND current, *list; - int i, pos = 0, size = 16, count; - - if (!(list = HeapAlloc( GetProcessHeap(), 0, size * sizeof(HWND) ))) return NULL; - - current = hwnd; - for (;;) - { - if (!(win = WIN_GetPtr( current ))) goto empty; - if (win == WND_OTHER_PROCESS) break; /* need to do it the hard way */ - if (win == WND_DESKTOP) - { - if (!pos) goto empty; - list[pos] = 0; - return list; - } - list[pos] = current = win->parent; - WIN_ReleasePtr( win ); - if (!current) return list; - if (++pos == size - 1) - { - /* need to grow the list */ - HWND *new_list = HeapReAlloc( GetProcessHeap(), 0, list, (size+16) * sizeof(HWND) ); - if (!new_list) goto empty; - list = new_list; - size += 16; - } - } - - /* at least one parent belongs to another process, have to query the server */ - - for (;;) - { - count = 0; - SERVER_START_REQ( get_window_parents ) - { - req->handle = wine_server_user_handle( hwnd ); - wine_server_set_reply( req, list, (size-1) * sizeof(user_handle_t) ); - if (!wine_server_call( req )) count = reply->count; - } - SERVER_END_REQ; - if (!count) goto empty; - if (size > count) - { - /* start from the end since HWND is potentially larger than user_handle_t */ - for (i = count - 1; i >= 0; i--) - list[i] = wine_server_ptr_handle( ((user_handle_t *)list)[i] ); - list[count] = 0; - return list; - } - HeapFree( GetProcessHeap(), 0, list ); - size = count + 1; - if (!(list = HeapAlloc( GetProcessHeap(), 0, size * sizeof(HWND) ))) return NULL; - } - - empty: - HeapFree( GetProcessHeap(), 0, list ); - return NULL; -} - - /******************************************************************* * send_parent_notify */ @@ -3029,24 +2959,8 @@ BOOL WINAPI IsWindowVisible( HWND hwnd ) */ BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL icon ) { - HWND *list; - BOOL retval = TRUE; - int i; - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (!(style & WS_VISIBLE)) return FALSE; - if ((style & WS_MINIMIZE) && icon && GetClassLongPtrW( hwnd, GCLP_HICON )) return FALSE; - - if (!(list = list_window_parents( hwnd ))) return TRUE; - if (list[0]) - { - for (i = 0; list[i+1]; i++) - if ((GetWindowLongW( list[i], GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != WS_VISIBLE) - break; - retval = !list[i+1] && (list[i] == GetDesktopWindow()); /* top message window isn't visible */ - } - HeapFree( GetProcessHeap(), 0, list ); - return retval; + /* FIXME: move callers to win32u */ + return NtUserCallHwndParam( hwnd, icon, NtUserIsWindowDrawable ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e13107d1d64..7b5a6b3da03 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -625,6 +625,35 @@ static BOOL is_window_visible( HWND hwnd ) return retval; } +/*********************************************************************** + * is_window_drawable + * + * hwnd is drawable when it is visible, all parents are not + * minimized, and it is itself not minimized unless we are + * trying to draw its default class icon. + */ +static BOOL is_window_drawable( HWND hwnd, BOOL icon ) +{ + HWND *list; + BOOL retval = TRUE; + int i; + LONG style = get_window_long( hwnd, GWL_STYLE ); + + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & WS_MINIMIZE) && icon && get_class_long_ptr( hwnd, GCLP_HICON, FALSE )) return FALSE; + + if (!(list = list_window_parents( hwnd ))) return TRUE; + if (list[0]) + { + for (i = 0; list[i+1]; i++) + if ((get_window_long( list[i], GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != WS_VISIBLE) + break; + retval = !list[i+1] && (list[i] == user_callbacks->pGetDesktopWindow()); /* top message window isn't visible */ + } + free( list ); + return retval; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1015,6 +1044,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_word( hwnd, param ); case NtUserIsChild: return is_child( hwnd, UlongToHandle(param) ); + /* temporary exports */ + case NtUserIsWindowDrawable: + return is_window_drawable( hwnd, param ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 20fa61bacec..3fca830d5b2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -161,6 +161,8 @@ enum NtUserGetWindowThread, NtUserGetWindowWord, NtUserIsChild, + /* temporary exports */ + NtUserIsWindowDrawable, }; /* color index used to retrieve system 55aa brush */

1 0

Jacek Caban : win32u: Move IsChild implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: be1f46bba453162dfff28cd1cb51183044210909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1f46bba453162dfff28cd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:15 2022 +0100 win32u: Move IsChild implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 19 +------------------ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/palette.c | 2 +- dlls/win32u/window.c | 25 +++++++++++++++++++++++++ include/ntuser.h | 1 + 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 3afda0d528d..f9fce07ddab 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -138,7 +138,6 @@ static const struct user_callbacks user_funcs = CopyImage, GetDesktopWindow, GetWindowRect, - IsChild, RedrawWindow, SendMessageTimeoutW, WindowFromDC, diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fe8d929a102..58c581c26da 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3007,24 +3007,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) */ BOOL WINAPI IsChild( HWND parent, HWND child ) { - HWND *list; - int i; - BOOL ret = FALSE; - - if (!(GetWindowLongW( child, GWL_STYLE ) & WS_CHILD)) return FALSE; - if (!(list = list_window_parents( child ))) return FALSE; - parent = WIN_GetFullHandle( parent ); - for (i = 0; list[i]; i++) - { - if (list[i] == parent) - { - ret = list[i] && list[i+1]; - break; - } - if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_CHILD)) break; - } - HeapFree( GetProcessHeap(), 0, list ); - return ret; + return NtUserCallHwndParam( parent, HandleToUlong(child), NtUserIsChild ); } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 5f3cf41c1a2..4c05d070a0a 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,7 +32,6 @@ struct user_callbacks HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); HWND (WINAPI *pGetDesktopWindow)(void); BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - BOOL (WINAPI *pIsChild)( HWND, HWND ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); HWND (WINAPI *pWindowFromDC)( HDC ); @@ -232,6 +231,7 @@ void *get_user_handle_ptr( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN; void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN; WND *get_win_ptr( HWND hwnd ) DECLSPEC_HIDDEN; +BOOL is_child( HWND parent, HWND child ); BOOL is_window( HWND hwnd ) DECLSPEC_HIDDEN; #endif /* __WINE_NTUSER_PRIVATE_H */ diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index d09fc9d4d73..367bfea21b4 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -521,7 +521,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { /* set primary palette if it's related to current active */ HWND foreground = NtUserGetForegroundWindow(); - is_primary = foreground == hwnd || user_callbacks->pIsChild( foreground, hwnd ); + is_primary = foreground == hwnd || is_child( foreground, hwnd ); } } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f7f0d4e6a65..3c65d3ec1ce 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -583,6 +583,29 @@ HWND WINAPI NtUserGetAncestor( HWND hwnd, UINT type ) return ret; } +/* see IsChild */ +BOOL is_child( HWND parent, HWND child ) +{ + HWND *list; + int i; + BOOL ret = FALSE; + + if (!(get_window_long( child, GWL_STYLE ) & WS_CHILD)) return FALSE; + if (!(list = list_window_parents( child ))) return FALSE; + parent = get_full_window_handle( parent ); + for (i = 0; list[i]; i++) + { + if (list[i] == parent) + { + ret = list[i] && list[i+1]; + break; + } + if (!(get_window_long( list[i], GWL_STYLE ) & WS_CHILD)) break; + } + free( list ); + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -969,6 +992,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_thread( hwnd, (DWORD *)param ); case NtUserGetWindowWord: return get_window_word( hwnd, param ); + case NtUserIsChild: + return is_child( hwnd, UlongToHandle(param) ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index d62a4ed4459..8d724971d53 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -159,6 +159,7 @@ enum NtUserGetWindowRelative, NtUserGetWindowThread, NtUserGetWindowWord, + NtUserIsChild, }; /* color index used to retrieve system 55aa brush */

1 0

Jacek Caban : win32u: Move GetParent implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 5da6282a60319bddb4f25b360a65441bf96b4d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da6282a60319bddb4f25b36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:00 2022 +0100 win32u: Move GetParent implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 34 +--------------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fb7d05b71dc..c860464125e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2908,39 +2908,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) */ HWND WINAPI GetParent( HWND hwnd ) { - WND *wndPtr; - HWND retvalue = 0; - - if (!(wndPtr = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr == WND_DESKTOP) return 0; - if (wndPtr == WND_OTHER_PROCESS) - { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - if (style & (WS_POPUP | WS_CHILD)) - { - SERVER_START_REQ( get_window_tree ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - if (style & WS_POPUP) retvalue = wine_server_ptr_handle( reply->owner ); - else if (style & WS_CHILD) retvalue = wine_server_ptr_handle( reply->parent ); - } - } - SERVER_END_REQ; - } - } - else - { - if (wndPtr->dwStyle & WS_POPUP) retvalue = wndPtr->owner; - else if (wndPtr->dwStyle & WS_CHILD) retvalue = wndPtr->parent; - WIN_ReleasePtr( wndPtr ); - } - return retvalue; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetParent )); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e3cf939db09..a46accddd71 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -296,6 +296,7 @@ extern void user_check_not_lock(void) DECLSPEC_HIDDEN; struct tagWND; extern HWND is_current_thread_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; +extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f24fc531f16..eb49d9bf237 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -361,6 +361,44 @@ static DWORD get_window_thread( HWND hwnd, DWORD *process ) return tid; } +/* see GetParent */ +static HWND get_parent( HWND hwnd ) +{ + HWND retval = 0; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + LONG style = get_window_long( hwnd, GWL_STYLE ); + if (style & (WS_POPUP | WS_CHILD)) + { + SERVER_START_REQ( get_window_tree ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + if (style & WS_POPUP) retval = wine_server_ptr_handle( reply->owner ); + else if (style & WS_CHILD) retval = wine_server_ptr_handle( reply->parent ); + } + } + SERVER_END_REQ; + } + } + else + { + if (win->dwStyle & WS_POPUP) retval = win->owner; + else if (win->dwStyle & WS_CHILD) retval = win->parent; + release_win_ptr( win ); + } + return retval; +} + /* see GetWindow */ static HWND get_window_relative( HWND hwnd, UINT rel ) { @@ -557,7 +595,7 @@ static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ans } /* see GetWindowLongW */ -static DWORD get_window_long( HWND hwnd, INT offset ) +DWORD get_window_long( HWND hwnd, INT offset ) { return get_window_long_size( hwnd, offset, sizeof(LONG), FALSE ); } @@ -757,6 +795,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserGetParent: + return HandleToUlong( get_parent( hwnd )); case NtUserGetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 3021a8a9af4..8ae916e57bd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -139,6 +139,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserGetParent, NtUserGetWindowTextLength, NtUserIsWindow, };

1 0

Jacek Caban : win32u: Move GetWindow implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: cde008fe7192798db143074578aac78caf4eddac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cde008fe7192798db1430745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:56 2022 +0100 win32u: Move GetWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 51 +--------------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8678aa39454..fb7d05b71dc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3200,56 +3200,7 @@ HWND WINAPI GetTopWindow( HWND hwnd ) */ HWND WINAPI GetWindow( HWND hwnd, UINT rel ) { - HWND retval = 0; - - if (rel == GW_OWNER) /* this one may be available locally */ - { - WND *wndPtr = WIN_GetPtr( hwnd ); - if (!wndPtr) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - if (wndPtr == WND_DESKTOP) return 0; - if (wndPtr != WND_OTHER_PROCESS) - { - retval = wndPtr->owner; - WIN_ReleasePtr( wndPtr ); - return retval; - } - /* else fall through to server call */ - } - - SERVER_START_REQ( get_window_tree ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - switch(rel) - { - case GW_HWNDFIRST: - retval = wine_server_ptr_handle( reply->first_sibling ); - break; - case GW_HWNDLAST: - retval = wine_server_ptr_handle( reply->last_sibling ); - break; - case GW_HWNDNEXT: - retval = wine_server_ptr_handle( reply->next_sibling ); - break; - case GW_HWNDPREV: - retval = wine_server_ptr_handle( reply->prev_sibling ); - break; - case GW_OWNER: - retval = wine_server_ptr_handle( reply->owner ); - break; - case GW_CHILD: - retval = wine_server_ptr_handle( reply->first_child ); - break; - } - } - } - SERVER_END_REQ; - return retval; + return UlongToHandle( NtUserCallHwndParam( hwnd, rel, NtUserGetWindowRelative )); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 86356b609b0..f24fc531f16 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -361,6 +361,61 @@ static DWORD get_window_thread( HWND hwnd, DWORD *process ) return tid; } +/* see GetWindow */ +static HWND get_window_relative( HWND hwnd, UINT rel ) +{ + HWND retval = 0; + + if (rel == GW_OWNER) /* this one may be available locally */ + { + WND *win = get_win_ptr( hwnd ); + if (!win) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return 0; + if (win != WND_OTHER_PROCESS) + { + retval = win->owner; + release_win_ptr( win ); + return retval; + } + /* else fall through to server call */ + } + + SERVER_START_REQ( get_window_tree ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + switch(rel) + { + case GW_HWNDFIRST: + retval = wine_server_ptr_handle( reply->first_sibling ); + break; + case GW_HWNDLAST: + retval = wine_server_ptr_handle( reply->last_sibling ); + break; + case GW_HWNDNEXT: + retval = wine_server_ptr_handle( reply->next_sibling ); + break; + case GW_HWNDPREV: + retval = wine_server_ptr_handle( reply->prev_sibling ); + break; + case GW_OWNER: + retval = wine_server_ptr_handle( reply->owner ); + break; + case GW_CHILD: + retval = wine_server_ptr_handle( reply->first_child ); + break; + } + } + } + SERVER_END_REQ; + return retval; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -737,6 +792,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_long_ptr( hwnd, param, TRUE ); case NtUserGetWindowLongPtrW: return get_window_long_ptr( hwnd, param, FALSE ); + case NtUserGetWindowRelative: + return HandleToUlong( get_window_relative( hwnd, param )); case NtUserGetWindowThread: return get_window_thread( hwnd, (DWORD *)param ); case NtUserGetWindowWord: diff --git a/include/ntuser.h b/include/ntuser.h index ccdfdb04de5..3021a8a9af4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -155,6 +155,7 @@ enum NtUserGetWindowLongW, NtUserGetWindowLongPtrA, NtUserGetWindowLongPtrW, + NtUserGetWindowRelative, NtUserGetWindowThread, NtUserGetWindowWord, };

1 0

Jacek Caban : win32u: Move GetWindowLong implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: d174cb22944e2ec90bfdf268af94b11e7f81136b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d174cb22944e2ec90bfdf268… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:52 2022 +0100 win32u: Move GetWindowLong implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 166 ++++-------------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d174cb22944e2ec90bfd…

1 0

Jacek Caban : win32u: Move NtUserGetAncestor implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 4ef69e2b5920f3bab3f823345639c83811e7a02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef69e2b5920f3bab3f82334… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:03 2022 +0100 win32u: Move NtUserGetAncestor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 4 +- dlls/user32/desktop.c | 2 +- dlls/user32/driver.c | 2 +- dlls/user32/focus.c | 6 +-- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/nonclient.c | 6 +-- dlls/user32/painting.c | 4 +- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 63 +---------------------- dlls/user32/winpos.c | 26 +++++----- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 +++ include/ntuser.h | 1 + 17 files changed, 170 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ef69e2b5920f3bab3f8…

1 0

Rémi Bernon : windows.gaming.input: Instantiate IGameController(BatteryInfo) stub from providers.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 09cb88e91b746aca447cf359624de67575ffcdc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cb88e91b746aca447cf359… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 8 10:55:22 2022 +0100 windows.gaming.input: Instantiate IGameController(BatteryInfo) stub from providers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/manager.c | 265 +++++++++++++++++++++++++++++++++++- dlls/windows.gaming.input/private.h | 1 + 2 files changed, 264 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09cb88e91b746aca447c…

1 0