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

Nikolay Sivov : dmusic/tests: Use void* instead of void** type value for outer argument.
by Alexandre Julliard April 24, 2017

April 24, 2017

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

Sebastian Lackner : configure: Support for recent versions of OSMesa.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: f625707ffc38c58cc296c8a27ac6c2b3e1c38249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f625707ffc38c58cc296c8a27… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 24 01:20:15 2017 +0200 configure: Support for recent versions of OSMesa. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- dlls/gdi32/dibdrv/opengl.c | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 19d43e1..81df494 100755 --- a/configure +++ b/configure @@ -10866,11 +10866,11 @@ LIBS="-lOSMesa $X_LIBS -lm $X_EXTRA_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char glAccum (); +char OSMesaGetProcAddress (); int main () { -return glAccum (); +return OSMesaGetProcAddress (); ; return 0; } diff --git a/configure.ac b/configure.ac index 1a5b0de..f5b587c 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,7 +1149,7 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c if test "x$with_osmesa" != "xno" then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(OSMesa,OSMesaGetProcAddress,,,[$X_LIBS -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) fi diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 4133116..77d6320 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -113,14 +113,6 @@ static BOOL init_opengl(void) return FALSE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) - { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], buffer, sizeof(buffer) ))) - { - ERR( "%s not found in %s (%s), disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA, buffer ); - goto failed; - } - } #define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ @@ -134,6 +126,15 @@ static BOOL init_opengl(void) LOAD_FUNCPTR(OSMesaPixelStore); #undef LOAD_FUNCPTR + for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + { + if (!(((void **)&opengl_funcs.gl)[i] = pOSMesaGetProcAddress( opengl_func_names[i] ))) + { + ERR( "%s not found in %s, disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA ); + goto failed; + } + } + return TRUE; failed:

1 0

Ken Thomases : winemac: Opt out of macOS 10.12' s automatic window tabbing feature.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: e49feb63f489141c08a967a9c47930559e1de4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49feb63f489141c08a967a9c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:16 2017 -0500 winemac: Opt out of macOS 10.12's automatic window tabbing feature. It doesn't seem to work well. In full-screen mode, newly-added windows don't always properly resize to fill the screen, so they're not the same size as the windows they're nominally tabbed with. In non-full-screen mode, switching between tabs sometimes causes the windows to grow in height each time. Etc. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 0caca9e..4013e03 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -32,6 +32,15 @@ static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponse int macdrv_err_on; +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +(a)interface NSWindow (WineAutoTabbingExtensions) + + + (void) setAllowsAutomaticWindowTabbing:(BOOL)allows; + +(a)end +#endif + + /*********************************************************************** * WineLocalizedString * @@ -124,6 +133,9 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSNumber numberWithBool:NO], @"ApplePressAndHoldEnabled", nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:defaults]; + + if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) + [NSWindow setAllowsAutomaticWindowTabbing:NO]; } }

1 0

Ken Thomases : winemac: Don't let child (owned) windows be Cocoa primary full-screen windows.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: e0ef30e542a66071cb25af3a07afba3262b673bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef30e542a66071cb25af3a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:07:15 2017 -0500 winemac: Don't let child (owned) windows be Cocoa primary full-screen windows. They shouldn't get a separate space; they should stick with their parent (owner). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9ca40f9..1150322 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -978,7 +978,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized) + style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized && + !(self.parentWindow || self.latentParentWindow)) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; @@ -1839,6 +1840,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [latentParentWindow removeChildWineWindow:self]; if ([parent addChildWineWindow:self]) [[WineApplicationController sharedController] adjustWindowLevels]; + [self adjustFullScreenBehavior:[self collectionBehavior]]; } }

1 0

Ken Thomases : winemac: Better handle z-ordering windows that are in Cocoa parent-child window relationships.
by Alexandre Julliard April 24, 2017

April 24, 2017

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: When realizing latent child windows, maintain their relative z-order.
by Alexandre Julliard April 24, 2017

