wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Dmitry Timoshkov : kernel32: Hold PEB lock during process exit.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 77f222505cdb392f2880932671051b345bf64078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f222505cdb392f288093267… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:42:29 2013 +0900 kernel32: Hold PEB lock during process exit. --- dlls/kernel32/process.c | 2 ++ dlls/kernel32/tests/loader.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7abb732..683385f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2630,6 +2630,7 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); @@ -2639,6 +2640,7 @@ void WINAPI process_ExitProcess( DWORD status ) void WINAPI ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a45235f..17e6cd8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1872,7 +1872,6 @@ static void test_ExitProcess(void) ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_TIMEOUT, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -1882,7 +1881,6 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine ok(ret == 199, "expected exit code 199, got %u\n", ret); if (*child_failures) {

1 0

Dmitry Timoshkov : server: Fail to set process affinity mask if the process is terminating.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: bac0387d297ea547e69784d5372acf0586b5cc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac0387d297ea547e69784d53… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:40:34 2013 +0900 server: Fail to set process affinity mask if the process is terminating. --- dlls/kernel32/tests/loader.c | 3 +-- server/process.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4176b5..a45235f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1958,7 +1958,7 @@ todo_wine /* Checking process state without waiting for process termination * leads to different results due to a race condition. */ - ret = WaitForSingleObject(pi.hProcess, 100); + ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); memset(&pbi, 0, sizeof(pbi)); @@ -1967,7 +1967,6 @@ todo_wine ok(pbi.ExitStatus == 198, "expected 198, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(pi.hProcess, ProcessAffinityMask, &affinity, sizeof(affinity)); -todo_wine ok(ret == STATUS_PROCESS_IS_TERMINATING, "expected STATUS_PROCESS_IS_TERMINATING, got %#x\n", ret); SetLastError(0xdeadbeef); diff --git a/server/process.c b/server/process.c index 89c08dc..61d9d17 100644 --- a/server/process.c +++ b/server/process.c @@ -1122,6 +1122,12 @@ static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + process->affinity = affinity; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry )

1 0

Dmitry Timoshkov : server: Add a process flag indicating whether the process is terminating, use it to block thread creation in a being terminated process.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: af3d73b035752033e51bee09dd4a62df5b846069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3d73b035752033e51bee09d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:39:27 2013 +0900 server: Add a process flag indicating whether the process is terminating, use it to block thread creation in a being terminated process. --- dlls/kernel32/tests/loader.c | 1 - server/process.c | 3 +++ server/process.h | 1 + server/thread.c | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index d119196..e4176b5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1525,7 +1525,6 @@ static void child_process(const char *dll_name, DWORD target_offset) SetLastError(0xdeadbeef); thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); -todo_wine ok(!thread || broken(thread != 0) /* before win7 */, "CreateThread should fail\n"); if (!thread) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); diff --git a/server/process.c b/server/process.c index 74a289a..89c08dc 100644 --- a/server/process.c +++ b/server/process.c @@ -323,6 +323,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->suspend = 0; process->is_system = 0; process->debug_children = 0; + process->is_terminating = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; @@ -570,6 +571,8 @@ static void terminate_process( struct process *process, struct thread *skip, int struct thread *thread; grab_object( process ); /* make sure it doesn't get freed when threads die */ + process->is_terminating = 1; + restart: LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { diff --git a/server/process.h b/server/process.h index f216ecd..a50b537 100644 --- a/server/process.h +++ b/server/process.h @@ -74,6 +74,7 @@ struct process int suspend; /* global process suspend count */ unsigned int is_system:1; /* is it a system process? */ unsigned int debug_children:1;/* also debug all child processes */ + unsigned int is_terminating:1;/* is process terminating? */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */ diff --git a/server/thread.c b/server/thread.c index 69d547c..b54b3b1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -214,6 +214,12 @@ struct thread *create_thread( int fd, struct process *process ) { struct thread *thread; + if (process->is_terminating) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return NULL; + } + if (!(thread = alloc_object( &thread_ops ))) return NULL; init_thread_structure( thread );

1 0

Ken Thomases : winemac: Implement SetCapture().
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 1a697e15b9c156a9e7586a8620dd4e2141f780e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a697e15b9c156a9e7586a862… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:55 2013 -0500 winemac: Implement SetCapture(). --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 145 ++++++++++++++++++++++++------------- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 31 +++++++-- dlls/winemac.drv/winemac.drv.spec | 3 +- 6 files changed, 125 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a697e15b9c156a9e7586…

1 0

Ken Thomases : winemac: Mouse drags don' t imply anything about z-order of target window because of implicit capture .
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 3eee56668ae20c3356ad296eb934f5faa3ebaf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eee56668ae20c3356ad296eb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:52 2013 -0500 winemac: Mouse drags don't imply anything about z-order of target window because of implicit capture. --- dlls/winemac.drv/cocoa_app.m | 4 +++- dlls/winemac.drv/cocoa_event.m | 3 ++- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 16 ++++++++-------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4e15d0..52b6f2d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1157,12 +1157,13 @@ int macdrv_err_on; - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; + BOOL drag = [anEvent type] != NSMouseMoved; /* 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) + if (!drag) { CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; @@ -1276,6 +1277,7 @@ int macdrv_err_on; if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) { event->mouse_moved.time_ms = [self ticksForEventTime:[anEvent timestamp]]; + event->mouse_moved.drag = drag; [targetWindow.queue postEvent:event]; } diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 7c41d26..8d997d0 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -162,7 +162,8 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea (lastEvent = [events lastObject]) && (lastEvent->event->type == MOUSE_MOVED || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && - lastEvent->event->window == event->event->window) + lastEvent->event->window == event->event->window && + lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) { if (event->event->type == MOUSE_MOVED) { diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 39f229d..eb3ed88 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -227,6 +227,7 @@ typedef struct macdrv_event { struct { int x; int y; + int drag; unsigned long time_ms; } mouse_moved; struct { diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index da3cc31..248684d 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -134,14 +134,14 @@ static const CFStringRef cocoa_cursor_names[] = * Update the various window states on a mouse event. */ static void send_mouse_input(HWND hwnd, UINT flags, int x, int y, - DWORD mouse_data, unsigned long time) + DWORD mouse_data, BOOL drag, unsigned long time) { INPUT input; HWND top_level_hwnd; top_level_hwnd = GetAncestor(hwnd, GA_ROOT); - if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE)) + if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE) && !drag) { RECT rect; @@ -854,7 +854,7 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, flags | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_button.x, event->mouse_button.y, - data, event->mouse_button.time_ms); + data, FALSE, event->mouse_button.time_ms); } @@ -867,16 +867,16 @@ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) { UINT flags = MOUSEEVENTF_MOVE; - TRACE("win %p/%p %s (%d,%d) time %lu (%lu ticks ago)\n", hwnd, event->window, + TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window, (event->type == MOUSE_MOVED) ? "relative" : "absolute", - event->mouse_moved.x, event->mouse_moved.y, + event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, event->mouse_moved.time_ms, (GetTickCount() - event->mouse_moved.time_ms)); if (event->type == MOUSE_MOVED_ABSOLUTE) flags |= MOUSEEVENTF_ABSOLUTE; send_mouse_input(hwnd, flags, event->mouse_moved.x, event->mouse_moved.y, - 0, event->mouse_moved.time_ms); + 0, event->mouse_moved.drag, event->mouse_moved.time_ms); } @@ -894,8 +894,8 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.y_scroll, event->mouse_scroll.time_ms); + event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); send_mouse_input(hwnd, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.x_scroll, event->mouse_scroll.time_ms); + event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); }

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

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: 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: 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 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

← Newer
1
...
41
42
43
44
45
46
47
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013