Module: wine Branch: master Commit: 4998bbacef89875db65b80d96e1bd43c3033c2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4998bbacef89875db65b80d96...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jun 3 02:00:15 2022 +0200
winemac: Rename MOUSE_MOVE_RELATIVE to avoid collision with wincontypes.h.
Signed-off-by: Jacek Caban jacek@codeweavers.com
---
dlls/winemac.drv/cocoa_app.m | 4 ++-- dlls/winemac.drv/cocoa_event.m | 6 +++--- dlls/winemac.drv/event.c | 6 +++--- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/mouse.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b5a3059382e..b13bc678c6d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1188,7 +1188,7 @@ static NSString* WineLocalizedString(unsigned int stringID) [eventQueuesLock lock]; for (queue in eventQueues) { - [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | + [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED_RELATIVE) | event_mask_for_type(MOUSE_MOVED_ABSOLUTE) forWindow:nil]; [queue resetMouseEventPositions:pos]; @@ -1444,7 +1444,7 @@ static NSString* WineLocalizedString(unsigned int stringID) mouseMoveDeltaX += [anEvent deltaX]; mouseMoveDeltaY += [anEvent deltaY];
- event = macdrv_create_event(MOUSE_MOVED, targetWindow); + event = macdrv_create_event(MOUSE_MOVED_RELATIVE, targetWindow); event->mouse_moved.x = mouseMoveDeltaX * scale; event->mouse_moved.y = mouseMoveDeltaY * scale;
diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 868ce5a7813..24f69b17a0a 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -204,17 +204,17 @@ static const OSType WineHotKeySignature = 'Wine'; }]; [events removeObjectsAtIndexes:indexes];
- if ((event->event->type == MOUSE_MOVED || + if ((event->event->type == MOUSE_MOVED_RELATIVE || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX && (lastEvent = [events lastObject]) && - (lastEvent->event->type == MOUSE_MOVED || + (lastEvent->event->type == MOUSE_MOVED_RELATIVE || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && lastEvent->event->deliver == INT_MAX && lastEvent->event->window == event->event->window && lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) { - if (event->event->type == MOUSE_MOVED) + if (event->event->type == MOUSE_MOVED_RELATIVE) { lastEvent->event->mouse_moved.x += event->event->mouse_moved.x; lastEvent->event->mouse_moved.y += event->event->mouse_moved.y; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 361709010c9..aed8f94076a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -44,7 +44,7 @@ static const char *dbgstr_event(int type) "KEYBOARD_CHANGED", "LOST_PASTEBOARD_OWNERSHIP", "MOUSE_BUTTON", - "MOUSE_MOVED", + "MOUSE_MOVED_RELATIVE", "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", @@ -100,7 +100,7 @@ static macdrv_event_mask get_event_mask(DWORD mask)
if (mask & QS_MOUSEMOVE) { - event_mask |= event_mask_for_type(MOUSE_MOVED); + event_mask |= event_mask_for_type(MOUSE_MOVED_RELATIVE); event_mask |= event_mask_for_type(MOUSE_MOVED_ABSOLUTE); }
@@ -325,7 +325,7 @@ void macdrv_handle_event(const macdrv_event *event) case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; - case MOUSE_MOVED: + case MOUSE_MOVED_RELATIVE: case MOUSE_MOVED_ABSOLUTE: macdrv_mouse_moved(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 94f9fbcfa17..27b130ca32e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -328,7 +328,7 @@ enum { KEYBOARD_CHANGED, LOST_PASTEBOARD_OWNERSHIP, MOUSE_BUTTON, - MOUSE_MOVED, + MOUSE_MOVED_RELATIVE, MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 078b674d7c0..00ec9a36c38 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -892,14 +892,14 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) /*********************************************************************** * macdrv_mouse_moved * - * Handler for MOUSE_MOVED and MOUSE_MOVED_ABSOLUTE events. + * Handler for MOUSE_MOVED_RELATIVE and MOUSE_MOVED_ABSOLUTE events. */ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) { UINT flags = MOUSEEVENTF_MOVE;
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->type == MOUSE_MOVED_RELATIVE) ? "relative" : "absolute", event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, event->mouse_moved.time_ms, (NtGetTickCount() - event->mouse_moved.time_ms));