April 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit/tests: Add some more import tests.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2926c2822c7f218ac688033fe78da05427c4cd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2926c2822c7f218ac688033fe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 24 13:48:35 2017 +0000 regedit/tests: Add some more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9ff760a..7584ed4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -294,6 +294,23 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=hex(2):4c,69,6e,65,00\n" + "\"Wine9b\"=\"Value 1\"\n" + "\"Wine9c\"=hex(2):4c,69,6e,65\\\n" + "\"Wine9d\"=\"Value 2\"\n" + "\"Wine9e\"=hex(2):4c,69,6e,65,\\\n" + "\"Wine9f\"=\"Value 3\"\n" + "\"Wine9g\"=\"Value 4\"\n\n"); + verify_reg(hkey, "Wine9a", REG_EXPAND_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine9b", REG_SZ, "Value 1", 8, 0); + verify_reg_nonexist(hkey, "Wine9c"); + todo_wine verify_reg(hkey, "Wine9d", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine9e"); + verify_reg_nonexist(hkey, "Wine9f"); + verify_reg(hkey, "Wine9g", REG_SZ, "Value 4", 8, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n"); verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); @@ -839,6 +856,16 @@ static void test_import_with_whitespace(void) verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@ = \"Test Value\"\n\n"); + todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t@\t=\tdword:\t00000008\t\n\n"); + todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Nikolay Sivov : dmusic/tests: Use void* instead of void** type value for outer argument.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: f0fb2f16ca8f84e17f89d82525fd6ae5a28232eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fb2f16ca8f84e17f89d8252… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 21:19:16 2017 +0300 dmusic/tests: Use void* instead of void** type value for outer argument. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/dmband.c | 4 ++-- dlls/dmcompos/tests/dmcompos.c | 8 ++++---- dlls/dmime/tests/dmime.c | 10 +++++----- dlls/dmime/tests/performance.c | 2 +- dlls/dmloader/tests/loader.c | 4 ++-- dlls/dmstyle/tests/dmstyle.c | 6 +++--- dlls/dmsynth/tests/dmsynth.c | 4 ++-- dlls/dmusic/tests/dmusic.c | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0fb2f16ca8f84e17f89d…

1 0