April 24, 2017

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: Move a window to the front when its Mac title bar is clicked.
by Alexandre Julliard April 24, 2017

April 24, 2017

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: 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 April 24, 2017

April 24, 2017

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

Hugh McMaster : reg/tests: Add some more import tests.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: f0f0a8c02277969e806305a5c3b3ea23e32acf84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f0a8c02277969e806305a5c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 24 13:48:23 2017 +0000 reg/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/reg/tests/reg.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9d2426c..c26a8c1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1356,6 +1356,24 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine40a\"=hex(2):4c,69,6e,65,00\n" + "\"Wine40b\"=\"Value 1\"\n" + "\"Wine40c\"=hex(2):4c,69,6e,65\\\n" + "\"Wine40d\"=\"Value 2\"\n" + "\"Wine40e\"=hex(2):4c,69,6e,65,\\\n" + "\"Wine40f\"=\"Value 3\"\n" + "\"Wine40g\"=\"Value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); + todo_wine verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine40c"); + todo_wine verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine40e"); + todo_wine verify_reg_nonexist(hkey, "Wine40f"); + todo_wine verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1861,6 +1879,24 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine40a\"=hex(2):4c,00,69,00,6e,00,65,00,00,00\n" + "\"Wine40b\"=\"Value 1\"\n" + "\"Wine40c\"=hex(2):4c,00,69,00,6e,00,65,00\\\n" + "\"Wine40d\"=\"Value 2\"\n" + "\"Wine40e\"=hex(2):4c,00,69,00,6e,00,65,00,\\\n" + "\"Wine40f\"=\"Value 3\"\n" + "\"Wine40g\"=\"Value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); + todo_wine verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine40c"); + todo_wine verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine40e"); + todo_wine verify_reg_nonexist(hkey, "Wine40f"); + todo_wine verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n" @@ -2103,6 +2139,18 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@ = \"Test Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t@\t=\tdword:\t00000008\t\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); @@ -2231,6 +2279,18 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@ = \"Test Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t@\t=\tdword:\t00000008\t\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err);

1 0

