February 2013 - Wine-Commits

Ken Thomases : winemac: Implement support for minimizing windows.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 8a0c8d9264e7309aa44f9744736989f1c2c5da95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0c8d9264e7309aa44f97447… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:07 2013 -0600 winemac: Implement support for minimizing windows. --- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 54 ++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 10 +++++ dlls/winemac.drv/macdrv.h | 5 ++- dlls/winemac.drv/macdrv_cocoa.h | 3 + dlls/winemac.drv/window.c | 81 +++++++++++++++++++++++++++++++++++++- 6 files changed, 151 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a0c8d9264e7309aa44f9…

1 0

Ken Thomases : winemac: Implement ScrollDC().
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 6efd198c521f341e3807c5620f5d3f30088e7386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efd198c521f341e3807c5620… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:03 2013 -0600 winemac: Implement ScrollDC(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/scroll.c | 188 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 3 files changed, 190 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 8484db8..c0bdbb7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ gdi.c \ macdrv_main.c \ mouse.c \ + scroll.c \ surface.c \ window.c diff --git a/dlls/winemac.drv/scroll.c b/dlls/winemac.drv/scroll.c new file mode 100644 index 0000000..e8e7537 --- /dev/null +++ b/dlls/winemac.drv/scroll.c @@ -0,0 +1,188 @@ +/* + * MACDRV window/DC scrolling + * + * Copyright 1993 David W. Metcalfe + * Copyright 1995, 1996 Alex Korobka + * Copyright 2001 Alexandre Julliard + * Copyright 2011, 2013 Ken Thomases for CodeWeavers Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "macdrv.h" +#include "winuser.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scroll); + + +static void dump_region(const char *p, HRGN hrgn) +{ + DWORD i, size; + RGNDATA *data = NULL; + RECT *rect; + + if (!hrgn) + { + TRACE("%s null region\n", p); + return; + } + if (!(size = GetRegionData(hrgn, 0, NULL))) + return; + if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return; + GetRegionData(hrgn, size, data); + TRACE("%s %d rects:", p, data->rdh.nCount); + for (i = 0, rect = (RECT *)data->Buffer; i<20 && i < data->rdh.nCount; i++, rect++) + TRACE(" %s", wine_dbgstr_rect(rect)); + TRACE("\n"); + HeapFree(GetProcessHeap(), 0, data); +} + + +/************************************************************************* + * ScrollDC (MACDRV.@) + */ +BOOL CDECL macdrv_ScrollDC(HDC hdc, INT dx, INT dy, const RECT *lprcScroll, + const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) +{ + RECT rcSrc, rcClip, offset; + INT dxdev, dydev, res; + HRGN DstRgn, clipRgn, visrgn; + + TRACE("dx,dy %d,%d rcScroll %s rcClip %s hrgnUpdate %p lprcUpdate %p\n", + dx, dy, wine_dbgstr_rect(lprcScroll), wine_dbgstr_rect(lprcClip), + hrgnUpdate, lprcUpdate); + + /* get the visible region */ + visrgn = CreateRectRgn(0, 0, 0, 0); + GetRandomRgn(hdc, visrgn, SYSRGN); + if (!(GetVersion() & 0x80000000)) + { + /* Window NT/2k/XP */ + POINT org; + GetDCOrgEx(hdc, &org); + OffsetRgn(visrgn, -org.x, -org.y); + } + + /* intersect with the clipping Region if the DC has one */ + clipRgn = CreateRectRgn(0, 0, 0, 0); + if (GetClipRgn(hdc, clipRgn) != 1) + { + DeleteObject(clipRgn); + clipRgn = NULL; + } + else + CombineRgn(visrgn, visrgn, clipRgn, RGN_AND); + + /* only those pixels in the scroll rectangle that remain in the clipping + * rect are scrolled. */ + if (lprcClip) + rcClip = *lprcClip; + else + GetClipBox(hdc, &rcClip); + rcSrc = rcClip; + OffsetRect(&rcClip, -dx, -dy); + IntersectRect(&rcSrc, &rcSrc, &rcClip); + + /* if an scroll rectangle is specified, only the pixels within that + * rectangle are scrolled */ + if (lprcScroll) + IntersectRect(&rcSrc, &rcSrc, lprcScroll); + + /* now convert to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcSrc, 2); + TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); + + /* also dx and dy */ + SetRect(&offset, 0, 0, dx, dy); + LPtoDP(hdc, (LPPOINT)&offset, 2); + dxdev = offset.right - offset.left; + dydev = offset.bottom - offset.top; + + /* now intersect with the visible region to get the pixels that will + * actually scroll */ + DstRgn = CreateRectRgnIndirect(&rcSrc); + res = CombineRgn(DstRgn, DstRgn, visrgn, RGN_AND); + + /* and translate, giving the destination region */ + OffsetRgn(DstRgn, dxdev, dydev); + if (TRACE_ON(scroll)) dump_region("Destination scroll region: ", DstRgn); + + /* if there are any, do it */ + if (res > NULLREGION) + { + RECT rect ; + /* clip to the destination region, so we can BitBlt with a simple + * bounding rectangle */ + if (clipRgn) + ExtSelectClipRgn(hdc, DstRgn, RGN_AND); + else + SelectClipRgn(hdc, DstRgn); + GetRgnBox(DstRgn, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); + + BitBlt(hdc, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + hdc, rect.left - dx, rect.top - dy, SRCCOPY); + } + + /* compute the update areas. This is the combined clip rectangle + * minus the scrolled region, and intersected with the visible + * region. */ + if (hrgnUpdate || lprcUpdate) + { + HRGN hrgn = hrgnUpdate; + + /* Intersect clip and scroll rectangles, allowing NULL values */ + if (lprcScroll) + if (lprcClip) + IntersectRect(&rcClip, lprcClip, lprcScroll); + else + rcClip = *lprcScroll; + else + if (lprcClip) + rcClip = *lprcClip; + else + GetClipBox(hdc, &rcClip); + + /* Convert the combined clip rectangle to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcClip, 2); + if (hrgn) + SetRectRgn(hrgn, rcClip.left, rcClip.top, rcClip.right, rcClip.bottom); + else + hrgn = CreateRectRgnIndirect(&rcClip); + CombineRgn(hrgn, hrgn, visrgn, RGN_AND); + CombineRgn(hrgn, hrgn, DstRgn, RGN_DIFF); + if (TRACE_ON(scroll)) dump_region("Update region: ", hrgn); + if (lprcUpdate) + { + GetRgnBox(hrgn, lprcUpdate); + /* Put the lprcUpdate in logical coordinates */ + DPtoLP(hdc, (LPPOINT)lprcUpdate, 2); + TRACE("returning lprcUpdate %s\n", wine_dbgstr_rect(lprcUpdate)); + } + if (!hrgnUpdate) + DeleteObject(hrgn); + } + + /* restore original clipping region */ + SelectClipRgn(hdc, clipRgn); + DeleteObject(visrgn); + DeleteObject(DstRgn); + if (clipRgn) DeleteObject(clipRgn); + return TRUE; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a0e1ab8..6f780ed 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx +@ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC @ cdecl SetFocus(long) macdrv_SetFocus @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent

1 0

Dmitry Timoshkov : gdi32: Add support for 16-bit QUERYESCSUPPORT queries.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: c7d33e1d44e14f3227d5a6859e6531514dcc7ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d33e1d44e14f3227d5a6859… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 1 16:01:20 2013 +0800 gdi32: Add support for 16-bit QUERYESCSUPPORT queries. --- dlls/gdi32/driver.c | 8 +++++--- dlls/wineps.drv/escape.c | 9 ++++++--- dlls/winex11.drv/init.c | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6b68499..82706c3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1101,9 +1101,11 @@ INT WINAPI Escape( HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out case QUERYESCSUPPORT: { - const INT *ptr = (const INT *)in_data; - if (in_count < sizeof(INT)) return 0; - switch(*ptr) + DWORD code; + + if (in_count < sizeof(SHORT)) return 0; + code = (in_count < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; + switch (code) { case ABORTDOC: case ENDDOC: diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index d2a8d2a..6e89837 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -66,15 +66,18 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p,%d,%d,%p,%d,%p\n", + dev->hdc, nEscape, cbInput, in_data, cbOutput, out_data); + switch(nEscape) { case QUERYESCSUPPORT: - if(cbInput < sizeof(INT)) + if(cbInput < sizeof(SHORT)) { - WARN("cbInput < sizeof(INT) (=%d) for QUERYESCSUPPORT\n", cbInput); + WARN("cbInput < sizeof(SHORT) (=%d) for QUERYESCSUPPORT\n", cbInput); return 0; } else { - UINT num = *(const UINT *)in_data; + DWORD num = (cbInput < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; TRACE("QUERYESCSUPPORT for %d\n", num); switch(num) { diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 7cf318f..8f8ff09 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -316,7 +316,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d switch(escape) { case QUERYESCSUPPORT: - if (in_data) + if (in_data && in_count >= sizeof(DWORD)) { switch (*(const INT *)in_data) {

1 0

Dmitry Timoshkov : wbemprox: Free name in create_signature (Coverity).
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 1eee6e3159c616ef6e57fd9d851e801804a859dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eee6e3159c616ef6e57fd9d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 4 23:56:11 2013 +0800 wbemprox: Free name in create_signature (Coverity). --- dlls/wbemprox/class.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a398c95..62cf332 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -834,12 +834,11 @@ HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_di } hr = create_signature_table( iter, name ); IEnumWbemClassObject_Release( iter ); - if (hr != S_OK) - { - heap_free( name ); - return hr; - } - return get_object( name, sig ); + if (hr == S_OK) + hr = get_object( name, sig ); + + heap_free( name ); + return hr; } static HRESULT WINAPI class_object_GetMethod(

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 4126d1d378f18569d5dab45c2c59a8e442095c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4126d1d378f18569d5dab45c2… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jan 31 04:42:37 2013 +0100 po: Update German translation. --- po/de.po | 48 +++++++++++++++--------------------------------- 1 files changed, 15 insertions(+), 33 deletions(-) diff --git a/po/de.po b/po/de.po index cab8fa6..8b28f26 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-09 01:25+0100\n" +"PO-Revision-Date: 2013-01-31 04:40+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -10502,77 +10502,59 @@ msgstr "Unbekannte Protokolle" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP-Statisktik für IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "Aktive Verbindungen" +msgstr "Aktiv geöffnete Verbindungen" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Passiv geöffnete Verbindungen" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Aktive Verbindungen" +msgstr "Fehlgeschlagene Verbindungsversuche" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Aktive Verbindungen" +msgstr "Zurückgesetzte Verbindungen" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Aktive Verbindungen" +msgstr "Aktuelle Verbindungen" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segment gesperrt.\n" +msgstr "Segmente empfangen" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segment gesperrt.\n" +msgstr "Segmente gesendet" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Segmente erneut gesendet" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP-Statistik für IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segment gesperrt.\n" +msgstr "Datagramme empfangen" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Lokaler Anschluss" +msgstr "Keine Ports" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Dekodierungsfehler" +msgstr "Fehler beim Empfangen" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Datagramme gesendet" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Dmitry Timoshkov : comctl32: Test appropriate tool window for active state.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 7b3305169c4d1b3c5107c1b2bd9e5f2785020ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3305169c4d1b3c5107c1b2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 5 14:16:40 2013 +0800 comctl32: Test appropriate tool window for active state. There is no point in testing owner of the tooltip itself since it's often created as a popup of the desktop window. --- dlls/comctl32/tooltips.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index ac1b45e..2cc7e47 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -991,9 +991,17 @@ TOOLTIPS_CheckTool (const TOOLTIPS_INFO *infoPtr, BOOL bShowTest) if (nTool == -1) return -1; - if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) { - if (!TOOLTIPS_IsWindowActive (GetWindow (infoPtr->hwndSelf, GW_OWNER))) - return -1; + if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) + { + TTTOOL_INFO *ti = &infoPtr->tools[nTool]; + HWND hwnd = (ti->uFlags & TTF_IDISHWND) ? (HWND)ti->uId : ti->hwnd; + + if (!TOOLTIPS_IsWindowActive(hwnd)) + { + TRACE("not active: hwnd %p, parent %p, active %p\n", + hwnd, GetParent(hwnd), GetActiveWindow()); + return -1; + } } TRACE("tool %d\n", nTool);

1 0

Ken Thomases : winemac: Generate KEY_PRESS/ RELEASE events from Cocoa key events.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 77de57683f3fb7ce8d1663b529b25657f933a618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77de57683f3fb7ce8d1663b52… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:18 2013 -0600 winemac: Generate KEY_PRESS/RELEASE events from Cocoa key events. --- dlls/winemac.drv/cocoa_app.h | 4 + dlls/winemac.drv/cocoa_app.m | 21 +++++- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 158 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 10 +++ dlls/winemac.drv/keyboard.c | 57 ++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++ 8 files changed, 259 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77de57683f3fb7ce8d166…

1 0

Ken Thomases : winemac: Rebuild key map when Mac keyboard layout changes.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: d0e1a0251583d5fb9ea199268d670b8f81b72abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1a0251583d5fb9ea199268… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:15 2013 -0600 winemac: Rebuild key map when Mac keyboard layout changes. --- dlls/winemac.drv/cocoa_app.m | 50 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_event.m | 3 ++ dlls/winemac.drv/event.c | 7 +++++ dlls/winemac.drv/keyboard.c | 22 +++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 6 ++++ 6 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3751eef..a3a8cb5 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -177,6 +177,47 @@ int macdrv_err_on; } } + - (void) keyboardSelectionDidChange + { + TISInputSourceRef inputSource; + + inputSource = TISCopyCurrentKeyboardLayoutInputSource(); + if (inputSource) + { + CFDataRef uchr; + uchr = TISGetInputSourceProperty(inputSource, + kTISPropertyUnicodeKeyLayoutData); + if (uchr) + { + macdrv_event event; + WineEventQueue* queue; + + event.type = KEYBOARD_CHANGED; + event.window = NULL; + event.keyboard_changed.keyboard_type = self.keyboardType; + event.keyboard_changed.iso_keyboard = (KBGetLayoutType(self.keyboardType) == kKeyboardISO); + event.keyboard_changed.uchr = CFDataCreateCopy(NULL, uchr); + + if (event.keyboard_changed.uchr) + { + [eventQueuesLock lock]; + + for (queue in eventQueues) + { + CFRetain(event.keyboard_changed.uchr); + [queue postEvent:&event]; + } + + [eventQueuesLock unlock]; + + CFRelease(event.keyboard_changed.uchr); + } + } + + CFRelease(inputSource); + } + } + /* * ---------- NSApplicationDelegate methods ---------- @@ -218,6 +259,15 @@ int macdrv_err_on; [keyWindows removeObjectIdenticalTo:window]; }]; + [nc addObserver:self + selector:@selector(keyboardSelectionDidChange) + name:NSTextInputContextKeyboardSelectionDidChangeNotification + object:nil]; + + /* The above notification isn't sent unless the NSTextInputContext + class has initialized itself. Poke it. */ + [NSTextInputContext self]; + self.keyboardType = LMGetKbdType(); } diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index d5e927d..98b4445 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -277,6 +277,9 @@ void macdrv_cleanup_event(macdrv_event *event) switch (event->type) { + case KEYBOARD_CHANGED: + CFRelease(event->keyboard_changed.uchr); + break; case WINDOW_GOT_FOCUS: [(NSMutableSet*)event->window_got_focus.tried_windows release]; break; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 616f398..fb00260 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -33,6 +33,7 @@ static const char *dbgstr_event(int type) { static const char * const event_names[] = { "APP_DEACTIVATED", + "KEYBOARD_CHANGED", "MOUSE_BUTTON", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_MINIMIZE", @@ -56,6 +57,9 @@ static macdrv_event_mask get_event_mask(DWORD mask) if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; + if (mask & QS_KEY) + event_mask |= event_mask_for_type(KEYBOARD_CHANGED); + if (mask & QS_MOUSEBUTTON) event_mask |= event_mask_for_type(MOUSE_BUTTON); @@ -94,6 +98,9 @@ void macdrv_handle_event(macdrv_event *event) case APP_DEACTIVATED: macdrv_app_deactivated(); break; + case KEYBOARD_CHANGED: + macdrv_keyboard_changed(event); + break; case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d81cdd2..3591521 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -661,3 +661,25 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) TRACE("keyc 0x%04x -> vkey 0x%04x (spare vkey)\n", keyc, vkey); } } + + +/*********************************************************************** + * macdrv_keyboard_changed + * + * Handler for KEYBOARD_CHANGED events. + */ +void macdrv_keyboard_changed(const macdrv_event *event) +{ + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + + TRACE("new keyboard layout uchr data %p, type %u, iso %d\n", event->keyboard_changed.uchr, + event->keyboard_changed.keyboard_type, event->keyboard_changed.iso_keyboard); + + if (thread_data->keyboard_layout_uchr) + CFRelease(thread_data->keyboard_layout_uchr); + thread_data->keyboard_layout_uchr = CFDataCreateCopy(NULL, event->keyboard_changed.uchr); + thread_data->keyboard_type = event->keyboard_changed.keyboard_type; + thread_data->iso_keyboard = event->keyboard_changed.iso_keyboard; + + macdrv_compute_keyboard_layout(thread_data); +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 6b50b3d..d30c7ae 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -134,5 +134,6 @@ 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_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; +extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 61dae50..d49992f 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -125,6 +125,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { APP_DEACTIVATED, + KEYBOARD_CHANGED, MOUSE_BUTTON, WINDOW_CLOSE_REQUESTED, WINDOW_DID_MINIMIZE, @@ -142,6 +143,11 @@ typedef struct macdrv_event { macdrv_window window; union { struct { + CFDataRef uchr; + CGEventSourceKeyboardType keyboard_type; + int iso_keyboard; + } keyboard_changed; + struct { int button; int pressed; int x;

1 0

Ken Thomases : winemac: Build a map from Mac virtual key codes to Win32 vkeys and scan codes based on Mac keyboard layout .
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: b78eee3172da2c54c352590480da02e7f48a8575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78eee3172da2c54c35259048… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:11 2013 -0600 winemac: Build a map from Mac virtual key codes to Win32 vkeys and scan codes based on Mac keyboard layout. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_app.h | 4 + dlls/winemac.drv/cocoa_app.m | 34 ++ dlls/winemac.drv/keyboard.c | 663 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 7 + dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/macdrv_main.c | 5 + 7 files changed, 719 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b78eee3172da2c54c3525…

1 0

Huw Davies : riched20: Pass the character ptr and string length directly to the break proc helper .
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 48b9ab37ac8029c4bb6625db976c166cacabc27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b9ab37ac8029c4bb6625db9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 4 09:53:38 2013 +0000 riched20: Pass the character ptr and string length directly to the break proc helper. --- dlls/riched20/caret.c | 22 ++++++++++++---------- dlls/riched20/editor.h | 2 +- dlls/riched20/string.c | 10 +++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b5b618b..4c7ee8a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -680,19 +680,21 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) /* Backward movement */ while (TRUE) { - nOffset = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_MOVEWORDLEFT); + nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_MOVEWORDLEFT); if (nOffset) break; pOtherRun = ME_FindItemBack(pRun, diRunOrParagraph); if (pOtherRun->type == diRun) { - if (ME_CallWordBreakProc(editor, pOtherRun->member.run.strText, + if (ME_CallWordBreakProc(editor, get_text( &pOtherRun->member.run, 0 ), + pOtherRun->member.run.len, pOtherRun->member.run.len - 1, WB_ISDELIMITER) && !(pRun->member.run.nFlags & MERF_ENDPARA) && !(cursor->pRun == pRun && cursor->nOffset == 0) - && !ME_CallWordBreakProc(editor, pRun->member.run.strText, 0, + && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, 0, WB_ISDELIMITER)) break; pRun = pOtherRun; @@ -724,18 +726,18 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) while (TRUE) { - if (last_delim && !ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_ISDELIMITER)) + if (last_delim && !ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_ISDELIMITER)) break; - nOffset = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset, WB_MOVEWORDRIGHT); + nOffset = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset, WB_MOVEWORDRIGHT); if (nOffset < pRun->member.run.len) break; pOtherRun = ME_FindItemFwd(pRun, diRunOrParagraphOrEnd); if (pOtherRun->type == diRun) { - last_delim = ME_CallWordBreakProc(editor, pRun->member.run.strText, - nOffset - 1, WB_ISDELIMITER); + last_delim = ME_CallWordBreakProc(editor, get_text( &pRun->member.run, 0 ), + pRun->member.run.len, nOffset - 1, WB_ISDELIMITER); pRun = pOtherRun; nOffset = 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f01494c..de1a7bc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -105,7 +105,7 @@ void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; void ME_AppendString(ME_String *s1, const ME_String *s2) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; -int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) DECLSPEC_HIDDEN; +int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) DECLSPEC_HIDDEN; void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 1c0da24..8db1a3b 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -180,20 +180,20 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) int -ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) +ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str->szData, start, str->nLen*sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */ - return editor->pfnWordBreak(str->szData, start, str->nLen*sizeof(WCHAR), code); + return editor->pfnWordBreak(str, start, len * sizeof(WCHAR), code); } else { int result; - int buffer_size = WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + int buffer_size = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); char *buffer = heap_alloc(buffer_size); - WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + WideCharToMultiByte(CP_ACP, 0, str, len, buffer, buffer_size, NULL, NULL); result = editor->pfnWordBreak((WCHAR*)buffer, start, buffer_size, code); heap_free(buffer);

1 0