July 2017 - Wine-Commits - list.winehq.org

Jacek Caban : server: Call create_irp from queue_irp.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 23dce6881b95f6b9e494aea1b418118035402bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dce6881b95f6b9e494aea1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:44 2017 +0200 server: Call create_irp from queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 47 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/server/device.c b/server/device.c index 0443185..192395d 100644 --- a/server/device.c +++ b/server/device.c @@ -462,12 +462,15 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static int queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) +static int queue_irp( struct device_file *file, const irp_params_t *params, struct async *async ) { - fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); + struct irp_call *irp = create_irp( file, params, async ); + if (!irp) return 0; + fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT ); irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file, irp, current ); + release_object( irp ); set_error( STATUS_PENDING ); return 1; } @@ -480,8 +483,6 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); @@ -489,20 +490,12 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.key = 0; params.read.pos = pos; params.read.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); @@ -510,52 +503,30 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.key = 0; params.write.pos = pos; params.write.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static int device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; params.flush.file = file->user_ptr; - - irp = create_irp( file, &params, NULL ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, NULL ); } static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct device_file *file = get_fd_user( fd ); - struct irp_call *irp; - obj_handle_t handle; irp_params_t params; memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; params.ioctl.file = file->user_ptr; - - irp = create_irp( file, &params, async ); - if (!irp) return 0; - - handle = queue_irp( file, irp, async ); - release_object( irp ); - return handle; + return queue_irp( file, &params, async ); } static struct device *create_device( struct object *root, const struct unicode_str *name,

1 0

Hugh McMaster : regedit: Do not remove lines beginning with a semicolon from the read buffer.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 5cc1b227b77b84407a506914e90c857b20f8960d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc1b227b77b84407a506914e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:32:54 2017 +0000 regedit: Do not remove lines beginning with a semicolon from the read buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 92c30e9..74f0640 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -991,11 +991,6 @@ static WCHAR *get_lineA(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';') - { - line = next; - continue; - } lineW = GetWideString(line); return lineW; } @@ -1054,11 +1049,6 @@ static WCHAR *get_lineW(FILE *fp) next = p + 1; if (*p == '\r' && *(p + 1) == '\n') next++; *p = 0; - if (*line == ';') - { - line = next; - continue; - } return line; }

1 0

Alistair Leslie-Hughes : dmime: Rename IPersistStreamImpl_Load functions.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 9c949389f6d4c10b29c3da933babbca1d8d8a553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c949389f6d4c10b29c3da933… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 09:26:38 2017 +0000 dmime: Rename IPersistStreamImpl_Load functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 4 ++-- dlls/dmime/markertrack.c | 4 ++-- dlls/dmime/paramcontroltrack.c | 4 ++-- dlls/dmime/segment.c | 4 ++-- dlls/dmime/segtriggertrack.c | 4 ++-- dlls/dmime/seqtrack.c | 4 ++-- dlls/dmime/sysextrack.c | 4 ++-- dlls/dmime/tempotrack.c | 4 ++-- dlls/dmime/timesigtrack.c | 4 ++-- dlls/dmime/wavetrack.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7038273..0800027 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + lyrics_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 852948a..32dd025 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_Clone }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI marker_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + marker_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index affea1d..1073399 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI param_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + param_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index ad8561f..f0e1482 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); HRESULT hr; @@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + seg_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index d1b208a..5afe5b7 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; @@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + trigger_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 2d80db7..d15f159 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI track_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + track_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 431fca7..3715fe3 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI sys_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + sys_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 70de442..537845e 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; @@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + tempo_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 9bd7450..74b2c36 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + time_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index bc6e3ca..c849f4c 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { FIXME(": Loading not implemented yet\n"); return S_OK; @@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + wave_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Alexandre Julliard : user32: Scale cursor sizes with the screen DPI.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: d4654e5799ffb02c025b0f41ccbf617e595186d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4654e5799ffb02c025b0f41c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 20:20:05 2017 +0200 user32: Scale cursor sizes with the screen DPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 ++++++ dlls/user32/tests/sysparams.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bec4d66..97f6b57 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2413,6 +2413,12 @@ INT WINAPI GetSystemMetrics( INT index ) return ret; case SM_CXCURSOR: case SM_CYCURSOR: + if (IsProcessDPIAware()) + { + ret = MulDiv( 32, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + if (ret >= 64) return 64; + if (ret >= 48) return 48; + } return 32; case SM_CYMENU: return GetSystemMetrics(SM_CYMENUSIZE) + 1; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b5ab784..fa473c1 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2696,6 +2696,14 @@ static BOOL is_font_enumerated(const char *name) return ret; } +static int get_cursor_size( int size ) +{ + /* only certain sizes are allowed for cursors */ + if (size >= 64) return 64; + if (size >= 48) return 48; + return 32; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2774,8 +2782,8 @@ static void test_GetSystemMetrics( void) /* These don't depend on the Shell Icon Size registry value */ ok_gsm( SM_CXICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); ok_gsm( SM_CYICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); - /* SM_CXCURSOR */ - /* SM_CYCURSOR */ + ok_gsm( SM_CXCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); + ok_gsm( SM_CYCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); ok_gsm( SM_CYMENU, ncm.iMenuHeight + 1); ok_gsm( SM_CXFULLSCREEN, GetSystemMetrics( SM_CXMAXIMIZED) - 2 * GetSystemMetrics( SM_CXFRAME));

1 0

Hugh McMaster : regedit: Check if any hex data exists before attempting to parse it.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 1a4c3e5d287dd8debda28fcf77e7270338e502df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4c3e5d287dd8debda28fcf7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:33:02 2017 +0000 regedit: Check if any hex data exists before attempting to parse it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 74f0640..e94d14e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -363,9 +363,12 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) WCHAR *end; DWORD val; + if (!**line) + return FALSE; + /* "hex(xx):" is special */ val = wcstoul(*line, &end, 16); - if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) + if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) return FALSE; parser->data_type = val;

