February 2013 - Wine-commits

Detlef Riekenberg : kernel32/tests: Skip tests on non-English systems.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 8f1a3604ac15dc9d06cf4733f2353fe780a2c08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1a3604ac15dc9d06cf4733f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 11 00:03:30 2013 +0100 kernel32/tests: Skip tests on non-English systems. --- dlls/kernel32/tests/locale.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ebd7278..e9c83b8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -280,11 +280,23 @@ static void test_GetLocaleInfoW(void) ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SCOUNTRY, bufferW, COUNTOF(bufferW)); ok(ret, "got %d\n", ret); - ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SLANGUAGE, bufferW, COUNTOF(bufferW)); ok(ret, "got %d\n", ret); - ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); while (*ptr->name) { @@ -3434,7 +3446,13 @@ static void test_GetLocaleInfoEx(void) ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); - ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW)); bufferW[0] = 0; SetLastError(0xdeadbeef);

1 0

Ken Thomases : user32: Improve mouse wheel scrolling in edit control.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 1642d312fd8ae98df7f24a59307a72a639a269c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1642d312fd8ae98df7f24a593… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:50 2013 -0600 user32: Improve mouse wheel scrolling in edit control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/user32/edit.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ada313f..74e0ea4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -140,6 +140,7 @@ typedef struct Even if parent will change, EN_* messages should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ + INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ /* * only for multi line controls */ @@ -3551,6 +3552,8 @@ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) if(!(es->style & ES_NOHIDESEL)) EDIT_InvalidateText(es, es->selection_start, es->selection_end); EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + /* throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; return 0; } @@ -5108,7 +5111,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_MOUSEWHEEL: { - int gcWheelDelta = 0; + int wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -5116,12 +5119,20 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B result = DefWindowProcW(hwnd, msg, wParam, lParam); break; } - gcWheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam); - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && es->wheelDeltaRemainder < 0) || + (wheelDelta > 0 && es->wheelDeltaRemainder > 0)) + es->wheelDeltaRemainder += wheelDelta; + else + es->wheelDeltaRemainder = wheelDelta; + if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll= (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - result = EDIT_EM_LineScroll(es, 0, cLineScroll); + int cLineScroll; + pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } } break;

1 0

Ken Thomases : user32: Improve mouse wheel scrolling in listbox control.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: f42cfc04eb05fa266cfae0c64452686a68c24151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42cfc04eb05fa266cfae0c64… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:54 2013 -0600 user32: Improve mouse wheel scrolling in listbox control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/user32/listbox.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b3709ef..0f4a8be 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -90,6 +90,7 @@ typedef struct INT nb_tabs; /* Number of tabs in array */ INT *tabs; /* Array of tabs */ INT avg_char_width; /* Average width of characters */ + INT wheel_remain; /* Left over scroll amount */ BOOL caret_on; /* Is caret on? */ BOOL captured; /* Is mouse captured? */ BOOL in_focus; @@ -1988,18 +1989,24 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - short gcWheelDelta = 0; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= delta; + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && descr->wheel_remain < 0) || + (delta > 0 && descr->wheel_remain > 0)) + descr->wheel_remain += delta; + else + descr->wheel_remain = delta; - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (descr->wheel_remain && pulScrollLines) { - int cLineScroll = (int) min((UINT) descr->page_size, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - LISTBOX_SetTopItem( descr, descr->top_item + cLineScroll, TRUE ); + int cLineScroll; + pulScrollLines = min((UINT) descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; } @@ -2482,6 +2489,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->horz_pos = 0; descr->nb_tabs = 0; descr->tabs = NULL; + descr->wheel_remain = 0; descr->caret_on = !lphc; if (descr->style & LBS_NOSEL) descr->caret_on = FALSE; descr->in_focus = FALSE; @@ -2989,6 +2997,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return 0; case WM_KILLFOCUS: descr->in_focus = FALSE; + descr->wheel_remain = 0; if ((descr->focus_item != -1) && descr->caret_on) LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); SEND_NOTIFICATION( descr, LBN_KILLFOCUS );

1 0

Ken Thomases : comctl32: Eliminate redundant local variable (gcWheelDelta = = -wheelDelta).
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 930e84dfd22e100410cdf3d082262c3812970a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930e84dfd22e100410cdf3d08… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:59 2013 -0600 comctl32: Eliminate redundant local variable (gcWheelDelta == -wheelDelta). --- dlls/comctl32/listview.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc8997a..5f25e85 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9785,13 +9785,11 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - INT gcWheelDelta = 0; INT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= wheelDelta; switch(infoPtr->uView) { @@ -9801,21 +9799,21 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) * listview should be scrolled by a multiple of 37 dependently on its dimension or its visible item number * should be fixed in the future. */ - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (gcWheelDelta < 0) ? + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (wheelDelta > 0) ? -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE); break; case LV_VIEW_DETAILS: - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (abs(wheelDelta) >= WHEEL_DELTA && pulScrollLines) { int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); + cLineScroll *= (-wheelDelta / WHEEL_DELTA); LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); } break; case LV_VIEW_LIST: - LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0); + LISTVIEW_HScroll(infoPtr, (wheelDelta > 0) ? SB_LINELEFT : SB_LINERIGHT, 0); break; } return 0;

