December 2016 - Wine-commits

Nikolay Sivov : include: Update various shell enums and flags.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 5669a710b228cf08f9669f66088538886d4b912f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5669a710b228cf08f9669f660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 10:42:02 2016 +0300 include: Update various shell enums and flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 203 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 122 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5669a710b228cf08f9669…

1 0

Nikolay Sivov : shell32: Use standard list for IEnumIDList implementation.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 794efcceeed23fde8c4dbac94d04c23100441a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=794efcceeed23fde8c4dbac94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:30:26 2016 +0300 shell32: Use standard list for IEnumIDList implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/enumidlist.c | 249 ++++++++++++++++++++------------------------ dlls/shell32/shell32_main.h | 16 +-- 2 files changed, 122 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=794efcceeed23fde8c4db…

1 0

Nikolay Sivov : shell32: Simplify drag drop helper object creation.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 8e7a041154e49759d114f928cb6c13d3370c09d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7a041154e49759d114f928c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:33:18 2016 +0300 shell32: Simplify drag drop helper object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 74 ++++++++++++++++++++----------------------- dlls/shell32/tests/shellole.c | 21 ++++++++++++ 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index cae8b8d..0b91449 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -52,43 +52,12 @@ typedef struct { LONG ref; } IDropTargetHelperImpl; -static const IDropTargetHelperVtbl vt_IDropTargetHelper; - static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelper *iface) { return CONTAINING_RECORD(iface, IDropTargetHelperImpl, IDropTargetHelper_iface); } /************************************************************************** -* IDropTargetHelper_Constructor -*/ -HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IDropTargetHelperImpl *dth; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (!ppv) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); - if (!dth) return E_OUTOFMEMORY; - - dth->ref = 0; - dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; - - if (FAILED (IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv))) { - LocalFree(dth); - return E_NOINTERFACE; - } - - TRACE ("--(%p)\n", dth); - return S_OK; -} - -/************************************************************************** * IDropTargetHelper_fnQueryInterface */ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj) @@ -179,12 +148,39 @@ static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL static const IDropTargetHelperVtbl vt_IDropTargetHelper = { - IDropTargetHelper_fnQueryInterface, - IDropTargetHelper_fnAddRef, - IDropTargetHelper_fnRelease, - IDropTargetHelper_fnDragEnter, - IDropTargetHelper_fnDragLeave, - IDropTargetHelper_fnDragOver, - IDropTargetHelper_fnDrop, - IDropTargetHelper_fnShow + IDropTargetHelper_fnQueryInterface, + IDropTargetHelper_fnAddRef, + IDropTargetHelper_fnRelease, + IDropTargetHelper_fnDragEnter, + IDropTargetHelper_fnDragLeave, + IDropTargetHelper_fnDragOver, + IDropTargetHelper_fnDrop, + IDropTargetHelper_fnShow }; + +/************************************************************************** +* IDropTargetHelper_Constructor +*/ +HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IDropTargetHelperImpl *dth; + HRESULT hr; + + TRACE ("outer=%p %s %p\n", pUnkOuter, shdebugstr_guid (riid), ppv); + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); + if (!dth) return E_OUTOFMEMORY; + + dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; + dth->ref = 1; + + hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); + IDropTargetHelper_Release (&dth->IDropTargetHelper_iface); + + return hr; +} diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index be10733..5d56431 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -890,12 +890,33 @@ static void test_SHCreateSessionKey(void) RegCloseKey(hkey2); } +static void test_dragdrophelper(void) +{ + IDropTargetHelper *target; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER, &IID_IDropTargetHelper, (void **)&target); + ok(hr == S_OK, "Failed to create IDropTargetHelper, %#x\n", hr); + + IDropTargetHelper_Release(target); +} + START_TEST(shellole) { + HRESULT hr; + init(); + hr = CoInitialize(NULL); + ok(hr == S_OK, "CoInitialize failed (0x%08x)\n", hr); + if (hr != S_OK) + return; + test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); test_DragQueryFile(); test_SHCreateSessionKey(); + test_dragdrophelper(); + + CoUninitialize(); }

1 0