1 0

Nikolay Sivov : regedit: Remove commented out block.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: d2697467b24c47a661cf6deaa0223fad795f1d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2697467b24c47a661cf6deaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 5 15:15:01 2017 +0300 regedit: Remove commented out block. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index c59d435..dc3152d 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -429,18 +429,6 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR /* if (nmitem->hdr.hwndFrom != hWnd) break; unnecessary because of WM_NOTIFY_REFLECT */ /* if (nmitem->hdr.idFrom != IDW_LISTVIEW) break; */ /* if (nmitem->hdr.code != ???) break; */ -#ifdef _MSC_VER - switch (nmitem->uKeyFlags) { - case LVKF_ALT: /* The ALT key is pressed. */ - /* properties dialog box ? */ - break; - case LVKF_CONTROL: /* The CTRL key is pressed. */ - /* run dialog box for providing parameters... */ - break; - case LVKF_SHIFT: /* The SHIFT key is pressed. */ - break; - } -#endif info.pt.x = nmitem->ptAction.x; info.pt.y = nmitem->ptAction.y; if (SendMessageW(hWnd, LVM_HITTEST, 0, (LPARAM)&info) != -1) {

1 0

Jacek Caban : server: Remove no longer needed NULL checks.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 99dfb290481783768ba7d7277905185c3c36d101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dfb290481783768ba7d7277… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:26 2017 +0200 server: Remove no longer needed NULL checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 11 +---------- server/file.h | 7 ++++++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/server/async.c b/server/async.c index 2bf00b6..0205807 100644 --- a/server/async.c +++ b/server/async.c @@ -381,19 +381,12 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota } } -/* check if there are any queued async operations */ -int async_queued( struct async_queue *queue ) -{ - return queue && list_head( &queue->queue ); -} - /* check if an async operation is waiting to be alerted */ int async_waiting( struct async_queue *queue ) { struct list *ptr; struct async *async; - if (!queue) return 0; if (!(ptr = list_head( &queue->queue ))) return 0; async = LIST_ENTRY( ptr, struct async, queue_entry ); return async->status == STATUS_PENDING; @@ -430,8 +423,6 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) { struct list *ptr, *next; - if (!queue) return; - LIST_FOR_EACH_SAFE( ptr, next, &queue->queue ) { struct async *async = LIST_ENTRY( ptr, struct async, queue_entry ); @@ -516,7 +507,7 @@ int async_is_blocking( struct async *async ) struct async *find_pending_async( struct async_queue *queue ) { struct async *async; - if (queue) LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) if (async->status == STATUS_PENDING) return (struct async *)grab_object( async ); return NULL; } diff --git a/server/file.h b/server/file.h index 506ef17..0633b87 100644 --- a/server/file.h +++ b/server/file.h @@ -185,7 +185,6 @@ extern obj_handle_t async_handoff( struct async *async, int success, data_size_t extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); -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 void async_wake_up( struct async_queue *queue, unsigned int status ); @@ -202,6 +201,12 @@ static inline void init_async_queue( struct async_queue *queue ) list_init( &queue->queue ); } +static inline int async_queued( struct async_queue *queue ) +{ + return !list_empty( &queue->queue ); +} + + /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)

1 0

Jacek Caban : server: Make async_queue object a simple list instead of a server object.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 0b4c8bf93f48e3d1792c88d7117ff34d749ae598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4c8bf93f48e3d1792c88d71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:19 2017 +0200 server: Make async_queue object a simple list instead of a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 72 ++++------------------------------------------------- server/fd.c | 53 +++++++++++++++++++-------------------- server/file.h | 11 +++++++- server/named_pipe.c | 43 ++++++++++++++------------------ server/sock.c | 53 +++++++++++++++++++-------------------- 5 files changed, 83 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b4c8bf93f48e3d1792c8…

1 0

