March 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : ole32: Fix an invalid usage of InterlockedCompareExchange.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: c23db594aacf69675ebd57936449c412c34f6050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23db594aacf69675ebd57936… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 3 05:39:46 2015 +0100 ole32: Fix an invalid usage of InterlockedCompareExchange. --- dlls/ole32/marshal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index b308600..c5c2023 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -805,11 +805,12 @@ static HRESULT proxy_manager_construct( static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) { - MSHCTX old_dest_context = This->dest_context; + MSHCTX old_dest_context; MSHCTX new_dest_context; do { + old_dest_context = This->dest_context; new_dest_context = old_dest_context; /* "stronger" values overwrite "weaker" values. stronger values are * ones that disable more optimisations */ @@ -853,7 +854,7 @@ static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX if (old_dest_context == new_dest_context) break; - old_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); + new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); } while (new_dest_context != old_dest_context); if (dest_context_data)

1 0

Damjan Jovanovic : winex11.drv: Support XDnD version 5.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 1a20050826807d51109c684b8272561bcf909318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a20050826807d51109c684b8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 2 06:32:08 2015 +0200 winex11.drv: Support XDnD version 5. --- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0adf7f3..533af2c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -61,7 +61,7 @@ typedef int Status; #define MAX_DASHLEN 16 -#define WINE_XDND_VERSION 4 +#define WINE_XDND_VERSION 5 /* X physical pen */ typedef struct diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 6618edd..f6ce5e9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -373,6 +373,8 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { XClientMessageEvent e; IDropTarget *dropTarget; + DWORD effect = XDNDDropEffect; + int accept = 0; /* Assume we're not accepting */ TRACE("\n"); @@ -386,7 +388,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { HRESULT hr; POINTL pointl; - DWORD effect = XDNDDropEffect; pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -395,7 +396,10 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) if (SUCCEEDED(hr)) { if (effect != DROPEFFECT_NONE) + { TRACE("drop succeeded\n"); + accept = 1; + } else TRACE("the application refused the drop\n"); } @@ -414,6 +418,11 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) e.message_type = x11drv_atom(XdndFinished); e.format = 32; e.data.l[0] = event->window; + e.data.l[1] = accept; + if (accept) + e.data.l[2] = X11DRV_XDND_DROPEFFECTToXdndAction(effect); + else + e.data.l[2] = None; XSendEvent(event->display, event->data.l[0], False, NoEventMask, (XEvent*)&e); }

1 0