Michael Müller : shell32: Add IDragSourceHelper stub.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 117c0dc5ba81fb44be2fb4a79106533d67135751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117c0dc5ba81fb44be2fb4a79… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 1 07:33:19 2016 +0300 shell32: Add IDragSourceHelper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 96 +++++++++++++++++++++++++++++++++++-------- dlls/shell32/tests/shellole.c | 5 +++ 2 files changed, 83 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 0b91449..425ee71 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -47,14 +47,21 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); * IDropTargetHelper implementation */ -typedef struct { +typedef struct +{ IDropTargetHelper IDropTargetHelper_iface; + IDragSourceHelper IDragSourceHelper_iface; LONG ref; -} IDropTargetHelperImpl; +} dragdrophelper; + +static inline dragdrophelper *impl_from_IDropTargetHelper(IDropTargetHelper *iface) +{ + return CONTAINING_RECORD(iface, dragdrophelper, IDropTargetHelper_iface); +} -static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelper *iface) +static inline dragdrophelper *impl_from_IDragSourceHelper(IDragSourceHelper *iface) { - return CONTAINING_RECORD(iface, IDropTargetHelperImpl, IDropTargetHelper_iface); + return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper_iface); } /************************************************************************** @@ -62,14 +69,19 @@ static inline IDropTargetHelperImpl *impl_from_IDropTargetHelper(IDropTargetHelp */ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * iface, REFIID riid, LPVOID * ppvObj) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDropTargetHelper)) { - *ppvObj = &This->IDropTargetHelper_iface; + if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDropTargetHelper)) + { + *ppvObj = &This->IDropTargetHelper_iface; + } + else if (IsEqualIID (riid, &IID_IDragSourceHelper)) + { + *ppvObj = &This->IDragSourceHelper_iface; } if (*ppvObj) { @@ -83,7 +95,7 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE ("(%p)->(count=%u)\n", This, refCount - 1); @@ -93,7 +105,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE ("(%p)->(count=%u)\n", This, refCount + 1); @@ -113,40 +125,40 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL fShow) { - IDropTargetHelperImpl *This = impl_from_IDropTargetHelper(iface); + dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%u)\n", This, fShow); return E_NOTIMPL; } -static const IDropTargetHelperVtbl vt_IDropTargetHelper = +static const IDropTargetHelperVtbl DropTargetHelperVtbl = { IDropTargetHelper_fnQueryInterface, IDropTargetHelper_fnAddRef, @@ -158,12 +170,59 @@ static const IDropTargetHelperVtbl vt_IDropTargetHelper = IDropTargetHelper_fnShow }; +static HRESULT WINAPI DragSourceHelper_QueryInterface (IDragSourceHelper * iface, REFIID riid, LPVOID * ppv) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnQueryInterface(&This->IDropTargetHelper_iface, riid, ppv); +} + +static ULONG WINAPI DragSourceHelper_AddRef (IDragSourceHelper * iface) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnAddRef(&This->IDropTargetHelper_iface); +} + +static ULONG WINAPI DragSourceHelper_Release (IDragSourceHelper * iface) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + return IDropTargetHelper_fnRelease(&This->IDropTargetHelper_iface); +} + +static HRESULT WINAPI DragSourceHelper_InitializeFromBitmap(IDragSourceHelper *iface, + SHDRAGIMAGE *dragimage, IDataObject *object) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, dragimage, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI DragSourceHelper_InitializeFromWindow(IDragSourceHelper *iface, HWND hwnd, + POINT *pt, IDataObject *object) +{ + dragdrophelper *This = impl_from_IDragSourceHelper(iface); + + FIXME("(%p)->(%p, %s, %p): stub\n", This, hwnd, wine_dbgstr_point(pt), object); + + return E_NOTIMPL; +} + +static const IDragSourceHelperVtbl DragSourceHelperVtbl = +{ + DragSourceHelper_QueryInterface, + DragSourceHelper_AddRef, + DragSourceHelper_Release, + DragSourceHelper_InitializeFromBitmap, + DragSourceHelper_InitializeFromWindow +}; + /************************************************************************** * IDropTargetHelper_Constructor */ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - IDropTargetHelperImpl *dth; + dragdrophelper *dth; HRESULT hr; TRACE ("outer=%p %s %p\n", pUnkOuter, shdebugstr_guid (riid), ppv); @@ -173,10 +232,11 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - dth = LocalAlloc (LMEM_ZEROINIT, sizeof (IDropTargetHelperImpl)); + dth = LocalAlloc (LMEM_ZEROINIT, sizeof (dragdrophelper)); if (!dth) return E_OUTOFMEMORY; - dth->IDropTargetHelper_iface.lpVtbl = &vt_IDropTargetHelper; + dth->IDropTargetHelper_iface.lpVtbl = &DropTargetHelperVtbl; + dth->IDragSourceHelper_iface.lpVtbl = &DragSourceHelperVtbl; dth->ref = 1; hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 5d56431..f611faf 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -892,12 +892,17 @@ static void test_SHCreateSessionKey(void) static void test_dragdrophelper(void) { + IDragSourceHelper *dragsource; IDropTargetHelper *target; HRESULT hr; hr = CoCreateInstance(&CLSID_DragDropHelper, NULL, CLSCTX_INPROC_SERVER, &IID_IDropTargetHelper, (void **)&target); ok(hr == S_OK, "Failed to create IDropTargetHelper, %#x\n", hr); + hr = IDropTargetHelper_QueryInterface(target, &IID_IDragSourceHelper, (void **)&dragsource); + ok(hr == S_OK, "QI failed, %#x\n", hr); + IDragSourceHelper_Release(dragsource); + IDropTargetHelper_Release(target); }

