May 2016 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Create views hidden initially and add macdrv_set_view_hidden() to change that.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: ca49b8070cb0bdc2dc95ad751085b8d4be1e0f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49b8070cb0bdc2dc95ad751… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:42 2016 -0500 winemac: Create views hidden initially and add macdrv_set_view_hidden() to change that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/opengl.c | 1 + 3 files changed, 26 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0b92f1..29c6de9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -506,6 +506,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) _hasGLDescendant { + if ([self isHidden]) + return NO; if ([self hasGLContext]) return YES; for (WineContentView* view in [self subviews]) @@ -624,6 +626,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } + - (void) setHidden:(BOOL)hidden + { + [super setHidden:hidden]; + [self invalidateHasGLDescendant]; + } + /* * ---------- NSTextInputClient methods ---------- */ @@ -3221,6 +3229,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; [view setAutoresizesSubviews:NO]; + [view setHidden:YES]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification @@ -3355,6 +3364,21 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma } /*********************************************************************** + * macdrv_set_view_hidden + */ +void macdrv_set_view_hidden(macdrv_view v, int hidden) +{ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + WineContentView* view = (WineContentView*)v; + + OnMainThread(^{ + [view setHidden:hidden]; + }); + + [pool release]; +} + +/*********************************************************************** * macdrv_add_view_opengl_context * * Add an OpenGL context to the list being tracked for each view. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 331fca7..d422985 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -515,6 +515,7 @@ extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HID extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; +extern void macdrv_set_view_hidden(macdrv_view v, int hidden) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f6a656f..ed96c7d 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1606,6 +1606,7 @@ static BOOL set_win_format(struct macdrv_win_data *data, int format) WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); return FALSE; } + macdrv_set_view_hidden(data->gl_view, FALSE); TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, wine_dbgstr_rect(&data->gl_rect));

1 0

Ken Thomases : winemac: Change macdrv_create_view() to not add the new view to a window's content view.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: eef99122f7b6e9e7aa488c045269ab377ff9cfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef99122f7b6e9e7aa488c045… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:43 2016 -0500 winemac: Change macdrv_create_view() to not add the new view to a window's content view. Callers can use macdrv_set_view_superview() to do that separately. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 7 ++----- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/opengl.c | 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29c6de9..d97eb1d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3212,14 +3212,13 @@ void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize ma /*********************************************************************** * macdrv_create_view * - * Creates and returns a view in the specified rect of the window. The + * Creates and returns a view with the specified frame rect. The * caller is responsible for calling macdrv_dispose_view() on the view * when it is done with it. */ -macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) +macdrv_view macdrv_create_view(CGRect rect) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - WineWindow* window = (WineWindow*)w; __block WineContentView* view; if (CGRectIsNull(rect)) rect = CGRectZero; @@ -3238,8 +3237,6 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) selector:@selector(updateGLContexts) name:NSApplicationDidChangeScreenParametersNotification object:NSApp]; - [[window contentView] addSubview:view]; - [window updateForGLSubviews]; }); [pool release]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d422985..b3e9106 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -511,7 +511,7 @@ extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSPEC_HIDDEN; extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize max_size) DECLSPEC_HIDDEN; -extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern macdrv_view macdrv_create_view(CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ed96c7d..0e067d4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1600,13 +1600,14 @@ static BOOL set_win_format(struct macdrv_win_data *data, int format) return FALSE; } - data->gl_view = macdrv_create_view(cocoa_window, cgrect_from_rect(data->gl_rect)); + data->gl_view = macdrv_create_view(cgrect_from_rect(data->gl_rect)); if (!data->gl_view) { WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); return FALSE; } macdrv_set_view_hidden(data->gl_view, FALSE); + macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, wine_dbgstr_rect(&data->gl_rect));

1 0

