May 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Explicitly use NULL_tid to terminate support error id arrays.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 6a7bf66b29752c15df342c21e6d5dfe698cfbe90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7bf66b29752c15df342c21e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:07:28 2013 +0400 msxml3: Explicitly use NULL_tid to terminate support error id arrays. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/pi.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 9ab3035..70dee2a 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -53,7 +53,7 @@ typedef struct _domattr static const tid_t domattr_se_tids[] = { IXMLDOMNode_tid, IXMLDOMAttribute_tid, - 0 + NULL_tid }; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 61c0ce2..2fcacff 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -52,7 +52,7 @@ typedef struct static const tid_t domcdata_se_tids[] = { IXMLDOMNode_tid, IXMLDOMCDATASection_tid, - 0 + NULL_tid }; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 879ca48..12a584d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -52,7 +52,7 @@ typedef struct _domcomment static const tid_t domcomment_se_tids[] = { IXMLDOMNode_tid, IXMLDOMComment_tid, - 0 + NULL_tid }; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index f066290..1b56885 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -52,7 +52,7 @@ typedef struct _domfrag static const tid_t domfrag_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocumentFragment_tid, - 0 + NULL_tid }; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b607997..e98fa72 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -859,7 +859,7 @@ static const tid_t domdoc_se_tids[] = { IXMLDOMDocument_tid, IXMLDOMDocument2_tid, IXMLDOMDocument3_tid, - 0 + NULL_tid }; static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID riid, void** ppvObject ) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 20cd9b7..5e8822e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -58,7 +58,7 @@ static const struct nodemap_funcs domelem_attr_map; static const tid_t domelem_se_tids[] = { IXMLDOMNode_tid, IXMLDOMElement_tid, - 0 + NULL_tid }; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f2d46ab..1c0309a 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -52,7 +52,7 @@ typedef struct _entityref static const tid_t domentityref_se_tids[] = { IXMLDOMNode_tid, IXMLDOMEntityReference_tid, - 0 + NULL_tid }; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index be47a75..79de75c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -150,7 +150,7 @@ static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorI TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); tid = This->iids; - while (*tid) + while (*tid != NULL_tid) { if (IsEqualGUID(riid, get_riid_from_tid(*tid))) return S_OK; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1cab7..6b8fc12 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -54,7 +54,7 @@ static const struct nodemap_funcs dom_pi_attr_map; static const tid_t dompi_se_tids[] = { IXMLDOMNode_tid, IXMLDOMProcessingInstruction_tid, - 0 + NULL_tid }; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface )

1 0

Ken Thomases : winemac: Apply cursor clipping to events that were in Cocoa' s queue when clipping started.
by Alexandre Julliard May 7, 2013

May 7, 2013

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