Mark Harmstone : dsound/tests: Add GetObjectInPath tests.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: b472e5574c59794ea6e15389cbba2b9e33357f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b472e5574c59794ea6e15389c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:46:15 2015 +0000 dsound/tests: Add GetObjectInPath tests. --- dlls/dsound/tests/dsound8.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5106cf0..b093312 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -38,6 +38,8 @@ #include "ksmedia.h" #include "initguid.h" + +#include "mediaobj.h" #include "wingdi.h" #include "mmdeviceapi.h" #include "audioclient.h" @@ -1256,6 +1258,8 @@ static void test_effects(void) if (rc==DS_OK && secondary8) { LPVOID ptr1,ptr2; DWORD bytes1,bytes2; + IUnknown* obj = NULL; + HRESULT rc2; /* Call SetFX with dwEffectsCount > 0 and pDSFXDesc == NULL */ rc=IDirectSoundBuffer8_SetFX(secondary8,1,NULL,NULL); @@ -1307,14 +1311,46 @@ static void test_effects(void) } /* Call SetFX with standard echo */ - rc=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); - ok(rc==DS_OK||rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL, + rc2=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); + ok(rc2==DS_OK||rc2==REGDB_E_CLASSNOTREG||rc2==DSERR_CONTROLUNAVAIL, "IDirectSoundBuffer8_SetFX(GUID_DSFX_STANDARD_ECHO) failed: %08x\n",rc); - if (rc!=DSERR_CONTROLUNAVAIL) { + if (rc2!=DSERR_CONTROLUNAVAIL) { ok(resultcodes[0]==DSFXR_UNKNOWN||resultcodes[0]==DSFXR_LOCHARDWARE||resultcodes[0]==DSFXR_LOCSOFTWARE, "resultcode == %08x, expected DSFXR_UNKNOWN, DSFXR_LOCHARDWARE, or DSFXR_LOCSOFTWARE\n",resultcodes[0]); } + /* Call GetObjectInPath for out-of-bounds DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,2,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath with NULL ppObject */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,NULL); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_INVALIDARG, returned: %08x\n",rc); + + /* Call GetObjectInPath for unsupported interface */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&GUID_NULL,(void**)&obj); + ok(rc==E_NOINTERFACE||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned E_NOINTERFACE, returned: %08x\n",rc); + + /* Call GetObjectInPath for unloaded DMO */ + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_NULL,0,&IID_IMediaObject,(void**)&obj); + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + + /* Call GetObjectInPath for first DMO */ + obj=NULL; + rc=IDirectSoundBuffer8_GetObjectInPath(secondary8,&GUID_All_Objects,0,&IID_IMediaObject,(void**)&obj); + if (rc2==DS_OK) { + ok(rc==DS_OK||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DS_OK, returned: %08x\n",rc); + if (obj) IUnknown_Release(obj); + } else { + ok(rc==DSERR_OBJECTNOTFOUND||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_GetObjectInPath() " + "should have returned DSERR_OBJECTNOTFOUND, returned: %08x\n",rc); + } + /* Call SetFX with one real filter and one fake one */ rc=IDirectSoundBuffer8_SetFX(secondary8,2,effects,resultcodes); ok(rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL,

1 0