Ken Thomases : winemac: Make show_window() and hide_window() tolerate being called when there's no Cocoa window.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 225482f5ad3055d0d1ea7a68013d5d547d2c6a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225482f5ad3055d0d1ea7a680… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:44 2016 -0500 winemac: Make show_window() and hide_window() tolerate being called when there's no Cocoa window. Minor no-op refactoring that makes subsequent commits cleaner. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 74 +++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a48ac17..bb82927 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -731,40 +731,43 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win */ static void show_window(struct macdrv_win_data *data) { - HWND prev = NULL; - HWND next = NULL; - macdrv_window prev_window = NULL; - macdrv_window next_window = NULL; - BOOL activate = FALSE; - HWND hwndFocus; - - /* find window that this one must be after */ - prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && - (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) - prev = GetWindow(prev, GW_HWNDPREV); - if (!prev_window) - { - /* find window that this one must be before */ - next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && - (next_window = macdrv_get_cocoa_window(next, TRUE)))) - next = GetWindow(next, GW_HWNDNEXT); - } - - TRACE("win %p/%p below %p/%p above %p/%p\n", - data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - - if (!prev_window) - activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); - macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); - data->on_screen = TRUE; - - hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - if (activate) - activate_on_focus_time = 0; + if (data->cocoa_window) + { + HWND prev = NULL; + HWND next = NULL; + macdrv_window prev_window = NULL; + macdrv_window next_window = NULL; + BOOL activate = FALSE; + HWND hwndFocus; + + /* find window that this one must be after */ + prev = GetWindow(data->hwnd, GW_HWNDPREV); + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) + prev = GetWindow(prev, GW_HWNDPREV); + if (!prev_window) + { + /* find window that this one must be before */ + next = GetWindow(data->hwnd, GW_HWNDNEXT); + while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && + (next_window = macdrv_get_cocoa_window(next, TRUE)))) + next = GetWindow(next, GW_HWNDNEXT); + } + + TRACE("win %p/%p below %p/%p above %p/%p\n", + data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); + + if (!prev_window) + activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); + macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); + data->on_screen = TRUE; + + hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + if (activate) + activate_on_focus_time = 0; + } } @@ -775,7 +778,8 @@ static void hide_window(struct macdrv_win_data *data) { TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - macdrv_hide_cocoa_window(data->cocoa_window); + if (data->cocoa_window) + macdrv_hide_cocoa_window(data->cocoa_window); data->on_screen = FALSE; }

1 0