1 0

Bruno Jesus : msg711.acm: Remove dead code in G711_FormatSuggest.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 5bdc868936e6b49fa14c64ee681d43df42f3500a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdc868936e6b49fa14c64ee6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 19:20:43 2016 -0200 msg711.acm: Remove dead code in G711_FormatSuggest. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index e74d329..4593bd9 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -843,9 +843,6 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; - default: - FIXME("\n"); - break; } return MMSYSERR_NOERROR;

1 0

Bruno Jesus : msg711.acm: Remove an empty fixme.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: d1324882c2bd3b910bb45fd4e41dbd525bc1614d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1324882c2bd3b910bb45fd4e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 19:20:44 2016 -0200 msg711.acm: Remove an empty fixme. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 4593bd9..dc1661c 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -1040,7 +1040,6 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } - FIXME("\n"); return MMSYSERR_NOERROR; }

1 0

Andrew Eikum : user32: Support IDC_PEN.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: d1064669f416ad2e354218852535250717bc34dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1064669f416ad2e354218852… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 30 13:13:47 2016 -0600 user32: Support IDC_PEN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_pen.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 3 +++ include/winuser.h | 1 + include/winuser.rh | 1 + 4 files changed, 5 insertions(+) diff --git a/dlls/user32/resources/ocr_pen.cur b/dlls/user32/resources/ocr_pen.cur new file mode 100644 index 0000000..51be164 Binary files /dev/null and b/dlls/user32/resources/ocr_pen.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 4826e04..28a6c74 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -263,6 +263,9 @@ OCR_HELP CURSOR resources/ocr_help.cur /* @makedep: resources/ocr_dragobject.cur */ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur +/* @makedep: resources/ocr_pen.cur */ +OCR_PEN CURSOR resources/ocr_pen.cur + /****************************************************************/ /* Icons */ diff --git a/include/winuser.h b/include/winuser.h index cb7c37b..2b8331c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2215,6 +2215,7 @@ typedef struct tagCBTACTIVATESTRUCT #define IDC_WAIT MAKEINTRESOURCE(32514) #define IDC_CROSS MAKEINTRESOURCE(32515) #define IDC_UPARROW MAKEINTRESOURCE(32516) +#define IDC_PEN MAKEINTRESOURCE(32631) #define IDC_SIZE MAKEINTRESOURCE(32640) #define IDC_ICON MAKEINTRESOURCE(32641) #define IDC_SIZENWSE MAKEINTRESOURCE(32642) diff --git a/include/winuser.rh b/include/winuser.rh index 1d2a0bb..e48a935 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -999,6 +999,7 @@ #define OCR_WAIT 32514 #define OCR_CROSS 32515 #define OCR_UP 32516 +#define OCR_PEN 32631 #define OCR_SIZE 32640 #define OCR_ICON 32641 #define OCR_SIZENWSE 32642

1 0

