August 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: When a window becomes ineligible to be a parent, make the relationship latent in its children, too.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: a68d0a24ef4dc08a251efea55c6cac1d7a52d177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68d0a24ef4dc08a251efea55… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:53 2013 -0500 winemac: When a window becomes ineligible to be a parent, make the relationship latent in its children, too. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index fdc33de..1977ca0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -712,11 +712,23 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) becameIneligibleParentOrChild { WineWindow* parent = (WineWindow*)[self parentWindow]; + NSArray* childWindows = [self childWindows]; + if (parent) { self.latentParentWindow = parent; [parent removeChildWindow:self]; } + + if ([childWindows count]) + { + WineWindow* child; + for (child in [[childWindows copy] autorelease]) + { + child.latentParentWindow = self; + [self removeChildWindow:child]; + } + } } // Determine if, among Wine windows, this window is directly above or below

1 0

Henri Verbeet : wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 53f747de1b987f14c52b214c89f9ad8e32de9baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f747de1b987f14c52b214c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:45 2013 +0200 wined3d: Move the WINED3D_MAX_FBO_ENTRIES constant to context.c. --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd1cfd4..e8a5a83 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); +#define WINED3D_MAX_FBO_ENTRIES 64 + static DWORD wined3d_context_tls_idx; /* FBO helper functions */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05a6250..c111e73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1014,8 +1014,6 @@ enum fogsource { FOGSOURCE_COORD, }; -#define WINED3D_MAX_FBO_ENTRIES 64 - struct wined3d_occlusion_query { struct list entry;

1 0

Henri Verbeet : wined3d: Move the buffer flags to buffer.c.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 35a8bf0e1e9966596eb0fbb15cd61c3cd44479bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a8bf0e1e9966596eb0fbb15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:44 2013 +0200 wined3d: Move the buffer flags to buffer.c. --- dlls/wined3d/buffer.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba54e93..921111c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -29,6 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ +#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ +#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ + #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17c0a0a..05a6250 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,14 +2491,6 @@ struct wined3d_map_range UINT size; }; -#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ -#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ -#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ -#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ -#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ - struct wined3d_buffer { struct wined3d_resource resource;

1 0