Sebastian Lackner : ddraw: Remove unused code for ChangeUniquenessValue.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 68528519fc203879132a74205b11cc9a0cfdd784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68528519fc203879132a74205… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 3 05:09:56 2015 +0100 ddraw: Remove unused code for ChangeUniquenessValue. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 31 +------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a2eee1a..4a883b9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -183,7 +183,6 @@ struct ddraw_surface DDSURFACEDESC2 surface_desc; /* Misc things */ - DWORD uniqueness_value; UINT mipmap_level; /* Clipper objects */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 331d2bb..cbf11da 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3886,35 +3886,10 @@ static HRESULT WINAPI ddraw_surface2_GetDDInterface(IDirectDrawSurface2 *iface, return ddraw_surface7_GetDDInterface(&surface->IDirectDrawSurface7_iface, ddraw); } -/* This seems also windows implementation specific - I don't think WineD3D needs this */ static HRESULT WINAPI ddraw_surface7_ChangeUniquenessValue(IDirectDrawSurface7 *iface) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); - volatile struct ddraw_surface* vThis = This; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - /* A uniqueness value of 0 is apparently special. - * This needs to be checked. - * TODO: Write tests for this code and check if the volatile, interlocked stuff is really needed - */ - while (1) { - DWORD old_uniqueness_value = vThis->uniqueness_value; - DWORD new_uniqueness_value = old_uniqueness_value+1; - - if (old_uniqueness_value == 0) break; - if (new_uniqueness_value == 0) new_uniqueness_value = 1; - - if (InterlockedCompareExchange((LONG*)&vThis->uniqueness_value, - old_uniqueness_value, - new_uniqueness_value) - == old_uniqueness_value) - break; - } - - wined3d_mutex_unlock(); - return DD_OK; } @@ -3929,13 +3904,9 @@ static HRESULT WINAPI ddraw_surface4_ChangeUniquenessValue(IDirectDrawSurface4 * static HRESULT WINAPI ddraw_surface7_GetUniquenessValue(IDirectDrawSurface7 *iface, DWORD *pValue) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, value %p.\n", iface, pValue); - wined3d_mutex_lock(); - *pValue = surface->uniqueness_value; - wined3d_mutex_unlock(); + *pValue = 0; return DD_OK; }

1 0

Sebastian Lackner : include: Fix definition of SECTION_BASIC_INFORMATION and SECTION_IMAGE_INFORMATION.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 72a41c50e2a049848a280090e525db14f623b56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a41c50e2a049848a280090e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 3 00:46:36 2015 +0100 include: Fix definition of SECTION_BASIC_INFORMATION and SECTION_IMAGE_INFORMATION. Based on a patch by Dmitry Timoshkov. --- include/winternl.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 1a694da..3992309 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1792,23 +1792,28 @@ typedef enum _SECTION_INFORMATION_CLASS } SECTION_INFORMATION_CLASS; typedef struct _SECTION_BASIC_INFORMATION { - ULONG BaseAddress; + PVOID BaseAddress; ULONG Attributes; LARGE_INTEGER Size; } SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; typedef struct _SECTION_IMAGE_INFORMATION { - PVOID EntryPoint; - ULONG StackZeroBits; - ULONG StackReserved; - ULONG StackCommit; - ULONG ImageSubsystem; + PVOID TransferAddress; + ULONG ZeroBits; + SIZE_T MaximumStackSize; + SIZE_T CommittedStackSize; + ULONG SubSystemType; WORD SubsystemVersionLow; WORD SubsystemVersionHigh; - ULONG Unknown1; - ULONG ImageCharacteristics; - ULONG ImageMachineType; - ULONG Unknown2[3]; + ULONG GpValue; + USHORT ImageCharacteristics; + USHORT DllCharacteristics; + USHORT Machine; + BOOLEAN ImageContainsCode; + UCHAR ImageFlags; + ULONG LoaderFlags; + ULONG ImageFileSize; + ULONG CheckSum; } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; typedef struct _LPC_SECTION_WRITE {

1 0

Alexandre Julliard : ntdll: Avoid the intermediate user APC callback.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 1146e251fcabfd3379029fdfc8c66a68ca0b70fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1146e251fcabfd3379029fdfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 16:14:02 2015 +0900 ntdll: Avoid the intermediate user APC callback. --- dlls/ntdll/file.c | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cd6546..b07e5f9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -388,14 +388,6 @@ static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROU return io; } -/* callback for file I/O user APC */ -static void WINAPI fileio_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) -{ - struct async_fileio *async = arg; - if (async->apc) async->apc( async->apc_arg, io, reserved ); - release_fileio( async ); -} - /*********************************************************************** * FILE_GetNtStatus(void) * @@ -501,13 +493,9 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - if (fileio->io.apc) - { - *apc = fileio_apc; - *arg = &fileio->io; - } - else - release_fileio( &fileio->io ); + *apc = fileio->io.apc; + *arg = fileio->io.apc_arg; + release_fileio( &fileio->io ); } return status; } @@ -1003,13 +991,9 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - if (fileio->io.apc) - { - *apc = fileio_apc; - *arg = &fileio->io; - } - else - release_fileio( &fileio->io ); + *apc = fileio->io.apc; + *arg = fileio->io.apc_arg; + release_fileio( &fileio->io ); } return status; } @@ -1398,13 +1382,9 @@ static NTSTATUS ioctl_completion( void *user, IO_STATUS_BLOCK *io, if (status != STATUS_PENDING) { io->u.Status = status; - if (async->io.apc) - { - *apc = fileio_apc; - *arg = &async->io; - } - else - release_fileio( &async->io ); + *apc = async->io.apc; + *arg = async->io.apc_arg; + release_fileio( &async->io ); } return status; } @@ -1788,13 +1768,9 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, iosb->u.Status = ret; iosb->Information = size; - if (fileio->io.apc) - { - *apc = fileio_apc; - *arg = &fileio->io; - } - else - release_fileio( &fileio->io ); + *apc = fileio->io.apc; + *arg = fileio->io.apc_arg; + release_fileio( &fileio->io ); return ret; }

1 0

Jacek Caban : vbscript: Added support for DISPATCH_PROPERTYPUTREF flag.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 128f79ee775d7e0cd6bddcc4cc94150a5c141768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128f79ee775d7e0cd6bddcc4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:24 2015 +0100 vbscript: Added support for DISPATCH_PROPERTYPUTREF flag. --- dlls/vbscript/vbdisp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 99f975a..c9d318e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -112,7 +112,9 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA hres = VariantCopyInd(res, v); break; - case DISPATCH_PROPERTYPUT: { + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT *put_val; put_val = get_propput_arg(dp); @@ -409,7 +411,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } return exec_script(This->desc->ctx, func, This, pdp, pvarRes); - case DISPATCH_PROPERTYPUT: { + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT *put_val; DISPPARAMS dp = {NULL, NULL, 1, 0};

1 0

Nikolay Sivov : include: Fix null pointer dereference while tracing.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: bcd8b6f4ee540f8bd414939984061f4c187c7449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd8b6f4ee540f8bd41493998… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 08:13:29 2015 +0300 include: Fix null pointer dereference while tracing. --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 9028cb5..95d74d3 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -278,7 +278,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); if (V_VT(v) == (VT_BSTR|VT_BYREF)) - return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, wine_dbgstr_w(*V_BSTRREF(v)) ); + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, V_BSTRREF(v) ? wine_dbgstr_w(*V_BSTRREF(v)) : "(none)" ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); }

1 0

Alexandre Julliard : ntdll: Allow specifying the user APC argument in the system APC callback.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 0a241b0fcc550cc60d8a59dfec0bdcd99bd0f1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a241b0fcc550cc60d8a59dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 16:06:51 2015 +0900 ntdll: Allow specifying the user APC argument in the system APC callback. --- dlls/ntdll/file.c | 26 +++++++++++++++++++++----- dlls/ntdll/server.c | 8 ++++---- dlls/ws2_32/socket.c | 27 +++++++++++++++++++-------- server/protocol.def | 2 +- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 43b6097..1cd6546 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -448,7 +448,8 @@ NTSTATUS FILE_GetNtStatus(void) /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc) +static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -501,7 +502,10 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU iosb->u.Status = status; iosb->Information = fileio->already; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); } @@ -956,7 +960,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) */ -static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc) +static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -999,7 +1004,10 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT iosb->u.Status = status; iosb->Information = fileio->already; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); } @@ -1370,9 +1378,10 @@ struct async_ioctl }; /* callback for ioctl async I/O completion */ -static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc ) +static NTSTATUS ioctl_completion( void *user, IO_STATUS_BLOCK *io, + NTSTATUS status, void **apc, void **arg ) { - struct async_ioctl *async = arg; + struct async_ioctl *async = user; if (status == STATUS_ALERTED) { @@ -1390,7 +1399,10 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu { io->u.Status = status; if (async->io.apc) + { *apc = fileio_apc; + *arg = &async->io; + } else release_fileio( &async->io ); } @@ -1709,7 +1721,8 @@ struct read_changes_fileio char data[1]; }; -static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) +static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct read_changes_fileio *fileio = user; NTSTATUS ret; @@ -1776,7 +1789,10 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = size; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); return ret; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e3f1694..2c99cbe 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -391,17 +391,17 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) } case APC_ASYNC_IO: { - void *apc = NULL; + void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **) = wine_server_get_ptr( call->async_io.func ); + NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.func ); result->type = call->type; result->async_io.status = func( wine_server_get_ptr( call->async_io.user ), - iosb, call->async_io.status, &apc ); + iosb, call->async_io.status, &apc, &arg ); if (result->async_io.status != STATUS_PENDING) { result->async_io.total = iosb->Information; result->async_io.apc = wine_server_client_ptr( apc ); - result->async_io.arg = call->async_io.user; + result->async_io.arg = wine_server_client_ptr( arg ); } break; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f1f00eb..5bfdecf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2013,7 +2013,8 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) * * Handler for overlapped recv() operations. */ -static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) +static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2051,7 +2052,10 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat iosb->u.Status = status; iosb->Information = result; if (wsa->completion_func) + { *apc = ws2_async_apc; + *arg = wsa; + } else release_async_io( &wsa->io ); } @@ -2064,12 +2068,13 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat * This function is used to finish the read part of an accept request. It is * needed to place the completion on the correct socket (listener). */ -static NTSTATUS WS2_async_accept_recv( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { void *junk; - struct ws2_accept_async *wsa = arg; + struct ws2_accept_async *wsa = user; - status = WS2_async_recv( wsa->read, iosb, status, &junk ); + status = WS2_async_recv( wsa->read, iosb, status, &junk, &junk ); if (status == STATUS_PENDING) return status; @@ -2087,9 +2092,10 @@ static NTSTATUS WS2_async_accept_recv( void *arg, IO_STATUS_BLOCK *iosb, NTSTATU * * This is the function called to satisfy the AcceptEx callback */ -static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { - struct ws2_accept_async *wsa = arg; + struct ws2_accept_async *wsa = user; int len; char *addr; @@ -2241,7 +2247,8 @@ static int WS2_send( int fd, struct ws2_async *wsa ) * * Handler for overlapped send() operations. */ -static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) +static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2285,7 +2292,10 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu { iosb->u.Status = status; if (wsa->completion_func) + { *apc = ws2_async_apc; + *arg = wsa; + } else release_async_io( &wsa->io ); } @@ -2297,7 +2307,8 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu * * Handler for shutdown() operations on overlapped sockets. */ -static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async_shutdown *wsa = user; int fd, err = 1; diff --git a/server/protocol.def b/server/protocol.def index f2a5a9a..7ec380b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -480,7 +480,7 @@ typedef union { enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* I/O status */ - client_ptr_t func; /* unsigned int (*func)(void*, void*, unsigned int, void **); */ + client_ptr_t func; /* unsigned int (*func)(void*, void*, unsigned int, void**, void**); */ client_ptr_t user; /* user pointer */ client_ptr_t sb; /* status block */ } async_io;

1 0

Alexandre Julliard : ws2_32: Add a common header to the async I/ O structures.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 9fa69b586810b35c34380b64f3c6b52edb6cfb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa69b586810b35c34380b64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:33:21 2015 +0900 ws2_32: Add a common header to the async I/O structures. --- dlls/ws2_32/socket.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index faf2ec1..55f4865 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -330,8 +330,14 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) * Async IO declarations ****************************************************************/ -typedef struct ws2_async +struct ws2_async_io { + struct ws2_async_io *next; +}; + +struct ws2_async +{ + struct ws2_async_io io; HANDLE hSocket; int type; LPWSAOVERLAPPED user_overlapped; @@ -349,10 +355,11 @@ typedef struct ws2_async unsigned int n_iovecs; unsigned int first_iovec; struct iovec iovec[1]; -} ws2_async; +}; -typedef struct ws2_accept_async +struct ws2_accept_async { + struct ws2_async_io io; HANDLE listen_socket; HANDLE accept_socket; LPOVERLAPPED user_overlapped; @@ -362,7 +369,7 @@ typedef struct ws2_accept_async int local_len; int remote_len; struct ws2_async *read; -} ws2_accept_async; +}; /****************************************************************/ @@ -1885,7 +1892,7 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i /* user APC called upon async completion */ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { - ws2_async *wsa = arg; + struct ws2_async *wsa = arg; if (wsa->completion_func) wsa->completion_func( NtStatusToWSAError(iosb->u.Status), iosb->Information, wsa->user_overlapped, @@ -1973,7 +1980,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) */ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int result = 0, fd; switch (status) @@ -2206,7 +2213,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) */ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int result = 0, fd; switch (status) @@ -2259,7 +2266,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu */ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int fd, err = 1; switch (status) @@ -3794,7 +3801,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s wsa->completion_func = completion; io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); - status = NtDeviceIoControlFile( handle, event, (PIO_APC_ROUTINE)ws2_async_apc, wsa, io, code, + status = NtDeviceIoControlFile( handle, event, ws2_async_apc, wsa, io, code, in_buff, in_size, out_buff, out_size ); if (status == STATUS_NOT_SUPPORTED) {

1 0