Jacek Caban : server: Store async list in process object and use that to find async in cansel_async request.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 055918c9829d4b31e4599bf3a45faf501116a15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=055918c9829d4b31e4599bf3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:23 2016 +0100 server: Store async list in process object and use that to find async in cansel_async request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 40 +++++++++++++++++++++++++++++----------- server/fd.c | 21 +-------------------- server/file.h | 2 -- server/process.c | 2 ++ server/process.h | 1 + server/sock.c | 16 +--------------- 6 files changed, 34 insertions(+), 48 deletions(-) diff --git a/server/async.c b/server/async.c index 64aa27a..5acd1e7 100644 --- a/server/async.c +++ b/server/async.c @@ -31,12 +31,15 @@ #include "object.h" #include "file.h" #include "request.h" +#include "process.h" +#include "handle.h" struct async { struct object obj; /* object header */ struct thread *thread; /* owning thread */ struct list queue_entry; /* entry in async queue list */ + struct list process_entry; /* entry in process list */ struct async_queue *queue; /* queue containing this async */ unsigned int status; /* current status */ struct timeout_user *timeout; @@ -132,6 +135,7 @@ static void async_destroy( struct object *obj ) struct async *async = (struct async *)obj; assert( obj->ops == &async_ops ); + list_remove( &async->process_entry ); list_remove( &async->queue_entry ); async_reselect( async ); @@ -244,6 +248,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->signaled = 0; list_add_tail( &queue->queue, &async->queue_entry ); + list_add_tail( &thread->process->asyncs, &async->process_entry ); grab_object( async ); if (queue->fd) set_fd_signaled( queue->fd, 0 ); @@ -343,23 +348,22 @@ int async_waiting( struct async_queue *queue ) return async->status == STATUS_PENDING; } -int async_wake_up_by( struct async_queue *queue, struct process *process, - struct thread *thread, client_ptr_t iosb, unsigned int status ) +static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { - struct list *ptr, *next; + struct async *async; int woken = 0; - if (!queue || (!process && !thread && !iosb)) return 0; - - LIST_FOR_EACH_SAFE( ptr, next, &queue->queue ) +restart: + LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - struct async *async = LIST_ENTRY( ptr, struct async, queue_entry ); - if ( (!process || async->thread->process == process) && - (!thread || async->thread == thread) && - (!iosb || async->data.iosb == iosb) ) + if (async->status == STATUS_CANCELLED) continue; + if ((!obj || (async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && + (!thread || async->thread == thread) && + (!iosb || async->data.iosb == iosb)) { - async_terminate( async, status ); + async_terminate( async, STATUS_CANCELLED ); woken++; + goto restart; } } return woken; @@ -379,3 +383,17 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) if (status == STATUS_ALERTED) break; /* only wake up the first one */ } } + +/* cancels all async I/O */ +DECL_HANDLER(cancel_async) +{ + struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL ); + struct thread *thread = req->only_thread ? current : NULL; + + if (obj) + { + int count = cancel_async( current->process, obj, thread, req->iosb ); + if (!count && req->iosb) set_error( STATUS_NOT_FOUND ); + release_object( obj ); + } +} diff --git a/server/fd.c b/server/fd.c index 66d34d7..a75ff76 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2118,12 +2118,7 @@ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ) /* default cancel_async() fd routine */ int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) { - int n = 0; - - n += async_wake_up_by( fd->read_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( fd->write_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( fd->wait_q, process, thread, iosb, STATUS_CANCELLED ); - return n; + return 0; } static inline int is_valid_mounted_device( struct stat *st ) @@ -2519,20 +2514,6 @@ DECL_HANDLER(register_async) } } -/* cancels all async I/O */ -DECL_HANDLER(cancel_async) -{ - struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); - struct thread *thread = req->only_thread ? current : NULL; - - if (fd) - { - int count = fd->fd_ops->cancel_async( fd, current->process, thread, req->iosb ); - if (!count && req->iosb) set_error( STATUS_NOT_FOUND ); - release_object( fd ); - } -} - /* attach completion object to a fd */ DECL_HANDLER(set_completion_info) { diff --git a/server/file.h b/server/file.h index b643d94..7c68248 100644 --- a/server/file.h +++ b/server/file.h @@ -175,8 +175,6 @@ extern void async_set_result( struct object *obj, unsigned int status, extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); -extern int async_wake_up_by( struct async_queue *queue, struct process *process, - struct thread *thread, client_ptr_t iosb, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); diff --git a/server/process.c b/server/process.c index 528ec74..cca18e9 100644 --- a/server/process.c +++ b/server/process.c @@ -535,6 +535,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->rawinput_kbd = NULL; list_init( &process->thread_list ); list_init( &process->locks ); + list_init( &process->asyncs ); list_init( &process->classes ); list_init( &process->dlls ); list_init( &process->rawinput_devices ); @@ -614,6 +615,7 @@ static void process_destroy( struct object *obj ) /* we can't have a thread remaining */ assert( list_empty( &process->thread_list )); + assert( list_empty( &process->asyncs )); assert( !process->sigkill_timeout ); /* timeout should hold a reference to the process */ diff --git a/server/process.h b/server/process.h index 4e6de69..548796f 100644 --- a/server/process.h +++ b/server/process.h @@ -78,6 +78,7 @@ struct process unsigned int is_terminating:1;/* is process terminating? */ struct job *job; /* job object ascoicated with this process */ struct list job_entry; /* list entry for job object */ + struct list asyncs; /* list of async object owned by the process */ 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/sock.c b/server/sock.c index 0de6f68..2cd3b0e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -132,7 +132,6 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ); static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); -static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); static int sock_get_ntstatus( int err ); static int sock_get_error( int err ); @@ -171,7 +170,7 @@ static const struct fd_ops sock_fd_ops = sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */ sock_reselect_async, /* reselect_async */ - sock_cancel_async /* cancel_async */ + default_fd_cancel_async /* cancel_async */ }; @@ -611,19 +610,6 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) sock_reselect( sock ); } -static int sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) -{ - struct sock *sock = get_fd_user( fd ); - int n = 0; - - assert( sock->obj.ops == &sock_ops ); - - n += async_wake_up_by( sock->read_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( sock->write_q, process, thread, iosb, STATUS_CANCELLED ); - n += async_wake_up_by( sock->ifchange_q, process, thread, iosb, STATUS_CANCELLED ); - return n; -} - static struct fd *sock_get_fd( struct object *obj ) { struct sock *sock = (struct sock *)obj;