Jacek Caban : server: Store completion in async object instead of async_queue.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 7f17bae74ee519c004220d3d2ecbad0f30e6030f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f17bae74ee519c004220d3d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:26:05 2017 +0200 server: Store completion in async object instead of async_queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/server/async.c b/server/async.c index ed85899..e612669 100644 --- a/server/async.c +++ b/server/async.c @@ -51,6 +51,8 @@ struct async struct iosb *iosb; /* I/O status block */ obj_handle_t wait_handle; /* pre-allocated wait handle */ int direct_result; /* a flag if we're passing result directly from request instead of APC */ + struct completion *completion; /* completion associated with fd */ + apc_param_t comp_key; /* completion key associated with fd */ }; static void async_dump( struct object *obj, int verbose ); @@ -85,8 +87,6 @@ struct async_queue { struct object obj; /* object header */ struct fd *fd; /* file descriptor owning this queue */ - struct completion *completion; /* completion associated with a recently closed file descriptor */ - apc_param_t comp_key; /* completion key associated with a recently closed file descriptor */ struct list queue; /* queue of async objects */ }; @@ -170,6 +170,7 @@ static void async_destroy( struct object *obj ) else if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); + if (async->completion) release_object( async->completion ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); release_object( async->thread ); @@ -184,9 +185,7 @@ static void async_queue_dump( struct object *obj, int verbose ) static void async_queue_destroy( struct object *obj ) { - struct async_queue *async_queue = (struct async_queue *)obj; assert( obj->ops == &async_queue_ops ); - if (async_queue->completion) release_object( async_queue->completion ); } /* notifies client thread of new status of its async request */ @@ -241,7 +240,6 @@ struct async_queue *create_async_queue( struct fd *fd ) if (queue) { queue->fd = fd; - queue->completion = NULL; list_init( &queue->queue ); } return queue; @@ -253,8 +251,11 @@ void free_async_queue( struct async_queue *queue ) struct async *async; if (!queue) return; - if (queue->fd) queue->completion = fd_get_completion( queue->fd, &queue->comp_key ); - LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) async->fd = NULL; + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + { + async->completion = fd_get_completion( async->fd, &async->comp_key ); + async->fd = NULL; + } queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -297,6 +298,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; + async->completion = NULL; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -386,19 +388,8 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - if (async->fd) - { - apc_param_t ckey; - struct completion *completion = fd_get_completion( async->fd, &ckey ); - - if (completion) - { - add_completion( completion, ckey, cvalue, status, information ); - release_object( completion ); - } - } - else if (async->queue && async->queue->completion) - add_completion( async->queue->completion, async->queue->comp_key, cvalue, status, information ); + if (async->fd && !async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); + if (async->completion) add_completion( async->completion, async->comp_key, cvalue, status, information ); } /* store the result of the client-side async callback */

1 0

Jacek Caban : server: Keep weak fd reference in async object when async is queued.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 9df88c305507672aea65f40c1fc499335276f6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df88c305507672aea65f40c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 4 15:25:51 2017 +0200 server: Keep weak fd reference in async object when async is queued. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/server/async.c b/server/async.c index 3a83a63..ed85899 100644 --- a/server/async.c +++ b/server/async.c @@ -118,7 +118,7 @@ static const struct object_ops async_queue_ops = static inline void async_reselect( struct async *async ) { - if (async->queue && async->queue->fd) fd_reselect_async( async->queue->fd, async->queue ); + if (async->queue && async->fd) fd_reselect_async( async->fd, async->queue ); } static void async_dump( struct object *obj, int verbose ) @@ -167,8 +167,8 @@ static void async_destroy( struct object *obj ) async_reselect( async ); release_object( async->queue ); } + else if (async->fd) release_object( async->fd ); - if (async->fd) release_object( async->fd ); if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); @@ -250,8 +250,11 @@ struct async_queue *create_async_queue( struct fd *fd ) /* free an async queue, cancelling all async operations */ void free_async_queue( struct async_queue *queue ) { + struct async *async; + if (!queue) return; if (queue->fd) queue->completion = fd_get_completion( queue->fd, &queue->comp_key ); + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) async->fd = NULL; queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -259,14 +262,14 @@ void free_async_queue( struct async_queue *queue ) void queue_async( struct async_queue *queue, struct async *async ) { + /* fd will be set to NULL in free_async_queue when fd is destroyed */ release_object( async->fd ); - async->fd = NULL; async->queue = (struct async_queue *)grab_object( queue ); grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); - if (queue->fd) set_fd_signaled( queue->fd, 0 ); + if (async->fd) set_fd_signaled( async->fd, 0 ); } /* create an async on a given queue of a fd */ @@ -383,12 +386,10 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { - struct fd *fd = async->queue ? async->queue->fd : async->fd; - - if (fd) + if (async->fd) { apc_param_t ckey; - struct completion *completion = fd_get_completion( fd, &ckey ); + struct completion *completion = fd_get_completion( async->fd, &ckey ); if (completion) { @@ -443,7 +444,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->event) set_event( async->event ); else if (async->fd) set_fd_signaled( async->fd, 1 ); - else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); if (!async->signaled) { async->signaled = 1; @@ -473,15 +473,13 @@ int async_waiting( struct async_queue *queue ) static int cancel_async( struct process *process, struct object *obj, struct thread *thread, client_ptr_t iosb ) { struct async *async; - struct fd *fd; int woken = 0; restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - fd = async->queue ? async->queue->fd : async->fd; - if ((!obj || (fd && get_fd_user( fd ) == obj)) && + if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) {

1 0