1 0

Ken Thomases : comctl32: Improve mouse wheel scrolling in listview control.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 858acfbb0ddbe0ba08d965932b556c1cd7c4b8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858acfbb0ddbe0ba08d965932… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:03 2013 -0600 comctl32: Improve mouse wheel scrolling in listview control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/comctl32/listview.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5f25e85..2d75f85 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -330,6 +330,7 @@ typedef struct tagLISTVIEW_INFO INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ DWORD dwHoverTime; HCURSOR hHotCursor; + INT cWheelRemainder; /* keyboard operation */ DWORD lastKeyPressTimestamp; @@ -9385,6 +9386,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ + infoPtr->cWheelRemainder = 0; infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; @@ -9785,12 +9787,10 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - INT pulScrollLines = 3; + UINT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - switch(infoPtr->uView) { case LV_VIEW_ICON: @@ -9804,11 +9804,21 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) break; case LV_VIEW_DETAILS: - if (abs(wheelDelta) >= WHEEL_DELTA && pulScrollLines) + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->cWheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->cWheelRemainder > 0)) + infoPtr->cWheelRemainder += wheelDelta; + else + infoPtr->cWheelRemainder = wheelDelta; + if (infoPtr->cWheelRemainder && pulScrollLines) { - int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll *= (-wheelDelta / WHEEL_DELTA); - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); + int cLineScroll; + pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); + cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break; @@ -9940,7 +9950,10 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) { TRACE("()\n"); - /* if we did not have the focus, there's nothing to do */ + /* drop any left over scroll amount */ + infoPtr->cWheelRemainder = 0; + + /* if we did not have the focus, there's nothing more to do */ if (!infoPtr->bFocus) return 0; /* send NM_KILLFOCUS notification */

1 0

Ken Thomases : comctl32: Improve mouse wheel scrolling in treeview control.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: c5858c16a665b13a9798a80be9de698dbf52b109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5858c16a665b13a9798a80be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:08 2013 -0600 comctl32: Improve mouse wheel scrolling in treeview control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/comctl32/treeview.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b0cbc7a..46ef751 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -102,6 +102,7 @@ typedef struct tagTREEVIEW_INFO BOOL insertBeforeorAfter; /* flag used by TVM_SETINSERTMARK */ HIMAGELIST dragList; /* Bitmap of dragged item */ LONG scrollX; + INT wheelRemainder; COLORREF clrBk; COLORREF clrText; COLORREF clrLine; @@ -4925,7 +4926,7 @@ scroll: static LRESULT TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - short gcWheelDelta; + short wheelDelta; UINT pulScrollLines = 3; if (wParam & (MK_SHIFT | MK_CONTROL)) @@ -4936,13 +4937,25 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &pulScrollLines, 0); - gcWheelDelta = -(short)HIWORD(wParam); - pulScrollLines *= (gcWheelDelta / WHEEL_DELTA); + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->wheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->wheelRemainder > 0)) + infoPtr->wheelRemainder += wheelDelta; + else + infoPtr->wheelRemainder = wheelDelta; - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (infoPtr->wheelRemainder && pulScrollLines) { - int newDy = infoPtr->firstVisible->visibleOrder + pulScrollLines; - int maxDy = infoPtr->maxVisibleOrder; + int newDy; + int maxDy; + int lineScroll; + + lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA; + infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines; + + newDy = infoPtr->firstVisible->visibleOrder - lineScroll; + maxDy = infoPtr->maxVisibleOrder; if (newDy > maxDy) newDy = maxDy; @@ -5047,6 +5060,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* dragList */ infoPtr->scrollX = 0; + infoPtr->wheelRemainder = 0; infoPtr->clrBk = CLR_NONE; /* use system color */ infoPtr->clrText = CLR_NONE; /* use system color */

1 0

Ken Thomases : winemac: Implement MOUSE_SCROLL events.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 3748c3930837dcdd93c01f19cf6992e359dc6720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3748c3930837dcdd93c01f19c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:12 2013 -0600 winemac: Implement MOUSE_SCROLL events. --- dlls/winemac.drv/cocoa_window.m | 78 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 7 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 8 ++++ dlls/winemac.drv/mouse.c | 21 ++++++++++ 5 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bd6f086..218ba3f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -778,6 +778,84 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) rightMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - (void) otherMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } + - (void) scrollWheel:(NSEvent *)theEvent + { + CGPoint pt; + macdrv_event event; + CGEventRef cgevent; + CGFloat x, y; + BOOL continuous = FALSE; + + cgevent = [theEvent CGEvent]; + pt = CGEventGetLocation(cgevent); + + event.type = MOUSE_SCROLL; + event.window = (macdrv_window)[self retain]; + event.mouse_scroll.x = pt.x; + event.mouse_scroll.y = pt.y; + event.mouse_scroll.time_ms = [NSApp 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]; + } + /* * ---------- NSWindowDelegate methods ---------- diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 1f90c04..f03fef4 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -39,6 +39,7 @@ static const char *dbgstr_event(int type) "MOUSE_BUTTON", "MOUSE_MOVED", "MOUSE_MOVED_ABSOLUTE", + "MOUSE_SCROLL", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_MINIMIZE", "WINDOW_DID_UNMINIMIZE", @@ -69,7 +70,10 @@ static macdrv_event_mask get_event_mask(DWORD mask) } if (mask & QS_MOUSEBUTTON) + { event_mask |= event_mask_for_type(MOUSE_BUTTON); + event_mask |= event_mask_for_type(MOUSE_SCROLL); + } if (mask & QS_MOUSEMOVE) { @@ -126,6 +130,9 @@ void macdrv_handle_event(macdrv_event *event) case MOUSE_MOVED_ABSOLUTE: macdrv_mouse_moved(hwnd, event); break; + case MOUSE_SCROLL: + macdrv_mouse_scroll(hwnd, event); + break; case WINDOW_CLOSE_REQUESTED: macdrv_window_close_requested(hwnd); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 5cfcb8b..8c4ce54 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -136,6 +136,7 @@ extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 388ffb7..23f0edf 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -132,6 +132,7 @@ enum { MOUSE_BUTTON, MOUSE_MOVED, MOUSE_MOVED_ABSOLUTE, + MOUSE_SCROLL, WINDOW_CLOSE_REQUESTED, WINDOW_DID_MINIMIZE, WINDOW_DID_UNMINIMIZE, @@ -170,6 +171,13 @@ typedef struct macdrv_event { unsigned long time_ms; } mouse_moved; struct { + int x_scroll; + int y_scroll; + int x; + int y; + unsigned long time_ms; + } mouse_scroll; + struct { CGRect frame; } window_frame_changed; struct { diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 4742e37..d251808 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -142,3 +142,24 @@ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, flags, event->mouse_moved.x, event->mouse_moved.y, 0, event->mouse_moved.time_ms); } + + +/*********************************************************************** + * macdrv_mouse_scroll + * + * Handler for MOUSE_SCROLL events. + */ +void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) +{ + TRACE("win %p/%p scroll (%d,%d) at (%d,%d) time %lu (%lu ticks ago)\n", hwnd, + event->window, event->mouse_scroll.x_scroll, event->mouse_scroll.y_scroll, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms)); + + 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); + 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); +}

