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

Jacek Caban : mshtml: Set _retval in nsIDirectoryServiceProvider2 functions even when returning failure .
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 6f1c143ad5124b3256f66a5376a46cb2d5a1dd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1c143ad5124b3256f66a537… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 17:09:34 2013 +0200 mshtml: Set _retval in nsIDirectoryServiceProvider2 functions even when returning failure. --- dlls/mshtml/nsembed.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1613fe8..4e72464 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -287,6 +287,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFile(nsIDirectoryServicePro return nsIFile_Clone(profile_directory, _retval); } + *_retval = NULL; return NS_ERROR_FAILURE; } @@ -310,8 +311,10 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr strcpyW(plugin_path+len, gecko_pluginW); nsres = create_nsfile(plugin_path, &plugin_directory); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { + *_retval = NULL; return nsres; + } } nsres = nsIFile_Clone(plugin_directory, &file); @@ -326,6 +329,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr return NS_OK; } + *_retval = NULL; return NS_ERROR_FAILURE; }

1 0

Ken Thomases : winemac: Unminimize a window on activation if there are only minimized windows.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 08e940fb1d87a6f756a305a79f6cddd6dfdc8b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e940fb1d87a6f756a305a79… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 8 10:46:02 2013 -0500 winemac: Unminimize a window on activation if there are only minimized windows. --- dlls/winemac.drv/cocoa_app.m | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4e7cecc..f9363c1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1613,6 +1613,10 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { + WineWindow* window; + WineWindow* firstMinimized; + BOOL anyShowing; + [self activateCursorClipping]; [orderedWineWindows enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ @@ -1621,6 +1625,24 @@ int macdrv_err_on; [window setLevel:[window levelWhenActive]]; }]; + firstMinimized = nil; + anyShowing = FALSE; + for (window in orderedWineWindows) + { + if ([window isMiniaturized]) + { + if (!firstMinimized) + firstMinimized = window; + } + else if ([window isVisible]) + { + anyShowing = TRUE; + break; + } + } + if (!anyShowing && firstMinimized) + [firstMinimized deminiaturize:self]; + // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the // displays and switch their resolutions back. However, the other Wine

1 0

Jacek Caban : configure: Use gcc -shared instead of dllwrap to build libwine.dll.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 6c32033cdcd0e31744297e6f48eab769ce00540b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c32033cdcd0e31744297e6f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 17:31:01 2013 +0200 configure: Use gcc -shared instead of dllwrap to build libwine.dll. --- Make.vars.in | 1 - configure | 98 +--------------------------------------------------------- configure.ac | 6 +--- 3 files changed, 2 insertions(+), 103 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 5400d4c..76436fa 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -35,7 +35,6 @@ FAKEEXT = $(DLLEXT:.so=.fake) TOOLSEXT = @TOOLSEXT@ IMPLIBEXT = @IMPLIBEXT@ DLLTOOL = @DLLTOOL@ -DLLWRAP = @DLLWRAP@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ diff --git a/configure b/configure index 8829b5e..770fcde 100755 --- a/configure +++ b/configure @@ -696,7 +696,6 @@ IOKITLIB COREFOUNDATIONLIB LIBWINE_RULES SOCKETLIBS -DLLWRAP DLLTOOL READELF LDD @@ -6530,101 +6529,6 @@ else DLLTOOL="$ac_cv_prog_DLLTOOL" fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args. -set dummy ${ac_tool_prefix}dllwrap; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLWRAP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLWRAP"; then - ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLWRAP=$ac_cv_prog_DLLWRAP -if test -n "$DLLWRAP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5 -$as_echo "$DLLWRAP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLWRAP"; then - ac_ct_DLLWRAP=$DLLWRAP - # Extract the first word of "dllwrap", so it can be a program name with args. -set dummy dllwrap; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLWRAP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLWRAP"; then - ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLWRAP="dllwrap" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP -if test -n "$ac_ct_DLLWRAP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5 -$as_echo "$ac_ct_DLLWRAP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLWRAP" = x; then - DLLWRAP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLWRAP=$ac_ct_DLLWRAP - fi -else - DLLWRAP="$ac_cv_prog_DLLWRAP" -fi - - if test "$DLLWRAP" = "false"; then - as_fn_error $? "dllwrap is needed to build a dll for Windows" "$LINENO" 5 - fi LIBEXT="dll" IMPLIBEXT="a" STATIC_IMPLIBEXT="a" @@ -6653,7 +6557,7 @@ libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def libwine.dll: \$(OBJS) wine.def Makefile.in - \$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) + \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll diff --git a/configure.ac b/configure.ac index 98c3dd4..6dd2348 100644 --- a/configure.ac +++ b/configure.ac @@ -686,10 +686,6 @@ WINE_PATH_SONAME_TOOLS case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) - AC_CHECK_TOOL(DLLWRAP,dllwrap,false) - if test "$DLLWRAP" = "false"; then - AC_MSG_ERROR([dllwrap is needed to build a dll for Windows]) - fi LIBEXT="dll" IMPLIBEXT="a" STATIC_IMPLIBEXT="a" @@ -720,7 +716,7 @@ libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def libwine.dll: \$(OBJS) wine.def Makefile.in - \$(DLLWRAP) --def \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) + \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll

