February 2013 - Wine-commits

Jacek Caban : mshtml: Don' t report IHTMLTextContainer as supported in anchor element.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: f242d1ba838aa9a911f0919fe50796d8a742616a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f242d1ba838aa9a911f0919fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 25 12:35:11 2013 +0100 mshtml: Don't report IHTMLTextContainer as supported in anchor element. --- dlls/mshtml/htmlanchor.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index bfcf466..2b6d818 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -686,7 +686,6 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, HTMLELEMENT_TIDS, - IHTMLTextContainer_tid, IHTMLUniqueName_tid, 0 };

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::get_hostname implementation .
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 6c05460061fdef06150b828a9e1892455a68debf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c05460061fdef06150b828a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 25 12:35:23 2013 +0100 mshtml: Added IHTMLAnchorElement::get_hostname implementation. --- dlls/mshtml/htmlanchor.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 2b6d818..2478472 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -374,8 +374,14 @@ static HRESULT WINAPI HTMLAnchorElement_put_hostname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_hostname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString hostname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&hostname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHostname(This->nsanchor, &hostname_str); + return return_nsstr(nsres, &hostname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2013b53..70ba26d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1370,6 +1370,21 @@ static void _test_anchor_put_name(unsigned line, IUnknown *unk, const char *name _test_anchor_name(line, unk, name); } +#define test_anchor_hostname(a,h) _test_anchor_hostname(__LINE__,a,h) +static void _test_anchor_hostname(unsigned line, IUnknown *unk, const char *hostname) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_hostname(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(hostname) + ok_(__FILE__,line)(!strcmp_wa(str, hostname), "hostname = %s, expected %s\n", wine_dbgstr_w(str), hostname); + else + ok_(__FILE__,line)(str == NULL, "hostname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) @@ -6035,10 +6050,12 @@ static void test_elems(IHTMLDocument2 *doc) /* Change the href */ test_anchor_put_href((IUnknown*)elem, "http://test1/"); test_anchor_href((IUnknown*)elem, "http://test1/"); + test_anchor_hostname((IUnknown*)elem, "test1"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, "http://test/"); test_anchor_href((IUnknown*)elem, "http://test/"); + test_anchor_hostname((IUnknown*)elem, "test"); /* target */ test_anchor_get_target((IUnknown*)elem, NULL);

1 0

Ken Thomases : winemac: Implement ClipCursor().
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 9b0fdc645f1a27085a6ca94d8e2160519e79f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0fdc645f1a27085a6ca94d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:51 2013 -0600 winemac: Implement ClipCursor(). --- dlls/winemac.drv/cocoa_app.h | 8 + dlls/winemac.drv/cocoa_app.m | 408 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 15 +- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 26 +++ dlls/winemac.drv/winemac.drv.spec | 1 + 6 files changed, 442 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b0fdc645f1a27085a6ca…

1 0

André Hentschel : winedbg: There is no hardware single stepping support on ARM.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 371bbf8db4089999166d5b9ceccc148cc1b867b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371bbf8db4089999166d5b9ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 23 17:34:26 2013 +0100 winedbg: There is no hardware single stepping support on ARM. --- programs/winedbg/be_arm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 00b6f5c..5d14a37 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1686,7 +1686,6 @@ static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) static void be_arm_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("be_arm_single_step: not done\n"); } static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs)

1 0