1 0

Ken Thomases : winemac: Prevent Cocoa from consuming certain key-down events.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: a472d39b7dee82ae0cbf67112495d381cecbad5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a472d39b7dee82ae0cbf67112… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:18 2013 -0600 winemac: Prevent Cocoa from consuming certain key-down events. --- dlls/winemac.drv/cocoa_window.m | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 218ba3f..4371110 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -679,18 +679,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) sendEvent:(NSEvent*)event { - if ([event type] == NSLeftMouseDown) + /* NSWindow consumes certain key-down events as part of Cocoa's keyboard + interface control. For example, Control-Tab switches focus among + views. We want to bypass that feature, so directly route key-down + events to -keyDown:. */ + if ([event type] == NSKeyDown) + [[self firstResponder] keyDown:event]; + else { - /* Since our windows generally claim they can't be made key, clicks - in their title bars are swallowed by the theme frame stuff. So, - we hook directly into the event stream and assume that any click - in the window will activate it, if Wine and the Win32 program - accept. */ - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [NSApp windowGotFocus:self]; - } + if ([event type] == NSLeftMouseDown) + { + /* Since our windows generally claim they can't be made key, clicks + in their title bars are swallowed by the theme frame stuff. So, + we hook directly into the event stream and assume that any click + in the window will activate it, if Wine and the Win32 program + accept. */ + if (![self isKeyWindow] && !self.disabled && !self.noActivate) + [NSApp windowGotFocus:self]; + } - [super sendEvent:event]; + [super sendEvent:event]; + } }

