wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Stefan Dösinger : include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 20c2e5ba283c0e82617171c8fd1b88620641f077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c2e5ba283c0e82617171c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 1 16:58:21 2022 +0300 include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 18d9fa656f8..698f29d990e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6292,7 +6292,6 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6309,7 +6308,6 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); -long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6352,8 +6350,10 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__x86_64__) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(__faststorefence) +long long _InterlockedExchangeAdd64(long long volatile *, long long); void __faststorefence(void); static FORCEINLINE void MemoryBarrier(void)

1 0

Alex Henrie : shell32/tests: Wait for window to close in check_window_exists.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 4dcc7a5ae8427b35254713edf1a1a19ce38213f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dcc7a5ae8427b35254713ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 7 00:54:29 2022 -0700 shell32/tests: Wait for window to close in check_window_exists. This fixes a race condition where the directory is deleted before the window closes, which causes an error dialog to appear. Cutting the number of iterations per wait loop in half is necessary so that doubling the number of wait loops does not result in a timeout when new tests are added. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index ef087893016..5d532f9222f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -164,7 +164,7 @@ static BOOL check_window_exists(const char *name) else strcpy(title, name); - for (i = 0; i < 20; i++) + for (i = 0; i < 10; i++) { Sleep(100 * i); if ((window = FindWindowA("ExplorerWClass", title)) || @@ -175,7 +175,17 @@ static BOOL check_window_exists(const char *name) } } - return (window != NULL); + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + Sleep(100 * i); + if (!IsWindow(window)) + break; + } + + return TRUE; } static BOOL check_exists(const char *name)

1 0