Michael Müller : include/mfidl.idl: Add IMFMediaSession interface and dependencies.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 87a8c55811732fbd5d4742f6c354ddb048ceff2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a8c55811732fbd5d4742f6c… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 22 10:47:45 2017 +0000 include/mfidl.idl: Add IMFMediaSession interface and dependencies. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfidl.idl | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f9cb7b4..6f53728 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -88,6 +88,7 @@ IDL_SRCS = \ inspectable.idl \ mediaobj.idl \ metahost.idl \ + mfidl.idl \ mfobjects.idl \ mfreadwrite.idl \ mimeinfo.idl \ diff --git a/include/mfidl.idl b/include/mfidl.idl new file mode 100644 index 0000000..3431260 --- /dev/null +++ b/include/mfidl.idl @@ -0,0 +1,126 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfobjects.idl"; + +typedef unsigned __int64 TOPOID; +typedef LONGLONG MFTIME; + +typedef enum MF_TOPOLOGY_TYPE +{ + MF_TOPOLOGY_OUTPUT_NODE, + MF_TOPOLOGY_SOURCESTREAM_NODE, + MF_TOPOLOGY_TRANSFORM_NODE, + MF_TOPOLOGY_TEE_NODE, + MF_TOPOLOGY_MAX = 0xffffffff +} MF_TOPOLOGY_TYPE; + +typedef enum _MFCLOCK_STATE +{ + MFCLOCK_STATE_INVALID, + MFCLOCK_STATE_RUNNING, + MFCLOCK_STATE_STOPPED, + MFCLOCK_STATE_PAUSED +} MFCLOCK_STATE; + +typedef struct _MFCLOCK_PROPERTIES +{ + unsigned __int64 qwCorrelationRate; + GUID guidClockId; + DWORD dwClockFlags; + unsigned __int64 qwClockFrequency; + DWORD dwClockTolerance; + DWORD dwClockJitter; +} MFCLOCK_PROPERTIES; + +[ + object, + uuid(2eb1e945-18b8-4139-9b1a-d5d584818530), +] +interface IMFClock : IUnknown +{ + HRESULT GetClockCharacteristics([out] DWORD *characteristics); + HRESULT GetCorrelatedTime([in] DWORD reserved, [out] LONGLONG *clock_time, [out] MFTIME *system_time); + HRESULT GetContinuityKey([out] DWORD *key); + HRESULT GetState([in] DWORD reserved, [out] MFCLOCK_STATE *state); + HRESULT GetProperties([out] MFCLOCK_PROPERTIES *props); +} + +[ + object, + uuid(83cf873a-f6da-4bc8-823f-bacfd55dc430), +] +interface IMFTopologyNode : IMFAttributes +{ + HRESULT SetObject([in] IUnknown *object); + HRESULT GetObject([out] IUnknown **object); + HRESULT GetNodeType([out] MF_TOPOLOGY_TYPE *type); + HRESULT GetTopoNodeID([out] TOPOID *id); + HRESULT SetTopoNodeID([in] TOPOID id); + HRESULT GetInputCount([out] DWORD *count); + HRESULT GetOutputCount([out] DWORD *count); + [local] HRESULT ConnectOutput([in] DWORD output_index, [in] IMFTopologyNode *node, [in] DWORD input_index); + [local] HRESULT DisconnectOutput([in] DWORD index); + HRESULT GetInput([in] DWORD input_index, [out] IMFTopologyNode **node, [out] DWORD *output_index); + HRESULT GetOutput([in] DWORD output_index, [out] IMFTopologyNode **node, [out] DWORD *input_index); + [local] HRESULT SetOutputPrefType([in] DWORD index, [in] IMFMediaType *type); + [local] HRESULT GetOutputPrefType([in] DWORD output_index, [out] IMFMediaType **type); + [call_as(GetOutputPrefType)] HRESULT RemoteGetOutputPrefType([in] DWORD index, [out] DWORD *length, + [out, size_is(, *length)] BYTE **data); + [local] HRESULT SetInputPrefType([in] DWORD index, [in] IMFMediaType *type); + [local] HRESULT GetInputPrefType([in] DWORD index, [out] IMFMediaType **type); + [call_as(GetInputPrefType)] HRESULT RemoteGetInputPrefType([in] DWORD index, [out] DWORD *length, + [out, size_is(, *length)] BYTE **data); + HRESULT CloneFrom([in] IMFTopologyNode *node); +} + +[ + object, + uuid(83cf873a-f6da-4bc8-823f-bacfd55dc433), +] +interface IMFTopology : IMFAttributes +{ + HRESULT GetTopologyID([out] TOPOID *id); + [local] HRESULT AddNode([in] IMFTopologyNode *node); + [local] HRESULT RemoveNode([in] IMFTopologyNode *node); + HRESULT GetNodeCount([out] WORD *nodes); + HRESULT GetNode([in] WORD index, [out] IMFTopologyNode **node); + [local] HRESULT Clear(); + HRESULT CloneFrom([in] IMFTopology *topology); + HRESULT GetNodeByID([in] TOPOID id, [out] IMFTopologyNode **node); + HRESULT GetSourceNodeCollection([out] IMFCollection **collection); + HRESULT GetOutputNodeCollection([out] IMFCollection **collection); +} + +[ + object, + uuid(90377834-21d0-4dee-8214-ba2e3e6c1127), +] +interface IMFMediaSession : IMFMediaEventGenerator +{ + HRESULT SetTopology([in] DWORD flags, [in] IMFTopology *topology); + HRESULT ClearTopologies(); + HRESULT Start([in, unique] const GUID *format, [in, unique] const PROPVARIANT *start); + HRESULT Pause(); + HRESULT Stop(); + HRESULT Close(); + HRESULT Shutdown(); + HRESULT GetClock([out] IMFClock **clock); + HRESULT GetSessionCapabilities([out] DWORD *caps); + HRESULT GetFullTopology([in] DWORD flags, [in] TOPOID id, [out] IMFTopology **topology); +}

1 0