Nikolay Sivov : user32: Implement GetListBoxInfo().
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 8f7779fc3b1ba7bf454a065181a783d32601278a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7779fc3b1ba7bf454a06518… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 21:18:43 2013 +0400 user32: Implement GetListBoxInfo(). --- dlls/user32/listbox.c | 11 ++++++--- dlls/user32/tests/listbox.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 64691e4..5a78dda 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -27,8 +27,6 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetListBoxInfo() - * - LB_GETLISTBOXINFO * - LBS_NODATA */ @@ -2955,8 +2953,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return LB_OKAY; case LB_GETLISTBOXINFO: - FIXME("LB_GETLISTBOXINFO: stub!\n"); - return 0; + return descr->page_size; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3149,3 +3146,9 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : DefWindowProcA( hwnd, msg, wParam, lParam ); } + +DWORD WINAPI GetListBoxInfo(HWND hwnd) +{ + TRACE("%p\n", hwnd); + return SendMessageW(hwnd, LB_GETLISTBOXINFO, 0, 0); +} diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 5d96f5c..0a000cc 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1545,6 +1545,49 @@ static void test_set_count( void ) DestroyWindow( parent ); } +static DWORD (WINAPI *pGetListBoxInfo)(HWND); +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandle("user32"), "GetListBoxInfo"); + + if (!pGetListBoxInfo) + { + win_skip("GetListBoxInfo() not available\n"); + return; + } + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = pGetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); +todo_wine + ok(lb_getlistboxinfo == 0, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1624,4 +1667,5 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_GetListBoxInfo(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1ad59d9..4b1f4b5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -308,7 +308,7 @@ @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) -# @ stub GetListBoxInfo +@ stdcall GetListBoxInfo(long) @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) @ stdcall GetMenuCheckMarkDimensions()

1 0

Alexandre Julliard : wine.inf: Remove no longer used control panel section.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: b49c565f95241a7c60603abf685abae94b535ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c565f95241a7c60603abf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 15:47:50 2013 +0200 wine.inf: Remove no longer used control panel section. --- tools/wine.inf.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 89c6a75..e48d824 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -35,7 +35,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -59,7 +58,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -85,7 +83,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\

1 0

Aric Stewart : user32: Implement IMR_QUERYCHARPOSITION handling in the edit control.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 652af4e294da3f99358d522c5f7320a7d63556fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=652af4e294da3f99358d522c5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 7 08:06:22 2013 -0500 user32: Implement IMR_QUERYCHARPOSITION handling in the edit control. --- dlls/user32/edit.c | 19 +++++++++++++++++++ include/imm.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 74e0ea4..1ce79db 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5169,6 +5169,25 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_IME_CONTROL: break; + case WM_IME_REQUEST: + switch (wParam) + { + case IMR_QUERYCHARPOSITION: + { + LRESULT pos; + IMECHARPOSITION *chpos = (IMECHARPOSITION *)lParam; + + pos = EDIT_EM_PosFromChar(es, es->selection_start + chpos->dwCharPos, FALSE); + chpos->pt.x = LOWORD(pos); + chpos->pt.y = HIWORD(pos); + chpos->cLineHeight = es->line_height; + chpos->rcDocument = es->format_rect; + result = 1; + break; + } + } + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; diff --git a/include/imm.h b/include/imm.h index d035072..aa2fa1d 100644 --- a/include/imm.h +++ b/include/imm.h @@ -129,6 +129,15 @@ typedef struct _tagCOMPOSITIONFORM typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); +typedef struct _tagIMECHARPOSITION +{ + DWORD dwSize; + DWORD dwCharPos; + POINT pt; + UINT cLineHeight; + RECT rcDocument; +} IMECHARPOSITION, *LPIMECHARPOSITION; + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008

1 0

André Hentschel : d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 7f5a3a4d802a138c191dfd62e3a0ad02998df04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5a3a4d802a138c191dfd62e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 5 21:03:33 2013 +0200 d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error. --- dlls/d3drm/d3drm.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 9c3c21f..5d33402 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -317,22 +317,24 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char * filename, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char* filename, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } -static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, ppTexture); + FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM* iface, LPCSTR path) @@ -699,25 +701,25 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char * filename, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char* filename, + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2* iface, HMODULE hModule, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE2 * ppTexture) + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path) @@ -1116,18 +1118,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_LoadTexture(IDirect3DRM3* iface, const ch FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_LoadTextureFromResource(IDirect3DRM3* iface, HMODULE mod, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE3 * ppTexture) + LPDIRECT3DRMTEXTURE3* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_SetSearchPath(IDirect3DRM3* iface, LPCSTR path)

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 May 7, 2013

May 7, 2013

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: Mouse drags don' t imply anything about z-order of target window because of implicit capture .
by Alexandre Julliard May 7, 2013

May 7, 2013

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: Consolidate scroll wheel handling into -[ WineApplicationController handleScrollWheel:].
by Alexandre Julliard May 7, 2013

May 7, 2013

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 May 7, 2013

May 7, 2013

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