1 0

Dmitry Timoshkov : ole32: Add a semi-stub for CLSIDFromProgIDEx.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 79ef449e32d2f852e37b89dc6e24dfd024b04d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef449e32d2f852e37b89dc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 11:51:36 2013 +0900 ole32: Add a semi-stub for CLSIDFromProgIDEx. --- dlls/ole32/compobj.c | 9 +++++++++ dlls/ole32/ole32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 04d65c9..1857ac7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2098,6 +2098,15 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) return __CLSIDFromString(buf2,clsid); } +/****************************************************************************** + * CLSIDFromProgIDEx [OLE32.@] + */ +HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) +{ + FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid); + + return CLSIDFromProgID(progid, clsid); +} /***************************************************************************** * CoGetPSClsid [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9e3f80f..d71168e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -4,6 +4,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr)

1 0

Ken Thomases : winemac: Extract application-level handling of mouse move events to a separate method .
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 76691853f527fe799a05f0d8cb75a4f2abfec4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76691853f527fe799a05f0d8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:35 2013 -0500 winemac: Extract application-level handling of mouse move events to a separate method. --- dlls/winemac.drv/cocoa_app.m | 94 ++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7a304a8..7f2ec7c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1134,6 +1134,54 @@ int macdrv_err_on; return TRUE; } + - (void) handleMouseMove:(NSEvent*)anEvent + { + WineWindow* targetWindow; + + /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the + event indicates its window is the main window, even if the cursor is + over a different window. Find the actual WineWindow that is under the + cursor and post the event as being for that window. */ + if ([anEvent type] == NSMouseMoved) + { + CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); + NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; + NSInteger windowUnderNumber; + + windowUnderNumber = [NSWindow windowNumberAtPoint:point + belowWindowWithWindowNumber:0]; + targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; + } + else + targetWindow = (WineWindow*)[anEvent window]; + + if ([targetWindow isKindOfClass:[WineWindow class]]) + { + BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); + forceNextMouseMoveAbsolute = FALSE; + + // If we recently warped the cursor (other than in our cursor-clipping + // event tap), discard mouse move events until we see an event which is + // later than that time. + if (lastSetCursorPositionTime) + { + if ([anEvent timestamp] <= lastSetCursorPositionTime) + return; + + lastSetCursorPositionTime = 0; + absolute = TRUE; + } + + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + lastTargetWindow = targetWindow; + } + else if (lastTargetWindow) + { + [[NSCursor arrowCursor] set]; + [self unhideCursor]; + lastTargetWindow = nil; + } + } // Returns TRUE if the event was handled and caller should do nothing more // with it. Returns FALSE if the caller should process it as normal and @@ -1152,51 +1200,7 @@ int macdrv_err_on; if (type == NSMouseMoved || type == NSLeftMouseDragged || type == NSRightMouseDragged || type == NSOtherMouseDragged) { - WineWindow* targetWindow; - - /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the - event indicates its window is the main window, even if the cursor is - over a different window. Find the actual WineWindow that is under the - cursor and post the event as being for that window. */ - if (type == NSMouseMoved) - { - CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); - NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; - NSInteger windowUnderNumber; - - windowUnderNumber = [NSWindow windowNumberAtPoint:point - belowWindowWithWindowNumber:0]; - targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; - } - else - targetWindow = (WineWindow*)[anEvent window]; - - if ([targetWindow isKindOfClass:[WineWindow class]]) - { - BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); - forceNextMouseMoveAbsolute = FALSE; - - // If we recently warped the cursor (other than in our cursor-clipping - // event tap), discard mouse move events until we see an event which is - // later than that time. - if (lastSetCursorPositionTime) - { - if ([anEvent timestamp] <= lastSetCursorPositionTime) - return; - - lastSetCursorPositionTime = 0; - absolute = TRUE; - } - - [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; - lastTargetWindow = targetWindow; - } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; - lastTargetWindow = nil; - } + [self handleMouseMove:anEvent]; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp ||