Ken Thomases : winemac: Clear latent parent on window close to break potential retain cycle.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 029bcf97ddf5e49f89fffd011c0c3a6f0dcf5462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029bcf97ddf5e49f89fffd011… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:51 2013 -0500 winemac: Clear latent parent on window close to break potential retain cycle. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1762c5b..fdc33de 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1392,6 +1392,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return NO; } + - (void) windowWillClose:(NSNotification*)notification + { + self.latentParentWindow = nil; + } + - (void)windowWillMiniaturize:(NSNotification *)notification { if (!ignore_windowMiniaturize)

1 0

Ken Thomases : winemac: Consolidate the code for managing the Cocoa parent/ child window relationship.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 512237ebe6b17f459daa7397f614d2607ccb9f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=512237ebe6b17f459daa7397f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:49 2013 -0500 winemac: Consolidate the code for managing the Cocoa parent/child window relationship. --- dlls/winemac.drv/cocoa_window.m | 75 +++++++++++++++++++++++++++++---------- 1 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 141fc61..1762c5b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -670,6 +670,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) forWindow:self]; } + - (BOOL) addChildWineWindow:(WineWindow*)child assumeVisible:(BOOL)assumeVisible + { + BOOL reordered = FALSE; + + if ([self isVisible] && (assumeVisible || [child isVisible])) + { + if ([self level] > [child level]) + [child setLevel:[self level]]; + [self addChildWindow:child ordered:NSWindowAbove]; + child.latentParentWindow = nil; + reordered = TRUE; + } + else + child.latentParentWindow = self; + + return reordered; + } + + - (BOOL) addChildWineWindow:(WineWindow*)child + { + return [self addChildWineWindow:child assumeVisible:FALSE]; + } + + - (void) removeChildWineWindow:(WineWindow*)child + { + [self removeChildWindow:child]; + if (child.latentParentWindow == self) + child.latentParentWindow = nil; + } + + - (BOOL) becameEligibleParentOrChild + { + // If we aren't visible currently, we assume that we should be and soon + // will be. So, if the latent parent is visible that's enough to assume + // we can establish the parent-child relationship in Cocoa. That will + // actually make us visible, which is fine. + return [latentParentWindow addChildWineWindow:self assumeVisible:TRUE]; + } + + - (void) becameIneligibleParentOrChild + { + WineWindow* parent = (WineWindow*)[self parentWindow]; + if (parent) + { + self.latentParentWindow = parent; + [parent removeChildWindow:self]; + } + } + // Determine if, among Wine windows, this window is directly above or below // a given other Wine window with no other Wine window intervening. // Intervening non-Wine windows are ignored. @@ -786,14 +835,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) NSDisableScreenUpdates(); - if (latentParentWindow) - { - if ([latentParentWindow level] > [self level]) - [self setLevel:[latentParentWindow level]]; - [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; - self.latentParentWindow = nil; + if ([self becameEligibleParentOrChild]) needAdjustWindowLevels = TRUE; - } + if (prev || next) { WineWindow* other = [prev isVisible] ? prev : next; @@ -867,8 +911,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([self isMiniaturized]) pendingMinimize = TRUE; - self.latentParentWindow = [self parentWindow]; - [latentParentWindow removeChildWindow:self]; + + [self becameIneligibleParentOrChild]; [self orderOut:nil]; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; @@ -952,17 +996,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) WineWindow* oldParent = (WineWindow*)[self parentWindow]; if ((oldParent && oldParent != parent) || (!oldParent && latentParentWindow != parent)) { - [[self parentWindow] removeChildWindow:self]; - self.latentParentWindow = nil; - if ([self isVisible] && parent) - { - if ([parent level] > [self level]) - [self setLevel:[parent level]]; - [parent addChildWindow:self ordered:NSWindowAbove]; + [oldParent removeChildWineWindow:self]; + [latentParentWindow removeChildWineWindow:self]; + if ([parent addChildWineWindow:self]) [[WineApplicationController sharedController] adjustWindowLevels]; - } - else - self.latentParentWindow = parent; } }

1 0

Ken Thomases : winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 6873c3ee66dd2d207771d72715d8025a430b31c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6873c3ee66dd2d207771d7271… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:46 2013 -0500 winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent. --- dlls/winemac.drv/cocoa_window.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f68a37c..141fc61 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -949,7 +949,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) setMacDrvParentWindow:(WineWindow*)parent { - if ([self parentWindow] != parent) + WineWindow* oldParent = (WineWindow*)[self parentWindow]; + if ((oldParent && oldParent != parent) || (!oldParent && latentParentWindow != parent)) { [[self parentWindow] removeChildWindow:self]; self.latentParentWindow = nil;

1 0

Ken Thomases : winemac: Remove some duplicated code from -makeKeyAndOrderFront:.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 4b2f4eb60002c129785c6801b51d5c92c32c8fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2f4eb60002c129785c6801b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:44 2013 -0500 winemac: Remove some duplicated code from -makeKeyAndOrderFront:. --- dlls/winemac.drv/cocoa_window.m | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48c5056..f68a37c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1119,26 +1119,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* We don't call this. It's the action method of the items in the Window menu. */ - (void) makeKeyAndOrderFront:(id)sender { - WineApplicationController* controller = [WineApplicationController sharedController]; - WineWindow* front = [controller frontWineWindow]; - BOOL wasVisible = [self isVisible]; - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [controller windowGotFocus:self]; + [[WineApplicationController sharedController] windowGotFocus:self]; - if (front && [self level] < [front level]) - [self setLevel:[front level]]; - [self orderFront:nil]; - if (!wasVisible && fullscreen && [self isOnActiveSpace]) - [controller updateFullscreenWindows]; - [controller adjustWindowLevels]; - - if (pendingMinimize) - { - ignore_windowMiniaturize = TRUE; - [self miniaturize:nil]; - pendingMinimize = FALSE; - } + if ([self isMiniaturized]) + [self deminiaturize:nil]; + [self orderBelow:nil orAbove:nil activate:NO]; } - (void) sendEvent:(NSEvent*)event

1 0

Ken Thomases : winemac: Don' t reorder clicked window relative to sibling owned windows if it' s in the right place.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: d14f787192c66a5d339c60fb1bcdb849c1eefa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14f787192c66a5d339c60fb1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 30 00:00:35 2013 -0500 winemac: Don't reorder clicked window relative to sibling owned windows if it's in the right place. The right place may not be the end of the list of Cocoa child windows if some of the siblings are at a higher window level (i.e. floating if the clicked window is not). --- dlls/winemac.drv/cocoa_app.m | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8de68bb..4cb09e7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1480,8 +1480,28 @@ int macdrv_err_on; // respect to its siblings, but we want it to. We have to do it // manually. NSWindow* parent = [window parentWindow]; - [parent removeChildWindow:window]; - [parent addChildWindow:window ordered:NSWindowAbove]; + NSInteger level = [window level]; + __block BOOL needReorder = FALSE; + + // If the window is already the last child or if it's only below + // children with higher window level, then no need to reorder it. + [[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse + usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ + WineWindow* child = obj; + if (child == window) + *stop = TRUE; + else if ([child level] <= level) + { + needReorder = TRUE; + *stop = TRUE; + } + }]; + + if (needReorder) + { + [parent removeChildWindow:window]; + [parent addChildWindow:window ordered:NSWindowAbove]; + } } }

1 0

Nikolay Sivov : ntdll: Implement compatible comClass section.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: 88070accd22323cfcf0756861ec9fd9a4c57196f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88070accd22323cfcf0756861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 08:03:28 2013 +0400 ntdll: Implement compatible comClass section. --- dlls/kernel32/tests/actctx.c | 9 +- dlls/ntdll/actctx.c | 282 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88070accd22323cfcf075…

1 0

Henri Verbeet : wined3d: Move the DEFAULT_REFRESH_RATE constant to directx. c.
by Alexandre Julliard Aug. 30, 2013

Aug. 30, 2013

Module: wine Branch: master Commit: f7b84fe7550843a49cd273d5760c7318eeb0c44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b84fe7550843a49cd273d57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 30 08:42:46 2013 +0200 wined3d: Move the DEFAULT_REFRESH_RATE constant to directx.c. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e235043..570299b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +#define DEFAULT_REFRESH_RATE 0 /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c111e73..2f8c6b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2572,8 +2572,6 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -#define DEFAULT_REFRESH_RATE 0 - /***************************************************************************** * Utility function prototypes */

1 0