Dmitry Timoshkov : gdiplus: Round up when converting from 32-bit ARGB to PARGB.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: d23bfd8dfc74a1955a0270feaf07ccd7a23a723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23bfd8dfc74a1955a0270fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:30:32 2013 +0800 gdiplus: Round up when converting from 32-bit ARGB to PARGB. --- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 1c016be..f199055 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -442,9 +442,9 @@ void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, for (x=0; x<width; x++) { BYTE alpha=src[3]; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; - *dst++ = *src++ * alpha / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; + *dst++ = (*src++ * alpha + 127) / 255; *dst++ = *src++; } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a075b42..feab70b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4129,7 +4129,6 @@ static void test_ARGB_conversion(void) ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); match = !memcmp(data.Scan0, pargb, sizeof(pargb)); -todo_wine ok(match, "bits don't match\n"); if (!match) {

1 0

Dmitry Timoshkov : gdiplus: If a device doesn't support AlphaBlend don' t convert image to PARGB.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 1896e5575ef63919fefbe3bfc587f41be086b211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896e5575ef63919fefbe3bfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:31:12 2013 +0800 gdiplus: If a device doesn't support AlphaBlend don't convert image to PARGB. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 01e127c..853027c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -398,8 +398,11 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + memcpy(temp_bits, src, src_width * src_height * 4); + else + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height,

1 0

Ken Thomases : winemac: Implement SetCursor() and DestroyCursorIcon().
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: a49df4b3172dda83262fdea9125dabf3a2bb3445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49df4b3172dda83262fdea91… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:21 2013 -0600 winemac: Implement SetCursor() and DestroyCursorIcon(). --- dlls/winemac.drv/cocoa_app.h | 5 + dlls/winemac.drv/cocoa_app.m | 142 +++++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/macdrv_main.c | 34 +++ dlls/winemac.drv/mouse.c | 577 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 766 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49df4b3172dda83262fd…

1 0

Ken Thomases : winemac: Use system cursors when possible.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: b79d955342754df7aee8143e530d2054c092bece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79d955342754df7aee8143e5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:25 2013 -0600 winemac: Use system cursors when possible. --- dlls/winemac.drv/mouse.c | 215 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 196 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 4d87324..8e16388 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -44,6 +44,90 @@ static CRITICAL_SECTION cursor_cache_section = { &critsect_debug, -1, 0, 0, 0, 0 static CFMutableDictionaryRef cursor_cache; +struct system_cursors +{ + WORD id; + CFStringRef name; +}; + +static const struct system_cursors user32_cursors[] = +{ + { OCR_NORMAL, CFSTR("arrowCursor") }, + { OCR_IBEAM, CFSTR("IBeamCursor") }, + { OCR_CROSS, CFSTR("crosshairCursor") }, + { OCR_SIZEWE, CFSTR("resizeLeftRightCursor") }, + { OCR_SIZENS, CFSTR("resizeUpDownCursor") }, + { OCR_NO, CFSTR("operationNotAllowedCursor") }, + { OCR_HAND, CFSTR("pointingHandCursor") }, + { 0 } +}; + +static const struct system_cursors comctl32_cursors[] = +{ + { 102, CFSTR("closedHandCursor") }, + { 104, CFSTR("dragCopyCursor") }, + { 105, CFSTR("arrowCursor") }, + { 106, CFSTR("resizeLeftRightCursor") }, + { 107, CFSTR("resizeLeftRightCursor") }, + { 108, CFSTR("pointingHandCursor") }, + { 135, CFSTR("resizeUpDownCursor") }, + { 0 } +}; + +static const struct system_cursors ole32_cursors[] = +{ + { 1, CFSTR("operationNotAllowedCursor") }, + { 2, CFSTR("closedHandCursor") }, + { 3, CFSTR("dragCopyCursor") }, + { 4, CFSTR("dragLinkCursor") }, + { 0 } +}; + +static const struct system_cursors riched20_cursors[] = +{ + { 105, CFSTR("pointingHandCursor") }, + { 109, CFSTR("dragCopyCursor") }, + { 110, CFSTR("closedHandCursor") }, + { 111, CFSTR("operationNotAllowedCursor") }, + { 0 } +}; + +static const struct +{ + const struct system_cursors *cursors; + WCHAR name[16]; +} module_cursors[] = +{ + { user32_cursors, {'u','s','e','r','3','2','.','d','l','l',0} }, + { comctl32_cursors, {'c','o','m','c','t','l','3','2','.','d','l','l',0} }, + { ole32_cursors, {'o','l','e','3','2','.','d','l','l',0} }, + { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } +}; + +/* The names of NSCursor class methods which return cursor objects. */ +static const CFStringRef cocoa_cursor_names[] = +{ + CFSTR("arrowCursor"), + CFSTR("closedHandCursor"), + CFSTR("contextualMenuCursor"), + CFSTR("crosshairCursor"), + CFSTR("disappearingItemCursor"), + CFSTR("dragCopyCursor"), + CFSTR("dragLinkCursor"), + CFSTR("IBeamCursor"), + CFSTR("IBeamCursorForVerticalLayout"), + CFSTR("openHandCursor"), + CFSTR("operationNotAllowedCursor"), + CFSTR("pointingHandCursor"), + CFSTR("resizeDownCursor"), + CFSTR("resizeLeftCursor"), + CFSTR("resizeLeftRightCursor"), + CFSTR("resizeRightCursor"), + CFSTR("resizeUpCursor"), + CFSTR("resizeUpDownCursor"), +}; + + /*********************************************************************** * send_mouse_input * @@ -90,6 +174,90 @@ static void send_mouse_input(HWND hwnd, UINT flags, int x, int y, /*********************************************************************** + * copy_system_cursor_name + */ +CFStringRef copy_system_cursor_name(ICONINFOEXW *info) +{ + static const WCHAR idW[] = {'%','h','u',0}; + const struct system_cursors *cursors; + unsigned int i; + CFStringRef cursor_name = NULL; + HMODULE module; + HKEY key; + WCHAR *p, name[MAX_PATH * 2]; + + TRACE("info->szModName %s info->szResName %s info->wResID %hu\n", debugstr_w(info->szModName), + debugstr_w(info->szResName), info->wResID); + + if (!info->szModName[0]) return NULL; + + p = strrchrW(info->szModName, '\\'); + strcpyW(name, p ? p + 1 : info->szModName); + p = name + strlenW(name); + *p++ = ','; + if (info->szResName[0]) strcpyW(p, info->szResName); + else sprintfW(p, idW, info->wResID); + + /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver\Cursors */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Mac Driver\\Cursors", &key)) + { + WCHAR value[64]; + DWORD size, ret; + + value[0] = 0; + size = sizeof(value) / sizeof(WCHAR); + ret = RegQueryValueExW(key, name, NULL, NULL, (BYTE *)value, &size); + RegCloseKey(key); + if (!ret) + { + if (!value[0]) + { + TRACE("registry forces standard cursor for %s\n", debugstr_w(name)); + return NULL; /* force standard cursor */ + } + + cursor_name = CFStringCreateWithCharacters(NULL, value, strlenW(value)); + if (!cursor_name) + { + WARN("CFStringCreateWithCharacters failed for %s\n", debugstr_w(value)); + return NULL; + } + + /* Make sure it's one of the appropriate NSCursor class methods. */ + for (i = 0; i < sizeof(cocoa_cursor_names) / sizeof(cocoa_cursor_names[0]); i++) + if (CFEqual(cursor_name, cocoa_cursor_names[i])) + goto done; + + WARN("%s mapped to invalid Cocoa cursor name %s\n", debugstr_w(name), debugstr_w(value)); + CFRelease(cursor_name); + return NULL; + } + } + + if (info->szResName[0]) goto done; /* only integer resources are supported here */ + if (!(module = GetModuleHandleW(info->szModName))) goto done; + + for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + if (GetModuleHandleW(module_cursors[i].name) == module) break; + if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + + cursors = module_cursors[i].cursors; + for (i = 0; cursors[i].id; i++) + if (cursors[i].id == info->wResID) + { + cursor_name = CFRetain(cursors[i].name); + break; + } + +done: + if (cursor_name) + TRACE("%s -> %s\n", debugstr_w(name), debugstr_cf(cursor_name)); + else + WARN("no system cursor found for %s\n", debugstr_w(name)); + return cursor_name; +} + +/*********************************************************************** * release_provider_cfdata * * Helper for create_monochrome_cursor. A CFData is used by two @@ -580,8 +748,6 @@ void CDECL macdrv_SetCursor(HCURSOR cursor) if (cursor) { ICONINFOEXW info; - BITMAP bm; - HDC hdc; EnterCriticalSection(&cursor_cache_section); if (cursor_cache) @@ -606,28 +772,39 @@ void CDECL macdrv_SetCursor(HCURSOR cursor) return; } - GetObjectW(info.hbmMask, sizeof(bm), &bm); - if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); - - /* make sure hotspot is valid */ - if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + if ((cursor_name = copy_system_cursor_name(&info))) { - info.xHotspot = bm.bmWidth / 2; - info.yHotspot = bm.bmHeight / 2; - } - - hdc = CreateCompatibleDC(0); - - if (info.hbmColor) - { - cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); } else - cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); + { + BITMAP bm; + HDC hdc; + + GetObjectW(info.hbmMask, sizeof(bm), &bm); + if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); - DeleteObject(info.hbmMask); - DeleteDC(hdc); + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + + hdc = CreateCompatibleDC(0); + + if (info.hbmColor) + { + cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); + DeleteObject(info.hbmColor); + } + else + cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); + + DeleteObject(info.hbmMask); + DeleteDC(hdc); + } if (cursor_name || cursor_frames) {

1 0

Ken Thomases : winemac: Implement GetCursorPos().
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 38f7a4d518c66537d0919ac07904332cb8f4e208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f7a4d518c66537d0919ac07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:29 2013 -0600 winemac: Implement GetCursorPos(). --- dlls/winemac.drv/cocoa_app.m | 17 +++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 19 +++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 44fa282..d22596e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -815,3 +815,20 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) } } } + +/*********************************************************************** + * macdrv_get_cursor_position + * + * Obtains the current cursor position. Returns zero on failure, + * non-zero on success. + */ +int macdrv_get_cursor_position(CGPoint *pos) +{ + OnMainThread(^{ + NSPoint location = [NSEvent mouseLocation]; + location = [NSApp flippedMouseLocation:location]; + *pos = NSPointToCGPoint(location); + }); + + return TRUE; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 269dbea..c3ad6ba 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -120,6 +120,7 @@ extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN; +extern int macdrv_get_cursor_position(CGPoint *pos) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 8e16388..b0288f6 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -736,6 +736,25 @@ void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) /*********************************************************************** + * GetCursorPos (MACDRV.@) + */ +BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) +{ + CGPoint pt; + BOOL ret; + + ret = macdrv_get_cursor_position(&pt); + if (ret) + { + TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); + pos->x = pt.x; + pos->y = pt.y; + } + return ret; +} + + +/*********************************************************************** * SetCursor (MACDRV.@) */ void CDECL macdrv_SetCursor(HCURSOR cursor) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 6fd4bef..99746b4 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -13,6 +13,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText

1 0

Ken Thomases : winemac: Handle mouse moves in -[WineApplication sendEvent:] instead of WineWindow.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 0a56ef356a2932b503ce1331df4fc17898de5514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a56ef356a2932b503ce1331d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:32 2013 -0600 winemac: Handle mouse moves in -[WineApplication sendEvent:] instead of WineWindow. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 44 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 3 +- dlls/winemac.drv/cocoa_window.m | 19 ++-------------- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0447d47..32e4180 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -47,6 +47,9 @@ CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + WineWindow* lastTargetWindow; + BOOL forceNextMouseMoveAbsolute; + NSMutableArray* orderedWineWindows; NSMutableDictionary* originalDisplayModes; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d22596e..7e22221 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -554,10 +554,40 @@ int macdrv_err_on; */ - (void) sendEvent:(NSEvent*)anEvent { - if ([anEvent type] == NSFlagsChanged) + NSEventType type = [anEvent type]; + if (type == NSFlagsChanged) self.lastFlagsChanged = anEvent; [super sendEvent:anEvent]; + + if (type == NSMouseMoved || type == NSLeftMouseDragged || + type == NSRightMouseDragged || type == NSOtherMouseDragged) + { + WineWindow* targetWindow; + + targetWindow = (WineWindow*)[anEvent window]; + + if ([targetWindow isKindOfClass:[WineWindow class]]) + { + BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); + forceNextMouseMoveAbsolute = FALSE; + + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + lastTargetWindow = targetWindow; + } + else + lastTargetWindow = nil; + } + else if (type == NSLeftMouseDown || type == NSLeftMouseUp || + type == NSRightMouseDown || type == NSRightMouseUp || + type == NSOtherMouseDown || type == NSOtherMouseUp || + 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. + forceNextMouseMoveAbsolute = TRUE; + } } @@ -583,12 +613,22 @@ int macdrv_err_on; // activated. This will provoke a re-synchronization of Wine's notion of // the desktop rect with the actual state. [self sendDisplaysChanged:TRUE]; + + // The cursor probably moved while we were inactive. Accumulated mouse + // movement deltas are invalidated. Make sure the next mouse move event + // starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; } - (void)applicationDidChangeScreenParameters:(NSNotification *)notification { primaryScreenHeightValid = FALSE; [self sendDisplaysChanged:FALSE]; + + // When the display configuration changes, the cursor position may jump. + // Accumulated mouse movement deltas are invalidated. Make sure the next + // mouse move event starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; } - (void)applicationDidResignActive:(NSNotification *)notification @@ -627,6 +667,8 @@ int macdrv_err_on; NSWindow* window = [note object]; [keyWindows removeObjectIdenticalTo:window]; [orderedWineWindows removeObjectIdenticalTo:window]; + if (window == lastTargetWindow) + lastTargetWindow = nil; }]; [nc addObserver:self diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 0aecf83..ea7988d 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -48,7 +48,6 @@ NSUInteger lastModifierFlags; - BOOL forceNextMouseMoveAbsolute; double mouseMoveDeltaX, mouseMoveDeltaY; NSInteger levelWhenActive; @@ -64,4 +63,6 @@ - (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 af624a7..b8bc79d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -264,7 +264,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (!window) return nil; window->normalStyleMask = [window styleMask]; - window->forceNextMouseMoveAbsolute = TRUE; /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ @@ -285,8 +284,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [contentView setAutoresizesSubviews:NO]; trackingArea = [[[NSTrackingArea alloc] initWithRect:[contentView bounds] - options:(NSTrackingMouseEnteredAndExited | - NSTrackingMouseMoved | + options:(NSTrackingMouseMoved | NSTrackingActiveAlways | NSTrackingInVisibleRect) owner:window @@ -508,7 +506,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { self.latentParentWindow = [self parentWindow]; [latentParentWindow removeChildWindow:self]; - forceNextMouseMoveAbsolute = TRUE; [self orderOut:nil]; [NSApp wineWindow:self ordered:NSWindowOut relativeTo:nil]; [NSApp removeWindowsItem:self]; @@ -739,11 +736,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event:theEvent]; } - - (void) postMouseMovedEvent:(NSEvent *)theEvent + - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute { macdrv_event event; - if (forceNextMouseMoveAbsolute) + if (absolute) { CGPoint point = CGEventGetLocation([theEvent CGEvent]); @@ -753,8 +750,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) mouseMoveDeltaX = 0; mouseMoveDeltaY = 0; - - forceNextMouseMoveAbsolute = FALSE; } else { @@ -961,14 +956,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } - - (void) mouseEntered:(NSEvent *)theEvent { forceNextMouseMoveAbsolute = TRUE; } - - (void) mouseExited:(NSEvent *)theEvent { forceNextMouseMoveAbsolute = TRUE; } - - - (void) mouseMoved:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) mouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) rightMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) otherMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) scrollWheel:(NSEvent *)theEvent { CGPoint pt;

1 0