1 0

Ken Thomases : winemac: Consolidate mouse move handling into -[ WineApplicationController handleMouseMove:].
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 72e893237ca9db195c9b3004576f2097c735d2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e893237ca9db195c9b30045… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:39 2013 -0500 winemac: Consolidate mouse move handling into -[WineApplicationController handleMouseMove:]. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 38 +++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 4 --- dlls/winemac.drv/cocoa_window.m | 41 --------------------------------------- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 60a239c..f0cdfc3 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -60,6 +60,7 @@ enum { WineWindow* lastTargetWindow; BOOL forceNextMouseMoveAbsolute; + double mouseMoveDeltaX, mouseMoveDeltaY; NSMutableArray* orderedWineWindows; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7f2ec7c..3ef84e0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1157,6 +1157,7 @@ int macdrv_err_on; if ([targetWindow isKindOfClass:[WineWindow class]]) { + macdrv_event* event; BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); forceNextMouseMoveAbsolute = FALSE; @@ -1172,7 +1173,42 @@ int macdrv_err_on; absolute = TRUE; } - [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + if (absolute) + { + CGPoint point = CGEventGetLocation([anEvent CGEvent]); + + event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); + event->mouse_moved.x = point.x; + event->mouse_moved.y = point.y; + + mouseMoveDeltaX = 0; + mouseMoveDeltaY = 0; + } + else + { + /* Add event delta to accumulated delta error */ + /* deltaY is already flipped */ + mouseMoveDeltaX += [anEvent deltaX]; + mouseMoveDeltaY += [anEvent deltaY]; + + event = macdrv_create_event(MOUSE_MOVED, targetWindow); + event->mouse_moved.x = mouseMoveDeltaX; + event->mouse_moved.y = mouseMoveDeltaY; + + /* Keep the remainder after integer truncation. */ + mouseMoveDeltaX -= event->mouse_moved.x; + mouseMoveDeltaY -= event->mouse_moved.y; + } + + if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) + { + event->mouse_moved.time_ms = [self ticksForEventTime:[anEvent timestamp]]; + + [targetWindow.queue postEvent:event]; + } + + macdrv_release_event(event); + lastTargetWindow = targetWindow; } else if (lastTargetWindow) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index ed5f1f9..2d95e1a 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -48,8 +48,6 @@ NSUInteger lastModifierFlags; - double mouseMoveDeltaX, mouseMoveDeltaY; - NSInteger levelWhenActive; NSTimer* liveResizeDisplayTimer; @@ -68,6 +66,4 @@ - (void) adjustWindowLevel; - - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute; - @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 65d7bc5..80bf9a4 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -952,47 +952,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event:theEvent]; } - - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute - { - macdrv_event* event; - - if (absolute) - { - CGPoint point = CGEventGetLocation([theEvent CGEvent]); - - event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, self); - event->mouse_moved.x = point.x; - event->mouse_moved.y = point.y; - - mouseMoveDeltaX = 0; - mouseMoveDeltaY = 0; - } - else - { - /* Add event delta to accumulated delta error */ - /* deltaY is already flipped */ - mouseMoveDeltaX += [theEvent deltaX]; - mouseMoveDeltaY += [theEvent deltaY]; - - event = macdrv_create_event(MOUSE_MOVED, self); - event->mouse_moved.x = mouseMoveDeltaX; - event->mouse_moved.y = mouseMoveDeltaY; - - /* Keep the remainder after integer truncation. */ - mouseMoveDeltaX -= event->mouse_moved.x; - mouseMoveDeltaY -= event->mouse_moved.y; - } - - if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) - { - event->mouse_moved.time_ms = [[WineApplicationController sharedController] ticksForEventTime:[theEvent timestamp]]; - - [queue postEvent:event]; - } - - macdrv_release_event(event); - } - - (void) setLevelWhenActive:(NSInteger)level { levelWhenActive = level;

1 0

Ken Thomases : winemac: Consolidate mouse button handling into -[ WineApplicationController handleMouseButton:].
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: e15b82ad1bd9bc69ea2f7a8dfe0bd76d595a7b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15b82ad1bd9bc69ea2f7a8df… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:42 2013 -0500 winemac: Consolidate mouse button handling into -[WineApplicationController handleMouseButton:]. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 94 ++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_window.m | 32 ------------- 3 files changed, 90 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index f0cdfc3..5e4d181 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -61,6 +61,7 @@ enum { WineWindow* lastTargetWindow; BOOL forceNextMouseMoveAbsolute; double mouseMoveDeltaX, mouseMoveDeltaY; + NSUInteger unmatchedMouseDowns; NSMutableArray* orderedWineWindows; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3ef84e0..bba9859 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1219,6 +1219,87 @@ int macdrv_err_on; } } + - (void) handleMouseButton:(NSEvent*)theEvent + { + WineWindow* window = (WineWindow*)[theEvent window]; + + if ([window isKindOfClass:[WineWindow class]]) + { + NSEventType type = [theEvent type]; + BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); + CGPoint pt = CGEventGetLocation([theEvent CGEvent]); + BOOL process; + + if (pressed) + { + // Test if the click was in the window's content area. + NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; + NSRect contentRect = [window contentRectForFrameRect:[window frame]]; + process = NSPointInRect(nspoint, contentRect); + if (process && [window styleMask] & NSResizableWindowMask) + { + // Ignore clicks in the grow box (resize widget). + HIPoint origin = { 0, 0 }; + HIThemeGrowBoxDrawInfo info = { 0 }; + HIRect bounds; + OSStatus status; + + info.kind = kHIThemeGrowBoxKindNormal; + info.direction = kThemeGrowRight | kThemeGrowDown; + if ([window styleMask] & NSUtilityWindowMask) + info.size = kHIThemeGrowBoxSizeSmall; + else + info.size = kHIThemeGrowBoxSizeNormal; + + status = HIThemeGetGrowBoxBounds(&origin, &info, &bounds); + if (status == noErr) + { + NSRect growBox = NSMakeRect(NSMaxX(contentRect) - bounds.size.width, + NSMinY(contentRect), + bounds.size.width, + bounds.size.height); + process = !NSPointInRect(nspoint, growBox); + } + } + if (process) + unmatchedMouseDowns |= NSEventMaskFromType(type); + } + else + { + NSEventType downType = type - 1; + NSUInteger downMask = NSEventMaskFromType(downType); + process = (unmatchedMouseDowns & downMask) != 0; + unmatchedMouseDowns &= ~downMask; + } + + if (process) + { + macdrv_event* event; + + event = macdrv_create_event(MOUSE_BUTTON, window); + event->mouse_button.button = [theEvent buttonNumber]; + event->mouse_button.pressed = pressed; + event->mouse_button.x = pt.x; + event->mouse_button.y = pt.y; + event->mouse_button.time_ms = [self ticksForEventTime:[theEvent timestamp]]; + + [window.queue postEvent:event]; + + macdrv_release_event(event); + } + } + + // Since mouse button events deliver absolute cursor position, the + // accumulating delta from move events is invalidated. Make sure + // next mouse move event starts over from an absolute baseline. + // Also, it's at least possible that the title bar widgets (e.g. close + // button, etc.) could enter an internal event loop on a mouse down that + // wouldn't exit until a mouse up. In that case, we'd miss any mouse + // dragged events and, after that, any notion of the cursor position + // computed from accumulating deltas would be wrong. + forceNextMouseMoveAbsolute = TRUE; + } + // Returns TRUE if the event was handled and caller should do nothing more // with it. Returns FALSE if the caller should process it as normal and // then call -didSendEvent:. @@ -1240,12 +1321,15 @@ int macdrv_err_on; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp || - type == NSOtherMouseDown || type == NSOtherMouseUp || - type == NSScrollWheel) + type == NSOtherMouseDown || type == NSOtherMouseUp) + { + [self handleMouseButton:anEvent]; + } + else if (type == NSScrollWheel) { - // Since mouse button and scroll wheel events deliver absolute cursor - // position, the accumulating delta from move events is invalidated. - // Make sure next mouse move event starts over from an absolute baseline. + // Since scroll wheel events deliver absolute cursor position, the + // accumulating delta from move events is invalidated. Make sure next + // mouse move event starts over from an absolute baseline. forceNextMouseMoveAbsolute = TRUE; } else if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 80bf9a4..0a751bd 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -250,13 +250,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } - /* By default, NSView will swallow right-clicks in an attempt to support contextual - menus. We need to bypass that and allow the event to make it to the window. */ - - (void) rightMouseDown:(NSEvent*)theEvent - { - [[self window] rightMouseDown:theEvent]; - } - - (void) addGLContext:(WineOpenGLContext*)context { if (!glContexts) @@ -839,23 +832,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self checkTransparency]; } - - (void) postMouseButtonEvent:(NSEvent *)theEvent pressed:(int)pressed - { - CGPoint pt = CGEventGetLocation([theEvent CGEvent]); - macdrv_event* event; - - event = macdrv_create_event(MOUSE_BUTTON, self); - event->mouse_button.button = [theEvent buttonNumber]; - event->mouse_button.pressed = pressed; - event->mouse_button.x = pt.x; - event->mouse_button.y = pt.y; - event->mouse_button.time_ms = [[WineApplicationController sharedController] ticksForEventTime:[theEvent timestamp]]; - - [queue postEvent:event]; - - macdrv_release_event(event); - } - - (void) makeFocused:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; @@ -1061,14 +1037,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* * ---------- NSResponder method overrides ---------- */ - - (void) mouseDown:(NSEvent *)theEvent { [self postMouseButtonEvent:theEvent pressed:1]; } - - (void) rightMouseDown:(NSEvent *)theEvent { [self mouseDown:theEvent]; } - - (void) otherMouseDown:(NSEvent *)theEvent { [self mouseDown:theEvent]; } - - - (void) mouseUp:(NSEvent *)theEvent { [self postMouseButtonEvent:theEvent pressed:0]; } - - (void) rightMouseUp:(NSEvent *)theEvent { [self mouseUp:theEvent]; } - - (void) otherMouseUp:(NSEvent *)theEvent { [self mouseUp:theEvent]; } - - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } - (void) keyUp:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; }

1 0

Ken Thomases : winemac: Consolidate scroll wheel handling into -[ WineApplicationController handleScrollWheel:].
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: d9ae2f3e38663b4f8802b08c13b85da62cf4420b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2f3e38663b4f8802b08c1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:44 2013 -0500 winemac: Consolidate scroll wheel handling into -[WineApplicationController handleScrollWheel:]. --- dlls/winemac.drv/cocoa_app.m | 98 +++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_window.m | 79 ------------------------------- 2 files changed, 94 insertions(+), 83 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bba9859..c518b4e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1300,6 +1300,99 @@ int macdrv_err_on; forceNextMouseMoveAbsolute = TRUE; } + - (void) handleScrollWheel:(NSEvent*)theEvent + { + WineWindow* window = (WineWindow*)[theEvent window]; + + if ([window isKindOfClass:[WineWindow class]]) + { + CGEventRef cgevent = [theEvent CGEvent]; + CGPoint pt = CGEventGetLocation(cgevent); + NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; + NSRect contentRect = [window contentRectForFrameRect:[window frame]]; + + // Only process the event if it was in the window's content area. + if (NSPointInRect(nspoint, contentRect)) + { + macdrv_event* event; + CGFloat x, y; + BOOL continuous = FALSE; + + event = macdrv_create_event(MOUSE_SCROLL, window); + event->mouse_scroll.x = pt.x; + event->mouse_scroll.y = pt.y; + event->mouse_scroll.time_ms = [self ticksForEventTime:[theEvent timestamp]]; + + if (CGEventGetIntegerValueField(cgevent, kCGScrollWheelEventIsContinuous)) + { + continuous = TRUE; + + /* Continuous scroll wheel events come from high-precision scrolling + hardware like Apple's Magic Mouse, Mighty Mouse, and trackpads. + For these, we can get more precise data from the CGEvent API. */ + /* Axis 1 is vertical, axis 2 is horizontal. */ + x = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis2); + y = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis1); + } + else + { + double pixelsPerLine = 10; + CGEventSourceRef source; + + /* The non-continuous values are in units of "lines", not pixels. */ + if ((source = CGEventCreateSourceFromEvent(cgevent))) + { + pixelsPerLine = CGEventSourceGetPixelsPerLine(source); + CFRelease(source); + } + + x = pixelsPerLine * [theEvent deltaX]; + y = pixelsPerLine * [theEvent deltaY]; + } + + /* Mac: negative is right or down, positive is left or up. + Win32: negative is left or down, positive is right or up. + So, negate the X scroll value to translate. */ + x = -x; + + /* The x,y values so far are in pixels. Win32 expects to receive some + fraction of WHEEL_DELTA == 120. By my estimation, that's roughly + 6 times the pixel value. */ + event->mouse_scroll.x_scroll = 6 * x; + event->mouse_scroll.y_scroll = 6 * y; + + if (!continuous) + { + /* For non-continuous "clicky" wheels, if there was any motion, make + sure there was at least WHEEL_DELTA motion. This is so, at slow + speeds where the system's acceleration curve is actually reducing the + scroll distance, the user is sure to get some action out of each click. + For example, this is important for rotating though weapons in a + first-person shooter. */ + if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) + event->mouse_scroll.x_scroll = 120; + else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) + event->mouse_scroll.x_scroll = -120; + + if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) + event->mouse_scroll.y_scroll = 120; + else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) + event->mouse_scroll.y_scroll = -120; + } + + if (event->mouse_scroll.x_scroll || event->mouse_scroll.y_scroll) + [window.queue postEvent:event]; + + macdrv_release_event(event); + + // Since scroll wheel events deliver absolute cursor position, the + // accumulating delta from move events is invalidated. Make sure next + // mouse move event starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; + } + } + } + // Returns TRUE if the event was handled and caller should do nothing more // with it. Returns FALSE if the caller should process it as normal and // then call -didSendEvent:. @@ -1327,10 +1420,7 @@ int macdrv_err_on; } else if (type == NSScrollWheel) { - // Since scroll wheel events deliver absolute cursor position, the - // accumulating delta from move events is invalidated. Make sure next - // mouse move event starts over from an absolute baseline. - forceNextMouseMoveAbsolute = TRUE; + [self handleScrollWheel:anEvent]; } else if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) { diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0a751bd..ae69479 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1102,85 +1102,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } - - (void) scrollWheel:(NSEvent *)theEvent - { - CGPoint pt; - macdrv_event* event; - CGEventRef cgevent; - CGFloat x, y; - BOOL continuous = FALSE; - - cgevent = [theEvent CGEvent]; - pt = CGEventGetLocation(cgevent); - - event = macdrv_create_event(MOUSE_SCROLL, self); - event->mouse_scroll.x = pt.x; - event->mouse_scroll.y = pt.y; - event->mouse_scroll.time_ms = [[WineApplicationController sharedController] ticksForEventTime:[theEvent timestamp]]; - - if (CGEventGetIntegerValueField(cgevent, kCGScrollWheelEventIsContinuous)) - { - continuous = TRUE; - - /* Continuous scroll wheel events come from high-precision scrolling - hardware like Apple's Magic Mouse, Mighty Mouse, and trackpads. - For these, we can get more precise data from the CGEvent API. */ - /* Axis 1 is vertical, axis 2 is horizontal. */ - x = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis2); - y = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis1); - } - else - { - double pixelsPerLine = 10; - CGEventSourceRef source; - - /* The non-continuous values are in units of "lines", not pixels. */ - if ((source = CGEventCreateSourceFromEvent(cgevent))) - { - pixelsPerLine = CGEventSourceGetPixelsPerLine(source); - CFRelease(source); - } - - x = pixelsPerLine * [theEvent deltaX]; - y = pixelsPerLine * [theEvent deltaY]; - } - - /* Mac: negative is right or down, positive is left or up. - Win32: negative is left or down, positive is right or up. - So, negate the X scroll value to translate. */ - x = -x; - - /* The x,y values so far are in pixels. Win32 expects to receive some - fraction of WHEEL_DELTA == 120. By my estimation, that's roughly - 6 times the pixel value. */ - event->mouse_scroll.x_scroll = 6 * x; - event->mouse_scroll.y_scroll = 6 * y; - - if (!continuous) - { - /* For non-continuous "clicky" wheels, if there was any motion, make - sure there was at least WHEEL_DELTA motion. This is so, at slow - speeds where the system's acceleration curve is actually reducing the - scroll distance, the user is sure to get some action out of each click. - For example, this is important for rotating though weapons in a - first-person shooter. */ - if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) - event->mouse_scroll.x_scroll = 120; - else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) - event->mouse_scroll.x_scroll = -120; - - if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) - event->mouse_scroll.y_scroll = 120; - else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) - event->mouse_scroll.y_scroll = -120; - } - - if (event->mouse_scroll.x_scroll || event->mouse_scroll.y_scroll) - [queue postEvent:event]; - - macdrv_release_event(event); - } - /* * ---------- NSWindowDelegate methods ----------

1 0

Ken Thomases : winemac: Apply cursor clipping to events that were in Cocoa' s queue when clipping started.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 1c4d8938ec4da1c05f6ab3144fdc71014b61c000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4d8938ec4da1c05f6ab3144… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:46 2013 -0500 winemac: Apply cursor clipping to events that were in Cocoa's queue when clipping started. --- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c518b4e..e8cca28 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1177,6 +1177,9 @@ int macdrv_err_on; { CGPoint point = CGEventGetLocation([anEvent CGEvent]); + if (clippingCursor) + [self clipCursorLocation:&point]; + event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); event->mouse_moved.x = point.x; event->mouse_moved.y = point.y; @@ -1230,6 +1233,9 @@ int macdrv_err_on; CGPoint pt = CGEventGetLocation([theEvent CGEvent]); BOOL process; + if (clippingCursor) + [self clipCursorLocation:&pt]; + if (pressed) { // Test if the click was in the window's content area. @@ -1308,8 +1314,14 @@ int macdrv_err_on; { CGEventRef cgevent = [theEvent CGEvent]; CGPoint pt = CGEventGetLocation(cgevent); - NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; - NSRect contentRect = [window contentRectForFrameRect:[window frame]]; + NSPoint nspoint; + NSRect contentRect; + + if (clippingCursor) + [self clipCursorLocation:&pt]; + + nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; + contentRect = [window contentRectForFrameRect:[window frame]]; // Only process the event if it was in the window's content area. if (NSPointInRect(nspoint, contentRect))

1 0

Ken Thomases : winemac: Prefer absolute mouse moves unless cursor is pinned by clipping or desktop edges .
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 3e3d982185c62020b7478f433486ade19378ed6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3d982185c62020b7478f433… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:49 2013 -0500 winemac: Prefer absolute mouse moves unless cursor is pinned by clipping or desktop edges. This fixes an issue with sub-pixel-precise pointing devices on Lion and later. Wine's notion of the cursor position would get out of sync with the actual position because deltas don't convey the actual movement distance. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 80 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 5e4d181..3ce8a83 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -57,6 +57,7 @@ enum { CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + NSMutableData* screenFrameCGRects; WineWindow* lastTargetWindow; BOOL forceNextMouseMoveAbsolute; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e8cca28..b4e15d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -170,6 +170,7 @@ int macdrv_err_on; - (void) dealloc { + [screenFrameCGRects release]; [applicationIcon release]; [warpRecords release]; [cursorTimer release]; @@ -377,10 +378,29 @@ int macdrv_err_on; if (!primaryScreenHeightValid) { NSArray* screens = [NSScreen screens]; - if ([screens count]) + NSUInteger count = [screens count]; + if (count) { + NSUInteger size; + CGRect* rect; + NSScreen* screen; + primaryScreenHeight = NSHeight([[screens objectAtIndex:0] frame]); primaryScreenHeightValid = TRUE; + + size = count * sizeof(CGRect); + if (!screenFrameCGRects) + screenFrameCGRects = [[NSMutableData alloc] initWithLength:size]; + else + [screenFrameCGRects setLength:size]; + + rect = [screenFrameCGRects mutableBytes]; + for (screen in screens) + { + CGRect temp = NSRectToCGRect([screen frame]); + temp.origin.y = primaryScreenHeight - CGRectGetMaxY(temp); + *rect++ = temp; + } } else return 1280; /* arbitrary value */ @@ -1157,9 +1177,9 @@ int macdrv_err_on; if ([targetWindow isKindOfClass:[WineWindow class]]) { + CGPoint point = CGEventGetLocation([anEvent CGEvent]); macdrv_event* event; - BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); - forceNextMouseMoveAbsolute = FALSE; + BOOL absolute; // If we recently warped the cursor (other than in our cursor-clipping // event tap), discard mouse move events until we see an event which is @@ -1170,13 +1190,63 @@ int macdrv_err_on; return; lastSetCursorPositionTime = 0; + forceNextMouseMoveAbsolute = TRUE; + } + + if (forceNextMouseMoveAbsolute || targetWindow != lastTargetWindow) + { absolute = TRUE; + forceNextMouseMoveAbsolute = FALSE; + } + else + { + // Send absolute move events if the cursor is in the interior of + // its range. Only send relative moves if the cursor is pinned to + // the boundaries of where it can go. We compute the position + // that's one additional point in the direction of movement. If + // that is outside of the clipping rect or desktop region (the + // union of the screen frames), then we figure the cursor would + // have moved outside if it could but it was pinned. + CGPoint computedPoint = point; + CGFloat deltaX = [anEvent deltaX]; + CGFloat deltaY = [anEvent deltaY]; + + if (deltaX > 0.001) + computedPoint.x++; + else if (deltaX < -0.001) + computedPoint.x--; + + if (deltaY > 0.001) + computedPoint.y++; + else if (deltaY < -0.001) + computedPoint.y--; + + // Assume cursor is pinned for now + absolute = FALSE; + if (!clippingCursor || CGRectContainsPoint(cursorClipRect, computedPoint)) + { + const CGRect* rects; + NSUInteger count, i; + + // Caches screenFrameCGRects if necessary + [self primaryScreenHeight]; + + rects = [screenFrameCGRects bytes]; + count = [screenFrameCGRects length] / sizeof(rects[0]); + + for (i = 0; i < count; i++) + { + if (CGRectContainsPoint(rects[i], computedPoint)) + { + absolute = TRUE; + break; + } + } + } } if (absolute) { - CGPoint point = CGEventGetLocation([anEvent CGEvent]); - if (clippingCursor) [self clipCursorLocation:&point];

1 0