1 0

Jacek Caban : server: Get rid of no loner used cancel_async from fd_ops.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: ad1e0609a0f388345b0dc3f8777f6c60c595fe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1e0609a0f388345b0dc3f87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:34 2016 +0100 server: Get rid of no loner used cancel_async from fd_ops. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 6 ++---- server/console.c | 3 +-- server/device.c | 3 +-- server/fd.c | 6 ------ server/file.c | 3 +-- server/file.h | 3 --- server/mailslot.c | 9 +++------ server/mapping.c | 3 +-- server/named_pipe.c | 9 +++------ server/request.c | 3 +-- server/serial.c | 3 +-- server/signal.c | 3 +-- server/sock.c | 6 ++---- server/thread.c | 3 +-- 14 files changed, 18 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad1e0609a0f388345b0dc…

1 0

Jacek Caban : server: Cancel process asyncs on process termination.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 6ffe08459fe52e959e30b8a6a3c817611dfcec5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffe08459fe52e959e30b8a6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 12:10:47 2016 +0100 server: Cancel process asyncs on process termination. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 +++++ server/file.h | 1 + server/process.c | 1 + 3 files changed, 7 insertions(+) diff --git a/server/async.c b/server/async.c index 5acd1e7..70ebf95 100644 --- a/server/async.c +++ b/server/async.c @@ -369,6 +369,11 @@ restart: return woken; } +void cancel_process_asyncs( struct process *process ) +{ + cancel_async( process, NULL, NULL, 0 ); +} + /* wake up async operations on the queue */ void async_wake_up( struct async_queue *queue, unsigned int status ) { diff --git a/server/file.h b/server/file.h index 19e638e..fb2e905 100644 --- a/server/file.h +++ b/server/file.h @@ -175,6 +175,7 @@ extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); +extern void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA) diff --git a/server/process.c b/server/process.c index cca18e9..e9e2f21 100644 --- a/server/process.c +++ b/server/process.c @@ -840,6 +840,7 @@ static void process_killed( struct process *process ) process->winstation = 0; process->desktop = 0; close_process_handles( process ); + cancel_process_asyncs( process ); if (process->idle_event) { release_object( process->idle_event );

1 0