Ken Thomases : winemac: Sync the frame of the Cocoa view for a window' s client area while handling a frame-changed event.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 49964b3bc414f3be66b13b7e606e6d40a2ea3379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49964b3bc414f3be66b13b7e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:07 2017 -0500 winemac: Sync the frame of the Cocoa view for a window's client area while handling a frame-changed event. Fixes a problem where the client area view would not be resized as the user resizes the Cocoa window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 878b4dc..72dc938 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1053,6 +1053,21 @@ RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp) /*********************************************************************** + * sync_client_view_position + */ +static void sync_client_view_position(struct macdrv_win_data *data) +{ + if (data->cocoa_view != data->client_cocoa_view) + { + RECT rect = data->client_rect; + OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); + macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); + } +} + + +/*********************************************************************** * sync_window_position * * Synchronize the Mac window position with the Windows one @@ -1098,13 +1113,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_view_frame(data->cocoa_view, frame); } - if (data->cocoa_view != data->client_cocoa_view) - { - RECT rect = data->client_rect; - OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); - TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); - } + sync_client_view_position(data); if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || @@ -2097,10 +2106,15 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, } /* check if we are currently processing an event relevant to this window */ - if (!thread_data || !thread_data->current_event || - !data->cocoa_window || thread_data->current_event->window != data->cocoa_window || - (thread_data->current_event->type != WINDOW_FRAME_CHANGED && - thread_data->current_event->type != WINDOW_DID_UNMINIMIZE)) + if (thread_data && thread_data->current_event && + data->cocoa_window && thread_data->current_event->window == data->cocoa_window && + (thread_data->current_event->type == WINDOW_FRAME_CHANGED || + thread_data->current_event->type == WINDOW_DID_UNMINIMIZE)) + { + if (thread_data->current_event->type == WINDOW_FRAME_CHANGED) + sync_client_view_position(data); + } + else { sync_window_position(data, swp_flags, &old_window_rect, &old_whole_rect); if (data->cocoa_window)

1 0

Ken Thomases : winemac: Move the window to the front of the z-order in SetFocus if it' s the foreground window and not already in the front.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 04317b5571e05838952711fbba08b62b81528da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04317b5571e05838952711fbb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:08 2017 -0500 winemac: Move the window to the front of the z-order in SetFocus if it's the foreground window and not already in the front. Ideally, user32 would adjust its z-order for window activation as happens on Windows. Then, the Mac driver would just reflect such changes in the Cocoa windows. But user32 doesn't do that. SetActiveWindow() and SetForegroundWindow() just adjust focus and status. This is an attempt to achieve a similar result. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 51 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 72dc938..83c77a9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -852,14 +852,59 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win } +/********************************************************************** + * is_owned_by + */ +static BOOL is_owned_by(HWND hwnd, HWND maybe_owner) +{ + while (1) + { + HWND hwnd2 = GetWindow(hwnd, GW_OWNER); + if (!hwnd2) + hwnd2 = GetAncestor(hwnd, GA_ROOT); + if (!hwnd2 || hwnd2 == hwnd) + break; + if (hwnd2 == maybe_owner) + return TRUE; + hwnd = hwnd2; + } + + return FALSE; +} + + +/********************************************************************** + * is_all_the_way_front + */ +static BOOL is_all_the_way_front(HWND hwnd) +{ + BOOL topmost = (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; + HWND prev = hwnd; + + while ((prev = GetWindow(prev, GW_HWNDPREV))) + { + if (!topmost && (GetWindowLongW(prev, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) + return TRUE; + if (!is_owned_by(prev, hwnd)) + return FALSE; + } + + return TRUE; +} + + /*********************************************************************** * set_focus */ -static void set_focus(HWND hwnd) +static void set_focus(HWND hwnd, BOOL raise) { struct macdrv_win_data *data; if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; + + if (raise && hwnd == GetForegroundWindow() && hwnd != GetDesktopWindow() && !is_all_the_way_front(hwnd)) + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); + if (!(data = get_win_data(hwnd))) return; if (data->cocoa_window && data->on_screen) @@ -912,7 +957,7 @@ static void show_window(struct macdrv_win_data *data) info.cbSize = sizeof(info); if (GetGUIThreadInfo(GetWindowThreadProcessId(data->hwnd, NULL), &info) && info.hwndFocus && (data->hwnd == info.hwndFocus || IsChild(data->hwnd, info.hwndFocus))) - set_focus(info.hwndFocus); + set_focus(info.hwndFocus, FALSE); if (activate) activate_on_focus_time = 0; } @@ -1552,7 +1597,7 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (!thread_data) return; thread_data->dead_key_state = 0; - set_focus(hwnd); + set_focus(hwnd, TRUE); }

1 0

Ken Thomases : winemac: Add a category on NSEvent to simplify checking if the Command key ( and only that modifier) is pressed for an event.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: af2690ab0664a9dfbad69fd6905d3a15dc8a499a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2690ab0664a9dfbad69fd69… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:09 2017 -0500 winemac: Add a category on NSEvent to simplify checking if the Command key (and only that modifier) is pressed for an event. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 2 +- dlls/winemac.drv/cocoa_event.h | 6 ++++++ dlls/winemac.drv/cocoa_event.m | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 6d1473a..f13e496 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1653,7 +1653,7 @@ static NSString* WineLocalizedString(unsigned int stringID) if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && - (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) + ![theEvent wine_commandKeyDown]) { NSWindowButton windowButton; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 4d814a2..72ff8f9 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -28,6 +28,12 @@ enum { }; +(a)interface NSEvent (WineExtensions) + + (BOOL) wine_commandKeyDown; + - (BOOL) wine_commandKeyDown; +(a)end + + @class WineWindow; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 08a706f..40066ff 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -40,6 +40,26 @@ static NSString* const WineHotKeyCarbonRefKey = @"hotKeyRef"; static const OSType WineHotKeySignature = 'Wine'; +(a)implementation NSEvent (WineExtensions) + + static BOOL wine_commandKeyDown(NSUInteger flags) + { + return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask); + } + + + (BOOL) wine_commandKeyDown + { + return wine_commandKeyDown([self modifierFlags]); + } + + - (BOOL) wine_commandKeyDown + { + return wine_commandKeyDown([self modifierFlags]); + } + +(a)end + + @interface MacDrvEvent : NSObject { @public

1 0

Ken Thomases : winemac: Move a window to the front when its Mac title bar is clicked.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 49bb11fef2ddc8c6c70bf28aefad0818eefca576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bb11fef2ddc8c6c70bf28ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:10 2017 -0500 winemac: Move a window to the front when its Mac title bar is clicked. Cocoa does this automatically for non-owned windows and informs the back end via a different mechanism (WINDOW_BROUGHT_FORWARD). However, for owned windows (child windows in Cocoa parlance), Cocoa does not change their z-order relative to the owner (parent) or sibling owned windows when clicked. So, we have to move the window in user32's z-order so that it gets moved appropriately on screen in response. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_window.m | 7 ++++--- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 3 +++ dlls/winemac.drv/window.c | 14 +++++++++++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f13e496..0caca9e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2023,6 +2023,8 @@ static NSString* WineLocalizedString(unsigned int stringID) [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); + if (eventType == WINDOW_DRAG_BEGIN) + event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; [window.queue postEvent:event]; macdrv_release_event(event); } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c67dd07..6257169 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2236,9 +2236,10 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (draggingPhase == 2) { - macdrv_event* event = macdrv_create_event(WINDOW_DRAG_BEGIN, self); - [queue postEvent:event]; - macdrv_release_event(event); + macdrv_event* mevent = macdrv_create_event(WINDOW_DRAG_BEGIN, self); + mevent->window_drag_begin.no_activate = [event wine_commandKeyDown]; + [queue postEvent:mevent]; + macdrv_release_event(mevent); draggingPhase = 3; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 26d2b64..7ec59c0 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -279,7 +279,7 @@ void macdrv_handle_event(const macdrv_event *event) macdrv_window_did_unminimize(hwnd); break; case WINDOW_DRAG_BEGIN: - macdrv_window_drag_begin(hwnd); + macdrv_window_drag_begin(hwnd, event); break; case WINDOW_DRAG_END: macdrv_window_drag_end(hwnd); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bffd555..53dcd87 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -174,7 +174,7 @@ extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; -extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_reassert_window_position(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e016b3e..3ffeb01 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -376,6 +376,9 @@ typedef struct macdrv_event { macdrv_status_item item; } status_item_mouse_move; struct { + int no_activate; + } window_drag_begin; + struct { CGRect frame; int fullscreen; int in_resize; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 83c77a9..e2de40d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2482,7 +2482,7 @@ void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) * * Handler for WINDOW_DRAG_BEGIN events. */ -void macdrv_window_drag_begin(HWND hwnd) +void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) { DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; @@ -2499,6 +2499,18 @@ void macdrv_window_drag_begin(HWND hwnd) data->being_dragged = TRUE; release_win_data(data); + if (!event->window_drag_begin.no_activate && can_activate_window(hwnd) && GetForegroundWindow() != hwnd) + { + /* ask whether the window wants to be activated */ + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELONG(HTCAPTION, WM_LBUTTONDOWN)); + if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) + { + TRACE("setting foreground window to %p\n", hwnd); + SetForegroundWindow(hwnd); + } + } + ClipCursor(NULL); SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); ReleaseCapture();

1 0

Ken Thomases : winemac: When realizing latent child windows, maintain their relative z-order.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: e30b1aef1b9a99ae25fbfa2e1b12b04f86e800a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30b1aef1b9a99ae25fbfa2e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:11 2017 -0500 winemac: When realizing latent child windows, maintain their relative z-order. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 105 ++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6257169..ea13b4a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1247,6 +1247,60 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [latentChildWindows removeObjectIdenticalTo:child]; } + - (void) setChildWineWindows:(NSArray*)childWindows + { + NSArray* origChildren; + NSUInteger count, start, limit, i; + + origChildren = self.childWineWindows; + + // If the current and desired children arrays match up to a point, leave + // those matching children alone. + count = childWindows.count; + limit = MIN(origChildren.count, count); + for (start = 0; start < limit; start++) + { + if ([origChildren objectAtIndex:start] != [childWindows objectAtIndex:start]) + break; + } + + // Remove all of the child windows and re-add them back-to-front so they + // are in the desired order. + for (i = start; i < count; i++) + { + WineWindow* child = [childWindows objectAtIndex:i]; + [self removeChildWindow:child]; + } + for (i = start; i < count; i++) + { + WineWindow* child = [childWindows objectAtIndex:i]; + [self addChildWindow:child ordered:NSWindowAbove]; + } + } + + static NSComparisonResult compare_windows_back_to_front(NSWindow* window1, NSWindow* window2, NSArray* windowNumbers) + { + NSNumber* window1Number = [NSNumber numberWithInteger:[window1 windowNumber]]; + NSNumber* window2Number = [NSNumber numberWithInteger:[window2 windowNumber]]; + NSUInteger index1 = [windowNumbers indexOfObject:window1Number]; + NSUInteger index2 = [windowNumbers indexOfObject:window2Number]; + if (index1 == NSNotFound) + { + if (index2 == NSNotFound) + return NSOrderedSame; + else + return NSOrderedAscending; + } + else if (index2 == NSNotFound) + return NSOrderedDescending; + else if (index1 < index2) + return NSOrderedDescending; + else if (index2 < index1) + return NSOrderedAscending; + + return NSOrderedSame; + } + - (BOOL) becameEligibleParentOrChild { BOOL reordered = FALSE; @@ -1267,9 +1321,13 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi // again after actually making us visible. if ([self isVisible] && (count = [latentChildWindows count])) { + NSMutableArray* windowNumbers; + NSMutableArray* childWindows = [[self.childWineWindows mutableCopy] autorelease]; NSMutableIndexSet* indexesToRemove = [NSMutableIndexSet indexSet]; NSUInteger i; + windowNumbers = [[[[self class] windowNumbersWithOptions:NSWindowNumberListAllSpaces] mutableCopy] autorelease]; + for (i = 0; i < count; i++) { WineWindow* child = [latentChildWindows objectAtIndex:i]; @@ -1279,7 +1337,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if ([self level] > [child level]) [child setLevel:[self level]]; - [self addChildWindow:child ordered:NSWindowAbove]; + [childWindows addObject:child]; child.latentParentWindow = nil; reordered = TRUE; } @@ -1290,6 +1348,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } [latentChildWindows removeObjectsAtIndexes:indexesToRemove]; + + [childWindows sortWithOptions:NSSortStable + usingComparator:^NSComparisonResult(id obj1, id obj2){ + return compare_windows_back_to_front(obj1, obj2, windowNumbers); + }]; + [self setChildWineWindows:childWindows]; } return reordered; @@ -1384,7 +1448,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* windowNumbers; NSNumber* childWindowNumber; - NSUInteger otherIndex, limit; + NSUInteger otherIndex; NSArray* origChildren; NSMutableArray* children; @@ -1402,43 +1466,10 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi children = [[origChildren mutableCopy] autorelease]; [children sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2){ - NSNumber* window1Number = [NSNumber numberWithInteger:[obj1 windowNumber]]; - NSNumber* window2Number = [NSNumber numberWithInteger:[obj2 windowNumber]]; - NSUInteger index1 = [windowNumbers indexOfObject:window1Number]; - NSUInteger index2 = [windowNumbers indexOfObject:window2Number]; - if (index1 == NSNotFound) - { - if (index2 == NSNotFound) - return NSOrderedSame; - else - return NSOrderedAscending; - } - else if (index2 == NSNotFound) - return NSOrderedDescending; - else if (index1 < index2) - return NSOrderedDescending; - else if (index2 < index1) - return NSOrderedAscending; - - return NSOrderedSame; + return compare_windows_back_to_front(obj1, obj2, windowNumbers); }]; - // If the current and desired children arrays match up to a point, leave - // those matching children alone. - limit = MIN([origChildren count], [children count]); - for (otherIndex = 0; otherIndex < limit; otherIndex++) - { - if ([origChildren objectAtIndex:otherIndex] != [children objectAtIndex:otherIndex]) - break; - } - [children removeObjectsInRange:NSMakeRange(0, otherIndex)]; - - // Remove all of the child windows and re-add them back-to-front so they - // are in the desired order. - for (other in children) - [self removeChildWindow:other]; - for (other in children) - [self addChildWindow:other ordered:NSWindowAbove]; + [self setChildWineWindows:children]; } /* Returns whether or not the window was ordered in, which depends on if

1 0

Ken Thomases : winemac: Better handle z-ordering windows that are in Cocoa parent-child window relationships.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 302593c9c0a5f996bf6e6a98779e1ae2cea66cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302593c9c0a5f996bf6e6a987… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:12 2017 -0500 winemac: Better handle z-ordering windows that are in Cocoa parent-child window relationships. The code had been handling ordering sibling windows relative to each other, including windows neither of which were child windows. However, it wasn't properly handling other relationships (e.g. cousins, nieces, uncles, etc.). The reason this is complicated is that Cocoa keeps child windows in a fixed relative order to their parent and siblings. The normal -orderWindow:relativeTo: method doesn't work. One has to remove the children from the parent and re-add them in the desired order. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 118 +++++++++++++++++++++++++++++++++------- 1 file changed, 98 insertions(+), 20 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ea13b4a..0823aee 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1457,8 +1457,15 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi windowNumbers = [[[[self class] windowNumbersWithOptions:NSWindowNumberListAllSpaces] mutableCopy] autorelease]; childWindowNumber = [NSNumber numberWithInteger:[child windowNumber]]; [windowNumbers removeObject:childWindowNumber]; - otherIndex = [windowNumbers indexOfObject:[NSNumber numberWithInteger:[other windowNumber]]]; - [windowNumbers insertObject:childWindowNumber atIndex:otherIndex + (mode == NSWindowAbove ? 0 : 1)]; + if (other) + { + otherIndex = [windowNumbers indexOfObject:[NSNumber numberWithInteger:[other windowNumber]]]; + [windowNumbers insertObject:childWindowNumber atIndex:otherIndex + (mode == NSWindowAbove ? 0 : 1)]; + } + else if (mode == NSWindowAbove) + [windowNumbers insertObject:childWindowNumber atIndex:0]; + else + [windowNumbers addObject:childWindowNumber]; // Get our child windows and sort them in the reverse of the desired // z-order (back-to-front). @@ -1472,6 +1479,52 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setChildWineWindows:children]; } + // Search the ancestor windows of self and other to find a place where some ancestors are siblings of each other. + // There are three possible results in terms of the values of *ancestor and *ancestorOfOther on return: + // (non-nil, non-nil) there is a level in the window tree where the two windows have sibling ancestors + // if *ancestor has a parent Wine window, then it's the parent of the other ancestor, too + // otherwise, the two ancestors are each roots of disjoint window trees + // (nil, non-nil) the other window is a descendent of self and *ancestorOfOther is the direct child + // (non-nil, nil) self is a descendent of other and *ancestor is the direct child + - (void) getSiblingWindowsForWindow:(WineWindow*)other ancestor:(WineWindow**)ancestor ancestorOfOther:(WineWindow**)ancestorOfOther + { + NSMutableArray* otherAncestors = [NSMutableArray arrayWithObject:other]; + WineWindow* child; + WineWindow* parent; + for (child = other; + (parent = (WineWindow*)child.parentWindow) && [parent isKindOfClass:[WineWindow class]]; + child = parent) + { + if (parent == self) + { + *ancestor = nil; + *ancestorOfOther = child; + return; + } + + [otherAncestors addObject:parent]; + } + + for (child = self; + (parent = (WineWindow*)child.parentWindow) && [parent isKindOfClass:[WineWindow class]]; + child = parent) + { + NSUInteger index = [otherAncestors indexOfObjectIdenticalTo:parent]; + if (index != NSNotFound) + { + *ancestor = child; + if (index == 0) + *ancestorOfOther = nil; + else + *ancestorOfOther = [otherAncestors objectAtIndex:index - 1]; + return; + } + } + + *ancestor = child; + *ancestorOfOther = otherAncestors.lastObject;; + } + /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate @@ -1481,6 +1534,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { BOOL needAdjustWindowLevels = FALSE; BOOL wasVisible; + WineWindow* parent; + WineWindow* child; [controller transformProcessToForeground]; if ([NSApp isHidden]) @@ -1502,30 +1557,53 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (![self isOrdered:orderingMode relativeTo:other]) { - WineWindow* parent = (WineWindow*)[self parentWindow]; - WineWindow* otherParent = (WineWindow*)[other parentWindow]; - - // This window level may not be right for this window based - // on floating-ness, fullscreen-ness, etc. But we set it - // temporarily to allow us to order the windows properly. - // Then the levels get fixed by -adjustWindowLevels. - if ([self level] != [other level]) - [self setLevel:[other level]]; - [self setAutodisplay:YES]; - [self orderWindow:orderingMode relativeTo:[other windowNumber]]; - [self checkWineDisplayLink]; + WineWindow* ancestor; + WineWindow* ancestorOfOther; + + [self getSiblingWindowsForWindow:other ancestor:&ancestor ancestorOfOther:&ancestorOfOther]; + if (ancestor) + { + [self setAutodisplay:YES]; + if (ancestorOfOther) + { + // This window level may not be right for this window based + // on floating-ness, fullscreen-ness, etc. But we set it + // temporarily to allow us to order the windows properly. + // Then the levels get fixed by -adjustWindowLevels. + if ([ancestor level] != [ancestorOfOther level]) + [ancestor setLevel:[ancestorOfOther level]]; + + parent = (WineWindow*)ancestor.parentWindow; + if ([parent isKindOfClass:[WineWindow class]]) + [parent order:orderingMode childWindow:ancestor relativeTo:ancestorOfOther]; + else + [ancestor orderWindow:orderingMode relativeTo:[ancestorOfOther windowNumber]]; + } - // The above call to -[NSWindow orderWindow:relativeTo:] won't - // reorder windows which are both children of the same parent - // relative to each other, so do that separately. - if (parent && parent == otherParent) - [parent order:orderingMode childWindow:self relativeTo:other]; + for (child = self; + (parent = (WineWindow*)child.parentWindow); + child = parent) + { + if ([parent isKindOfClass:[WineWindow class]]) + [parent order:-orderingMode childWindow:child relativeTo:nil]; + if (parent == ancestor) + break; + } - needAdjustWindowLevels = TRUE; + [self checkWineDisplayLink]; + needAdjustWindowLevels = TRUE; + } } } else { + for (child = self; + (parent = (WineWindow*)child.parentWindow) && [parent isKindOfClass:[WineWindow class]]; + child = parent) + { + [parent order:NSWindowAbove childWindow:child relativeTo:nil]; + } + // Again, temporarily set level to make sure we can order to // the right place. next = [controller frontWineWindow];

1 0

Ken Thomases : winemac: Defer ordering a window out if it' s in the process of entering or exiting Cocoa full-screen mode.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 5ebb83ad4eba70e034ef8ee03fdddbe72b10a648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebb83ad4eba70e034ef8ee03… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:13 2017 -0500 winemac: Defer ordering a window out if it's in the process of entering or exiting Cocoa full-screen mode. Cocoa doesn't handle the window being ordered out or closed during the animation well and leaves a ghost window around. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index b4cc018..f9c3902 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -33,6 +33,7 @@ BOOL maximized; BOOL fullscreen; BOOL pendingMinimize; + BOOL pendingOrderOut; BOOL savedVisibleState; BOOL drawnSinceShown; WineWindow* latentParentWindow; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0823aee..7fa432a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1614,6 +1614,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self checkWineDisplayLink]; needAdjustWindowLevels = TRUE; } + pendingOrderOut = FALSE; if ([self becameEligibleParentOrChild]) needAdjustWindowLevels = TRUE; @@ -1649,6 +1650,21 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible = [self isVisible]; BOOL wasOnActiveSpace = [self isOnActiveSpace]; + if (enteringFullScreen || exitingFullScreen) + { + pendingOrderOut = TRUE; + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) | + event_mask_for_type(WINDOW_GOT_FOCUS) | + event_mask_for_type(WINDOW_LOST_FOCUS) | + event_mask_for_type(WINDOW_MAXIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_MINIMIZE_REQUESTED) | + event_mask_for_type(WINDOW_RESTORE_REQUESTED) + forWindow:self]; + return; + } + + pendingOrderOut = FALSE; + if ([self isMiniaturized]) pendingMinimize = TRUE; @@ -2707,6 +2723,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { enteringFullScreen = FALSE; enteredFullScreenTime = [[NSProcessInfo processInfo] systemUptime]; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidExitFullScreen:(NSNotification*)notification @@ -2714,18 +2732,24 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi exitingFullScreen = FALSE; [self setFrameAndWineFrame:nonFullscreenFrame]; [self windowDidResize:nil]; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidFailToEnterFullScreen:(NSWindow*)window { enteringFullScreen = FALSE; enteredFullScreenTime = 0; + if (pendingOrderOut) + [self doOrderOut]; } - (void) windowDidFailToExitFullScreen:(NSWindow*)window { exitingFullScreen = FALSE; [self windowDidResize:nil]; + if (pendingOrderOut) + [self doOrderOut]; } - (void)windowDidMiniaturize:(NSNotification *)notification

1 0

Ken Thomases : winemac: Use the -close method rather than -orderOut: for full-screen windows.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: ff3766c7594128f981daf441990302e54f4a26db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3766c7594128f981daf4419… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:14 2017 -0500 winemac: Use the -close method rather than -orderOut: for full-screen windows. Simply ordering them out leaves the user on the full-screen space, which is now an empty black screen. Closing the window closes the space, too. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7fa432a..9ca40f9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1673,7 +1673,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [parent grabDockIconSnapshotFromWindow:self force:NO]; [self becameIneligibleParentOrChild]; - if ([self isMiniaturized]) + if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask) { fakingClose = TRUE; [self close];

1 0