1 0

Nikolay Sivov : xmllite: Store start data pointer for comments.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: b97dd9b0e2030261b11e01f6e0382c3a7a6db157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97dd9b0e2030261b11e01f6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 08:38:42 2013 +0400 xmllite: Store start data pointer for comments. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b3f7194..7bec2b1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1035,7 +1035,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) { start = reader->save; ptr = reader_get_cur(reader); - reader->save = NULL; } else { @@ -1044,6 +1043,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_shrink(reader); ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; + reader->save = start; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1067,7 +1067,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); - reader->nodetype = XmlNodeType_Comment; + reader->save = NULL; return S_OK; } else

1 0

Nikolay Sivov : xmllite: Basic test for chunk value read vs full value read .
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 0a7d802ef35ab0397af0263b60bd00ac9294c9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7d802ef35ab0397af0263b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 09:22:23 2013 +0400 xmllite: Basic test for chunk value read vs full value read. --- dlls/xmllite/tests/reader.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index e61600c..65c3448 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1263,6 +1263,60 @@ static void test_read_pending(void) IXmlReader_Release(reader); } +static void test_readvaluechunk(void) +{ + static const char testA[] = ""; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + const WCHAR *value; + WCHAR b; + HRESULT hr; + UINT c; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); +todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 1, "got %u\n", c); + ok(b == ' ', "got %x\n", b); +} + /* portion read as chunk is skipped from resulting node value */ + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + /* once value is returned/allocated it's not possible to read by chunk */ + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); +todo_wine + ok(hr == S_FALSE, "got %08x\n", hr); + ok(c == 0, "got %u\n", c); + ok(b == 0, "got %x\n", b); + + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1285,6 +1339,7 @@ START_TEST(reader) test_read_element(); test_read_full(); test_read_pending(); + test_readvaluechunk(); test_read_xmldeclaration(); CoUninitialize();

1 0