Jacek Caban : server: Don't allow creating children of orphaned windows.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 3cbccd4477c0ca00385126025bbb487fbd97f255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cbccd4477c0ca0038512602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:36 2022 +0100 server: Don't allow creating children of orphaned windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a5848ac28da..3ace25056de 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -765,7 +765,7 @@ static LRESULT CALLBACK test_thread_exit_wnd_proc( HWND hwnd, UINT msg, WPARAM w static void test_thread_exit_destroy(void) { struct test_thread_exit_parent_params params; - HWND adopter, child1, child2, child3; + HWND adopter, child1, child2, child3, child; WNDPROC old_wndproc, wndproc; WCHAR buffer[MAX_PATH]; HANDLE thread; @@ -889,6 +889,14 @@ static void test_thread_exit_destroy(void) tmp = GetPropW( child2, L"myprop" ); ok( HandleToULong(tmp) == 0xdeadbeef, "GetPropW returned %p\n", tmp ); + child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD, + 0, 0, 100, 100, child1, 0, 0, NULL ); + ok( !child && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateWindowExA returned %p %u\n", child, GetLastError() ); + + ret = MoveWindow( child1, 5, 5, 10, 10, FALSE ); + ok( ret, "MoveWindow failed: %u\n", GetLastError() ); + /* destroying child1 ourselves succeeds */ ret = DestroyWindow( child1 ); ok( ret, "DestroyWindow returned %u\n", ret ); @@ -12789,7 +12797,8 @@ static void test_DragDetect(void) static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { unsigned int ret; - HWND parent; + HWND parent, child; + RECT rect, exp; switch (msg) { @@ -12805,6 +12814,25 @@ static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARA parent = SetParent( hwnd, hwndMain ); ok( parent == 0, "SetParent returned %p\n", parent ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed: %u\n", GetLastError() ); + SetRect( &exp, 10, 20, 110, 220 ); + ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ), + wine_dbgstr_rect( &exp )); + + ret = MoveWindow( hwnd, 11, 12, 20, 30, FALSE ); + ok( ret, "MoveWindow failed: %u\n", GetLastError() ); + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed: %u\n", GetLastError() ); + SetRect( &exp, 11, 12, 31, 42 ); + ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ), + wine_dbgstr_rect( &exp )); + + child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD, + 0, 0, 100, 100, hwnd, 0, 0, NULL ); + ok( !child && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateWindowExA returned %p %u\n", child, GetLastError() ); break; } @@ -12816,6 +12844,7 @@ static void test_ncdestroy(void) HWND hwnd; hwnd = create_tool_window( WS_POPUP, 0 ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)ncdestroy_test_proc ); + MoveWindow( hwnd, 10, 20, 100, 200, FALSE ); DestroyWindow(hwnd); } diff --git a/server/window.c b/server/window.c index da05d024056..ec8ee2f1790 100644 --- a/server/window.c +++ b/server/window.c @@ -2025,7 +2025,15 @@ DECL_HANDLER(create_window) atom_t atom; reply->handle = 0; - if (req->parent && !(parent = get_window( req->parent ))) return; + if (req->parent) + { + if (!(parent = get_window( req->parent ))) return; + if (is_orphan_window( parent )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } if (req->owner) {

1 0

Jacek Caban : server: Orphan child windows when unlinking them from parent.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 862d0eeff978c6a2294e0bf9d39febdd3ef98f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862d0eeff978c6a2294e0bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:28 2022 +0100 server: Orphan child windows when unlinking them from parent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d38ce382b86..a5848ac28da 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12786,6 +12786,39 @@ static void test_DragDetect(void) ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); } +static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + unsigned int ret; + HWND parent; + + switch (msg) + { + case WM_NCDESTROY: + SetLastError( 0xdeadbeef ); + ret = SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOSIZE|SWP_NOMOVE ); + todo_wine + ok( !ret, "SetWindowPos succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + parent = SetParent( hwnd, hwndMain ); + ok( parent == 0, "SetParent returned %p\n", parent ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + break; + } + + return DefWindowProcW( hwnd, msg, wp, lp ); +} + +static void test_ncdestroy(void) +{ + HWND hwnd; + hwnd = create_tool_window( WS_POPUP, 0 ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)ncdestroy_test_proc ); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -12900,6 +12933,7 @@ START_TEST(win) test_parent_owner(); test_enum_thread_windows(); test_thread_exit_destroy(); + test_ncdestroy(); test_icons(); test_SetWindowPos(hwndMain, hwndMain2); diff --git a/server/window.c b/server/window.c index 6cc2f9d0f70..da05d024056 100644 --- a/server/window.c +++ b/server/window.c @@ -79,6 +79,7 @@ struct window unsigned int is_unicode : 1; /* ANSI or unicode */ unsigned int is_linked : 1; /* is it linked into the parent z-order list? */ unsigned int is_layered : 1; /* has layered info been set? */ + unsigned int is_orphan : 1; /* is window orphaned */ unsigned int color_key; /* color key for a layered window */ unsigned int alpha; /* alpha value for a layered window */ unsigned int layered_flags; /* flags for a layered window */ @@ -203,7 +204,7 @@ static inline int is_desktop_window( const struct window *win ) /* check if window is orphaned */ static int is_orphan_window( struct window *win ) { - do if (!win->handle) return 1; + do if (win->is_orphan) return 1; while ((win = win->parent)); return 0; } @@ -347,6 +348,7 @@ static int set_parent_window( struct window *win, struct window *parent ) list_remove( &win->entry ); /* unlink it from the previous location */ list_add_head( &win->parent->unlinked, &win->entry ); win->is_linked = 0; + win->is_orphan = 1; } return 1; } @@ -566,6 +568,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->is_unicode = 1; win->is_linked = 0; win->is_layered = 0; + win->is_orphan = 0; win->dpi_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; win->dpi = 0; win->user_data = 0;

1 0

Jacek Caban : server: Don't allow orphaned windows in set_parent request.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 82572350cd1d302bf4402526d6c5152e02c6f4a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82572350cd1d302bf4402526… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:19 2022 +0100 server: Don't allow orphaned windows in set_parent request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 48b9e5e332c..d38ce382b86 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -865,16 +865,13 @@ static void test_thread_exit_destroy(void) SetLastError( 0xdeadbeef ); tmp = SetParent( child1, adopter ); ok( tmp == 0, "SetParent returned %p\n", tmp ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp = SetParent( child3, adopter ); ok( tmp == 0, "SetParent returned %p\n", tmp ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp = GetParent( child1 ); - todo_wine ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() ); ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f860889024..9e483b4c494 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3374,7 +3374,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) { req->handle = wine_server_user_handle( hwnd ); req->parent = wine_server_user_handle( parent ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { old_parent = wine_server_ptr_handle( reply->old_parent ); wndPtr->parent = parent = wine_server_ptr_handle( reply->full_parent ); diff --git a/server/window.c b/server/window.c index 506f0269ee1..6cc2f9d0f70 100644 --- a/server/window.c +++ b/server/window.c @@ -200,6 +200,14 @@ static inline int is_desktop_window( const struct window *win ) return !win->parent; /* only desktop windows have no parent */ } +/* check if window is orphaned */ +static int is_orphan_window( struct window *win ) +{ + do if (!win->handle) return 1; + while ((win = win->parent)); + return 0; +} + /* get next window in Z-order list */ static inline struct window *get_next_window( struct window *win ) { @@ -2066,7 +2074,7 @@ DECL_HANDLER(set_parent) if (!(win = get_window( req->handle ))) return; if (req->parent && !(parent = get_window( req->parent ))) return; - if (is_desktop_window(win)) + if (is_desktop_window(win) || is_orphan_window( win ) || (parent && is_orphan_window( parent ))) { set_error( STATUS_INVALID_PARAMETER ); return;

1 0

Rémi Bernon : user32/tests: Add a test for child window destruction on thread exit.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: ce3abc225f50c0734dfae83d9216fe13148603f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3abc225f50c0734dfae83d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 13:13:11 2022 +0100 user32/tests: Add a test for child window destruction on thread exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce3abc225f50c0734dfa…

1 0

Jacek Caban : server: Don't immediately destroy child windows belonging to different thread in free_window_handle.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 078bcc066ccf4eeee84a4f00e94c802988363093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=078bcc066ccf4eeee84a4f00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:00 2022 +0100 server: Don't immediately destroy child windows belonging to different thread in free_window_handle. Notify their thread instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 14 +++++++++----- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9e65e9f1f66..73f01871d8c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -44,24 +44,6 @@ struct window_surface; -/* internal messages codes */ -enum wine_internal_message -{ - WM_WINE_DESTROYWINDOW = 0x80000000, - WM_WINE_SETWINDOWPOS, - WM_WINE_SHOWWINDOW, - WM_WINE_SETPARENT, - WM_WINE_SETWINDOWLONG, - WM_WINE_SETSTYLE, - WM_WINE_SETACTIVEWINDOW, - WM_WINE_KEYBOARD_LL_HOOK, - WM_WINE_MOUSE_LL_HOOK, - WM_WINE_CLIPCURSOR, - WM_WINE_UPDATEWINDOWSTATE, - WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ - WM_WINE_LAST_DRIVER_MSG = 0x80001fff -}; - extern const struct user_driver_funcs *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 02891cd34ce..4f860889024 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1208,16 +1208,14 @@ static WND *next_thread_window( HWND *hwnd ) void destroy_thread_windows(void) { WND *wndPtr; - HWND hwnd = 0, *list; + HWND hwnd = 0; HMENU menu, sys_menu; struct window_surface *surface; - int i; while ((wndPtr = next_thread_window( &hwnd ))) { /* destroy the client-side storage */ - list = WIN_ListChildren( hwnd ); menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; sys_menu = wndPtr->hSysMenu; free_dce( wndPtr->dce, hwnd ); @@ -1232,14 +1230,6 @@ void destroy_thread_windows(void) register_window_surface( surface, NULL ); window_surface_release( surface ); } - - /* free child windows */ - - if (!list) continue; - for (i = 0; list[i]; i++) - if (!WIN_IsCurrentThread( list[i] )) - SendNotifyMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); - HeapFree( GetProcessHeap(), 0, list ); } } diff --git a/include/ntuser.h b/include/ntuser.h index a9dd8d2e3fd..4b665e6a364 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -102,6 +102,25 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +/* internal messages codes */ +enum wine_internal_message +{ + WM_WINE_DESTROYWINDOW = 0x80000000, + WM_WINE_SETWINDOWPOS, + WM_WINE_SHOWWINDOW, + WM_WINE_SETPARENT, + WM_WINE_SETWINDOWLONG, + WM_WINE_SETSTYLE, + WM_WINE_SETACTIVEWINDOW, + WM_WINE_KEYBOARD_LL_HOOK, + WM_WINE_MOUSE_LL_HOOK, + WM_WINE_CLIPCURSOR, + WM_WINE_UPDATEWINDOWSTATE, + WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ + WM_WINE_LAST_DRIVER_MSG = 0x80001fff +}; + + HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); diff --git a/server/window.c b/server/window.c index 9fd67656eea..506f0269ee1 100644 --- a/server/window.c +++ b/server/window.c @@ -27,9 +27,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winternl.h" +#include "ntuser.h" #include "object.h" #include "request.h" @@ -1965,12 +1963,18 @@ void free_window_handle( struct window *win ) LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) { if (!child->handle) continue; - free_window_handle( child ); + if (!win->thread || !child->thread || win->thread == child->thread) + free_window_handle( child ); + else + send_notify_message( child->handle, WM_WINE_DESTROYWINDOW, 0, 0 ); } LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) { if (!child->handle) continue; - free_window_handle( child ); + if (!win->thread || !child->thread || win->thread == child->thread) + free_window_handle( child ); + else + send_notify_message( child->handle, WM_WINE_DESTROYWINDOW, 0, 0 ); } /* reset global window pointers, if the corresponding window is destroyed */

1 0

Jacek Caban : server: Keep a reference to parent in window objects.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: d52e454c12305857bf750ac9988e7e0752ced79e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52e454c12305857bf750ac9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:50 2022 +0100 server: Keep a reference to parent in window objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/server/window.c b/server/window.c index 4373297b152..9fd67656eea 100644 --- a/server/window.c +++ b/server/window.c @@ -170,6 +170,12 @@ static void window_destroy( struct object *obj ) assert( !win->handle ); + if (win->parent) + { + list_remove( &win->entry ); + release_object( win->parent ); + } + if (win->win_region) free_region( win->win_region ); if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); @@ -312,7 +318,8 @@ static int set_parent_window( struct window *win, struct window *parent ) if (parent) { - win->parent = parent; + if (win->parent) release_object( win->parent ); + win->parent = (struct window *)grab_object( parent ); link_window( win, WINPTR_TOP ); if (!is_desktop_window( parent )) @@ -537,7 +544,7 @@ static struct window *create_window( struct window *parent, struct window *owner } if (!(win = alloc_object( &window_ops ))) goto failed; - win->parent = parent; + win->parent = parent ? (struct window *)grab_object( parent ) : NULL; win->owner = owner ? owner->handle : 0; win->thread = current; win->desktop = desktop; @@ -1935,6 +1942,8 @@ static void set_window_region( struct window *win, struct region *region, int re /* destroy a window */ void free_window_handle( struct window *win ) { + struct window *child, *next; + assert( win->handle ); /* hide the window */ @@ -1953,10 +1962,16 @@ void free_window_handle( struct window *win ) } /* destroy all children */ - while (!list_empty(&win->children)) - free_window_handle( LIST_ENTRY( list_head(&win->children), struct window, entry )); - while (!list_empty(&win->unlinked)) - free_window_handle( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); + LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) + { + if (!child->handle) continue; + free_window_handle( child ); + } + LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) + { + if (!child->handle) continue; + free_window_handle( child ); + } /* reset global window pointers, if the corresponding window is destroyed */ if (win == shell_window) shell_window = NULL; @@ -1966,7 +1981,6 @@ void free_window_handle( struct window *win ) free_hotkeys( win->desktop, win->handle ); cleanup_clipboard_window( win->desktop, win->handle ); destroy_properties( win ); - list_remove( &win->entry ); if (is_desktop_window(win)) { struct desktop *desktop = win->desktop; @@ -1981,6 +1995,7 @@ void free_window_handle( struct window *win ) detach_window_thread( win ); + if (win->parent) set_parent_window( win, NULL ); free_user_handle( win->handle ); win->handle = 0; release_object( win );

1 0

Jacek Caban : server: Make window struct a server object.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5b56bad50b85acb05244894990053f8b0de2e458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b56bad50b85acb052448949… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:43 2022 +0100 server: Make window struct a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/user.h | 2 +- server/window.c | 94 ++++++++++++++++++++++++++++++++++++++++------------- server/winstation.c | 4 +-- 3 files changed, 75 insertions(+), 25 deletions(-) diff --git a/server/user.h b/server/user.h index 80f7e91f12c..55a0d35feff 100644 --- a/server/user.h +++ b/server/user.h @@ -154,7 +154,7 @@ extern struct process *get_top_window_owner( struct desktop *desktop ); extern void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ); extern void post_desktop_message( struct desktop *desktop, unsigned int message, lparam_t wparam, lparam_t lparam ); -extern void destroy_window( struct window *win ); +extern void free_window_handle( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); extern int is_valid_foreground_window( user_handle_t window ); diff --git a/server/window.c b/server/window.c index 8fc4022a3ee..4373297b152 100644 --- a/server/window.c +++ b/server/window.c @@ -56,6 +56,7 @@ enum property_type struct window { + struct object obj; /* object header */ struct window *parent; /* parent window */ user_handle_t owner; /* owner of this window */ struct list children; /* list of children in Z-order */ @@ -96,6 +97,33 @@ struct window char *extra_bytes; /* extra bytes storage */ }; +static void window_dump( struct object *obj, int verbose ); +static void window_destroy( struct object *obj ); + +static const struct object_ops window_ops = +{ + sizeof(struct window), /* size */ + &no_type, /* type */ + window_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + window_destroy /* destroy */ +}; + /* flags that can be set by the client */ #define PAINT_HAS_SURFACE SET_WINPOS_PAINT_SURFACE #define PAINT_HAS_PIXEL_FORMAT SET_WINPOS_PIXEL_FORMAT @@ -129,6 +157,31 @@ static struct window *taskman_window; #define WINPTR_TOPMOST ((struct window *)3L) #define WINPTR_NOTOPMOST ((struct window *)4L) +static void window_dump( struct object *obj, int verbose ) +{ + struct window *win = (struct window *)obj; + assert( obj->ops == &window_ops ); + fprintf( stderr, "window %p handle %x\n", win, win->handle ); +} + +static void window_destroy( struct object *obj ) +{ + struct window *win = (struct window *)obj; + + assert( !win->handle ); + + if (win->win_region) free_region( win->win_region ); + if (win->update_region) free_region( win->update_region ); + if (win->class) release_class( win->class ); + free( win->text ); + + if (win->nb_extra_bytes) + { + memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); + free( win->extra_bytes ); + } +} + /* retrieve a pointer to a window from its handle */ static inline struct window *get_window( user_handle_t handle ) { @@ -483,9 +536,7 @@ static struct window *create_window( struct window *parent, struct window *owner goto failed; } - if (!(win = mem_alloc( sizeof(*win) ))) goto failed; - if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; - + if (!(win = alloc_object( &window_ops ))) goto failed; win->parent = parent; win->owner = owner ? owner->handle : 0; win->thread = current; @@ -523,6 +574,7 @@ static struct window *create_window( struct window *parent, struct window *owner memset( win->extra_bytes, 0, extra_bytes ); win->nb_extra_bytes = extra_bytes; } + if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ @@ -559,9 +611,12 @@ static struct window *create_window( struct window *parent, struct window *owner failed: if (win) { - if (win->handle) free_user_handle( win->handle ); - free( win->extra_bytes ); - free( win ); + if (win->handle) + { + free_user_handle( win->handle ); + win->handle = 0; + } + release_object( win ); } release_object( desktop ); release_class( class ); @@ -578,7 +633,7 @@ void destroy_thread_windows( struct thread *thread ) { if (win->thread != thread) continue; if (is_desktop_window( win )) detach_window_thread( win ); - else destroy_window( win ); + else free_window_handle( win ); } } @@ -1878,8 +1933,10 @@ static void set_window_region( struct window *win, struct region *region, int re /* destroy a window */ -void destroy_window( struct window *win ) +void free_window_handle( struct window *win ) { + assert( win->handle ); + /* hide the window */ if (is_visible(win)) { @@ -1897,9 +1954,9 @@ void destroy_window( struct window *win ) /* destroy all children */ while (!list_empty(&win->children)) - destroy_window( LIST_ENTRY( list_head(&win->children), struct window, entry )); + free_window_handle( LIST_ENTRY( list_head(&win->children), struct window, entry )); while (!list_empty(&win->unlinked)) - destroy_window( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); + free_window_handle( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); /* reset global window pointers, if the corresponding window is destroyed */ if (win == shell_window) shell_window = NULL; @@ -1908,7 +1965,6 @@ void destroy_window( struct window *win ) if (win == taskman_window) taskman_window = NULL; free_hotkeys( win->desktop, win->handle ); cleanup_clipboard_window( win->desktop, win->handle ); - free_user_handle( win->handle ); destroy_properties( win ); list_remove( &win->entry ); if (is_desktop_window(win)) @@ -1924,16 +1980,10 @@ void destroy_window( struct window *win ) } detach_window_thread( win ); - if (win->win_region) free_region( win->win_region ); - if (win->update_region) free_region( win->update_region ); - if (win->class) release_class( win->class ); - free( win->text ); - if (win->nb_extra_bytes) - { - memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); - free( win->extra_bytes ); - } - free( win ); + + free_user_handle( win->handle ); + win->handle = 0; + release_object( win ); } @@ -2016,7 +2066,7 @@ DECL_HANDLER(destroy_window) struct window *win = get_window( req->handle ); if (win) { - if (!is_desktop_window(win)) destroy_window( win ); + if (!is_desktop_window(win)) free_window_handle( win ); else if (win->thread == current) detach_window_thread( win ); else set_error( STATUS_ACCESS_DENIED ); } diff --git a/server/winstation.c b/server/winstation.c index 854affead77..1408e1a9e65 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -287,8 +287,8 @@ static void desktop_destroy( struct object *obj ) struct desktop *desktop = (struct desktop *)obj; free_hotkeys( desktop, 0 ); - if (desktop->top_window) destroy_window( desktop->top_window ); - if (desktop->msg_window) destroy_window( desktop->msg_window ); + if (desktop->top_window) free_window_handle( desktop->top_window ); + if (desktop->msg_window) free_window_handle( desktop->msg_window ); if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry );

1 0

Jacek Caban : server: Allocate extra_bytes separately from window struct.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 88131e476410fc907c0dc2d0c293ae5ca5f7730b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88131e476410fc907c0dc2d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:10 2022 +0100 server: Allocate extra_bytes separately from window struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/server/window.c b/server/window.c index 7ea91d2a7dc..8fc4022a3ee 100644 --- a/server/window.c +++ b/server/window.c @@ -93,7 +93,7 @@ struct window int prop_alloc; /* number of allocated window properties */ struct property *properties; /* window properties array */ int nb_extra_bytes; /* number of extra bytes */ - char extra_bytes[1]; /* extra bytes storage */ + char *extra_bytes; /* extra bytes storage */ }; /* flags that can be set by the client */ @@ -483,7 +483,7 @@ static struct window *create_window( struct window *parent, struct window *owner goto failed; } - if (!(win = mem_alloc( sizeof(*win) + extra_bytes - 1 ))) goto failed; + if (!(win = mem_alloc( sizeof(*win) ))) goto failed; if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; win->parent = parent; @@ -511,12 +511,19 @@ static struct window *create_window( struct window *parent, struct window *owner win->prop_inuse = 0; win->prop_alloc = 0; win->properties = NULL; - win->nb_extra_bytes = extra_bytes; + win->nb_extra_bytes = 0; + win->extra_bytes = NULL; win->window_rect = win->visible_rect = win->surface_rect = win->client_rect = empty_rect; - memset( win->extra_bytes, 0, extra_bytes ); list_init( &win->children ); list_init( &win->unlinked ); + if (extra_bytes) + { + if (!(win->extra_bytes = mem_alloc( extra_bytes ))) goto failed; + memset( win->extra_bytes, 0, extra_bytes ); + win->nb_extra_bytes = extra_bytes; + } + /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent)) @@ -553,6 +560,7 @@ failed: if (win) { if (win->handle) free_user_handle( win->handle ); + free( win->extra_bytes ); free( win ); } release_object( desktop ); @@ -1920,7 +1928,11 @@ void destroy_window( struct window *win ) if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); free( win->text ); - memset( win, 0x55, sizeof(*win) + win->nb_extra_bytes - 1 ); + if (win->nb_extra_bytes) + { + memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); + free( win->extra_bytes ); + } free( win ); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022