Ken Thomases : winemac: Extract some logic into a new function, sync_window_z_order().
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 321a1511da6b1eb63cd646e1d77a8d69790d3cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321a1511da6b1eb63cd646e1d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:45 2016 -0500 winemac: Extract some logic into a new function, sync_window_z_order(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bb82927..0d6ef53 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -785,6 +785,16 @@ static void hide_window(struct macdrv_win_data *data) /*********************************************************************** + * sync_window_z_order + */ +static void sync_window_z_order(struct macdrv_win_data *data) +{ + if (data->on_screen) + show_window(data); +} + + +/*********************************************************************** * get_region_data * * Calls GetRegionData on the given region and converts the rectangle @@ -878,8 +888,8 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window, wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); - if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) - show_window(data); + if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + sync_window_z_order(data); }

1 0

Ken Thomases : winemac: Mirror the hierarchy of Win32 child windows with Cocoa views.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: d91e568635c7cd23bd56f3ed688a2ba0b7219097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91e568635c7cd23bd56f3ed6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:46 2016 -0500 winemac: Mirror the hierarchy of Win32 child windows with Cocoa views. This only really affects OpenGL child windows. GDI rendering to the window surface is still only blitted to the window's content view. The descendant views don't draw and so are transparent, letting the content view show through. Using Cocoa views for child windows fixes a problem where changes to the position and visibility of child GL windows didn't properly affect the Cocoa GL view. Hiding, showing, and moving the top-level window affected the Cocoa window and thus, indirectly, the GL view. Moving the child GL window itself was propagated to the GL view, so that worked. But hiding, showing, or moving any of the intervening ancestors of the child GL window didn't properly affect the GL view. Neither did hiding or showing the child GL window itself. This also slightly improves the clipping of the GL view by its ancestors, although it still doesn't work quite right due to Cocoa bugs. There are also remaining bugs with z-order among multiple GL views and clipping by overlapping siblings. I hope to eventually fix those using Core Animation layers, for which this is a prerequisite. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv.h | 7 +- dlls/winemac.drv/opengl.c | 159 ++++++---------------------------- dlls/winemac.drv/window.c | 213 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 222 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d91e568635c7cd23bd56f…

1 0

Ken Thomases : winemac: When a child window' s client area is equal to its whole area, use a single Cocoa view for both.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 053b4a81ed56be72d66323f81302c519cec922e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053b4a81ed56be72d66323f81… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:47 2016 -0500 winemac: When a child window's client area is equal to its whole area, use a single Cocoa view for both. This should be a common case and will reduce the number of Cocoa views. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 57 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 59d7763..0d507f4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,14 +746,24 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { + BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + CGRect frame = cgrect_from_rect(data->window_rect); + data->shaped = FALSE; data->whole_rect = data->window_rect; TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); - data->cocoa_view = macdrv_create_view(cgrect_from_rect(data->whole_rect)); + if (!equal) + data->cocoa_view = macdrv_create_view(frame); create_client_cocoa_view(data); + if (equal) + { + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, TRUE); + macdrv_set_view_frame(data->cocoa_view, frame); + } } @@ -768,7 +778,8 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) TRACE("win %p Cocoa view %p\n", data->hwnd, data->cocoa_view); - macdrv_dispose_view(data->cocoa_view); + if (data->cocoa_view != data->client_cocoa_view) + macdrv_dispose_view(data->cocoa_view); data->cocoa_view = NULL; data->on_screen = FALSE; } @@ -1007,7 +1018,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c const RECT *old_whole_rect) { CGRect frame = cgrect_from_rect(data->whole_rect); - RECT rect; + BOOL force_z_order = FALSE; if (data->cocoa_window) { @@ -1020,11 +1031,37 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); } else - macdrv_set_view_frame(data->cocoa_view, frame); + { + BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); + BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_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)); + if (were_equal && !now_equal) + { + data->cocoa_view = macdrv_create_view(frame); + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_superview(data->client_cocoa_view, data->cocoa_view, NULL, NULL, NULL); + macdrv_set_view_hidden(data->client_cocoa_view, FALSE); + force_z_order = TRUE; + } + else if (!were_equal && now_equal) + { + macdrv_dispose_view(data->cocoa_view); + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_frame(data->cocoa_view, frame); + force_z_order = TRUE; + } + else + 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)); + } if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || @@ -1032,11 +1069,11 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c old_window_rect->top - old_whole_rect->top != data->window_rect.top - data->whole_rect.top)) sync_window_region(data, (HRGN)1); - TRACE("win %p/%p whole_rect %s frame %s client %s\n", data->hwnd, + TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window ? (void*)data->cocoa_window : (void*)data->cocoa_view, - wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame), wine_dbgstr_rect(&rect)); + wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); - if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + if (force_z_order || !(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) sync_window_z_order(data); }

1 0

Andrey Gusev : d3d9/tests: Fix a typo in skip() message.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 0a9f22facc3ebe8b1fb91979893ac95c87e08cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9f22facc3ebe8b1fb919798… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:07:56 2016 +0300 d3d9/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c337c6c..a308311 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11751,7 +11751,7 @@ static void stream_test(void) hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); if(!shader) { - skip("Failed to create a vetex shader\n"); + skip("Failed to create a vertex shader.\n"); goto out; }

1 0

Andrey Gusev : wined3d: Fix a typo in FIXME() messages.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 05132fa73561282589b56f123aae994cdd0a177d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05132fa73561282589b56f123… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:09:43 2016 +0300 wined3d: Fix a typo in FIXME() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e3ec9..70a4b03 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3875,7 +3875,7 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t D3DTEXTUREFILTERTYPE_TO_STR(WINED3D_TEXF_GAUSSIAN_QUAD); #undef D3DTEXTUREFILTERTYPE_TO_STR default: - FIXME("Unrecognied texture filter type 0x%08x.\n", filter_type); + FIXME("Unrecognized texture filter type 0x%08x.\n", filter_type); return "unrecognized"; } } @@ -4113,7 +4113,7 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR default: - FIXME("Unrecognied FBO status 0x%08x\n", status); + FIXME("Unrecognized FBO status 0x%08x.\n", status); return "unrecognized"; } } @@ -4131,7 +4131,7 @@ const char *debug_glerror(GLenum error) { GLERROR_TO_STR(GL_INVALID_FRAMEBUFFER_OPERATION); #undef GLERROR_TO_STR default: - FIXME("Unrecognied GL error 0x%08x\n", error); + FIXME("Unrecognized GL error 0x%08x.\n", error); return "unrecognized"; } }

1 0

Andrew Eikum : winegstreamer: Add YUV to ARGB32 transformation filter.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 008e4d3e86073c77c173fdaa339cbb6fa06cfd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008e4d3e86073c77c173fdaa3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:00 2016 -0500 winegstreamer: Add YUV to ARGB32 transformation filter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 3 +- dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/gsttffilter.c | 116 +++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/main.c | 35 +++++++++--- 4 files changed, 141 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 6b45bc4..b445dc5 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -23,4 +23,5 @@ DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32 DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); -DEFINE_GUID(CLSID_Gstreamer_YUV, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2RGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2ARGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x02); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 4b29f21..a1f201c 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,8 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); DWORD Gstreamer_init(void); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 2209c5e..52aa267 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -677,7 +677,7 @@ static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECT return S_OK; } -static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -748,13 +748,13 @@ static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { +static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { Gstreamer_transform_DecideBufferSize, Gstreamer_transform_ProcessBegin, Gstreamer_transform_ProcessData, Gstreamer_transform_ProcessEnd, Gstreamer_YUV_QueryConnect, - Gstreamer_YUV_SetMediaType, + Gstreamer_YUV2RGB_SetMediaType, Gstreamer_YUV_ConnectInput, Gstreamer_transform_Cleanup, Gstreamer_transform_EndOfStream, @@ -764,7 +764,7 @@ static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { Gstreamer_transform_QOS }; -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) { IUnknown *obj = NULL; @@ -776,7 +776,113 @@ IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) return NULL; } - *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV, "videoconvert", &Gstreamer_YUV_vtbl, (LPVOID*)&obj); + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2RGB, "videoconvert", &Gstreamer_YUV2RGB_vtbl, (LPVOID*)&obj); + + TRACE("returning %p\n", obj); + + return obj; +} + +static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +{ + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + HRESULT hr; + int avgtime; + LONG width, height; + + TRACE("%p 0x%x %p\n", This, dir, amt); + + mark_wine_thread(); + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + CopyMediaType(outpmt, amt); + + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } else { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } + if (!avgtime) + avgtime = 10000000 / 30; + + outpmt->subtype = MEDIASUBTYPE_ARGB32; + + capsin = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, + gst_video_format_to_string( + gst_video_format_from_fourcc(amt->subtype.Data1)), + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + capsout = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, "BGRA", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = width * height * 4; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_YUV_QueryConnect, + Gstreamer_YUV2ARGB_SetMediaType, + Gstreamer_YUV_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS +}; + +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) +{ + IUnknown *obj = NULL; + + TRACE("%p %p\n", punkouter, phr); + + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2ARGB, "videoconvert", &Gstreamer_YUV2ARGB_vtbl, (LPVOID*)&obj); TRACE("returning %p\n", obj); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 7b9cd31..2bb69f4 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -43,8 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wGstreamer_YUV[] = -{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2RGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','R','G','B',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2ARGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','A','R','G','B',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_AudioConvert[] = @@ -115,9 +117,17 @@ static const AMOVIESETUP_PIN amfYUVPin[] = }, }; -static const AMOVIESETUP_FILTER amfYUV = -{ &CLSID_Gstreamer_YUV, - wGstreamer_YUV, +static const AMOVIESETUP_FILTER amfYUV2RGB = +{ &CLSID_Gstreamer_YUV2RGB, + wGstreamer_YUV2RGB, + MERIT_UNLIKELY, + 2, + amfYUVPin +}; + +static const AMOVIESETUP_FILTER amfYUV2ARGB = +{ &CLSID_Gstreamer_YUV2ARGB, + wGstreamer_YUV2ARGB, MERIT_UNLIKELY, 2, amfYUVPin @@ -184,11 +194,18 @@ FactoryTemplate const g_Templates[] = { &amfSplitter, }, { - wGstreamer_YUV, - &CLSID_Gstreamer_YUV, - Gstreamer_YUV_create, + wGstreamer_YUV2RGB, + &CLSID_Gstreamer_YUV2RGB, + Gstreamer_YUV2RGB_create, + NULL, + &amfYUV2RGB, + }, + { + wGstreamer_YUV2ARGB, + &CLSID_Gstreamer_YUV2ARGB, + Gstreamer_YUV2ARGB_create, NULL, - &amfYUV, + &amfYUV2ARGB, }, { wGstreamer_Mp3,

1 0

Andrew Eikum : winegstreamer: Flip video output.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 6107b36e561fad97a96249b438aff4a9f3007176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6107b36e561fad97a96249b43… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:04 2016 -0500 winegstreamer: Flip video output. Gstreamer handles video top-down, but Windows's dshow handles it bottom-up. So let's insert a videoflip filter to fix the discrepancy instead of relying on videorenderer to flip it like we did before. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 137 ++++++++++++++++++++++++++++++++------- dlls/winegstreamer/gsttffilter.c | 8 --- 2 files changed, 114 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6107b36e561fad97a9624…

1 0