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

Piotr Caban : msvcrt: Get rid of msvcrt_fdtoh helper.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 86baccc9ae9f79cc542c53e31edfdc9bf8f99a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86baccc9ae9f79cc542c53e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:47 2015 +0200 msvcrt: Get rid of msvcrt_fdtoh helper. --- dlls/msvcrt/file.c | 24 +++--------------------- dlls/msvcrt/tests/file.c | 5 +++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7bdb468..d7a8f3a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -309,26 +309,6 @@ static inline BOOL msvcrt_is_valid_fd(int fd) return fd >= 0 && fd < MSVCRT_fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN); } -/* INTERNAL: Get the HANDLE for a fd - * This doesn't lock the table, because a failure will result in - * INVALID_HANDLE_VALUE being returned, which should be handled correctly. If - * it returns a valid handle which is about to be closed, a subsequent call - * will fail, most likely in a sane way. - */ -static HANDLE msvcrt_fdtoh(int fd) -{ - if (!msvcrt_is_valid_fd(fd)) - { - WARN(":fd (%d) - no handle!\n",fd); - *MSVCRT___doserrno() = 0; - *MSVCRT__errno() = MSVCRT_EBADF; - return INVALID_HANDLE_VALUE; - } - if (get_ioinfo_nolock(fd)->handle == INVALID_HANDLE_VALUE) - WARN("returning INVALID_HANDLE_VALUE for %d\n", fd); - return get_ioinfo_nolock(fd)->handle; -} - /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { @@ -1848,9 +1828,11 @@ int CDECL _futime(int fd, struct MSVCRT___utimbuf32 *t) */ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) { - HANDLE hand = msvcrt_fdtoh(fd); + HANDLE hand = get_ioinfo_nolock(fd)->handle; TRACE(":fd (%d) handle (%p)\n",fd,hand); + if(hand == INVALID_HANDLE_VALUE) + *MSVCRT__errno() = MSVCRT_EBADF; return (MSVCRT_intptr_t)hand; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 860db6a..c4d8fa1 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1850,6 +1850,11 @@ static void test_get_osfhandle(void) _close(fd); _unlink(fname); + + errno = 0xdeadbeef; + handle = (HANDLE)_get_osfhandle(fd); + ok(handle == INVALID_HANDLE_VALUE, "_get_osfhandle returned %p\n", handle); + ok(errno == EBADF, "errno = %d\n", errno); } static void test_setmaxstdio(void)

1 0

Piotr Caban : msvcrt: Get rid of msvcrt_is_valid_fd helper.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: bd6eaf918c50642423b00b4be8eaa933a9e77135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6eaf918c50642423b00b4be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:26:00 2015 +0200 msvcrt: Get rid of msvcrt_is_valid_fd helper. --- dlls/msvcrt/file.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1d144b2..5644a61 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -304,11 +304,6 @@ static inline MSVCRT_FILE* msvcrt_get_file(int i) return &ret->file; } -static inline BOOL msvcrt_is_valid_fd(int fd) -{ - return fd >= 0 && fd < MSVCRT_fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN); -} - /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { @@ -454,7 +449,7 @@ static MSVCRT_FILE* msvcrt_alloc_fp(void) static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) { TRACE(":fd (%d) allocating FILE*\n",fd); - if (!msvcrt_is_valid_fd(fd)) + if (!(get_ioinfo_nolock(fd)->wxflag & WX_OPEN)) { WARN(":invalid fd %d\n",fd); *MSVCRT___doserrno() = 0;

1 0

Nikolay Sivov : mshtml: Handle allocation failure during collection creation (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: a260d3efc625e763c12986cc101a113ca1e4bd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a260d3efc625e763c12986cc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 14:36:02 2015 +0300 mshtml: Handle allocation failure during collection creation (Coverity). --- dlls/mshtml/htmlelemcol.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index a57f39e..c6c65b1 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -824,6 +824,9 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); + if (!ret) + return NULL; + ret->IHTMLElementCollection_iface.lpVtbl = &HTMLElementCollectionVtbl; ret->ref = 1; ret->elems = elems;

1 0

Nikolay Sivov : winebuild: Remove always false condition (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 233c8c163b28bb1dddc09d75eb03a257b92504f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233c8c163b28bb1dddc09d75e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 14:25:52 2015 +0300 winebuild: Remove always false condition (Coverity). --- tools/winebuild/spec32.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 98060b5..c27f0dd 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -863,8 +863,6 @@ void output_def_file( DLLSPEC *spec, int include_private ) const ORDDEF *odp = &spec->entry_points[i]; int is_data = 0; - if (!odp) continue; - if (odp->name) name = odp->name; else if (odp->export_name) name = odp->export_name; else continue;

1 0

Nikolay Sivov : oleaut32: Improve error handling in GetRecordInfoFromTypeInfo() (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 8d4f56810775757edc87f6f01754df7f9e98d7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4f56810775757edc87f6f01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 16:04:16 2015 +0300 oleaut32: Improve error handling in GetRecordInfoFromTypeInfo() (Coverity). --- dlls/oleaut32/recinfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index f60fb8a..ec65a52 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -650,7 +650,12 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo WARN("GetRefTypeInfo failed: %08x\n", hres); return hres; } - ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); + hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); + if(FAILED(hres)) { + ITypeInfo_Release(pTypeInfo); + WARN("GetTypeAttr failed for referenced type: %08x\n", hres); + return hres; + } }else { pTypeInfo = pTI; ITypeInfo_AddRef(pTypeInfo);

1 0

Piotr Caban : msvcrt: Use fd critical section in msvcrt_create_io_inherit_block.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 9ce2a8a60c14cfeac737f8dcfad8f8325265405a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce2a8a60c14cfeac737f8dcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:52 2015 +0200 msvcrt: Use fd critical section in msvcrt_create_io_inherit_block. --- dlls/msvcrt/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d7a8f3a..1d144b2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -498,7 +498,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) for (fd = 0; fd < MSVCRT_fdend; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ - fdinfo = get_ioinfo_nolock(fd); + fdinfo = get_ioinfo(fd); if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN) { *wxflag_ptr = fdinfo->wxflag; @@ -509,6 +509,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *wxflag_ptr = 0; *handle_ptr = INVALID_HANDLE_VALUE; } + release_ioinfo(fdinfo); wxflag_ptr++; handle_ptr++; } return TRUE;

1 0

Piotr Caban : msvcrt: Use fd critical section in read.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 16285f5700ff713d376b930e3bd6963d821931f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16285f5700ff713d376b930e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:35 2015 +0200 msvcrt: Use fd critical section in read. --- dlls/msvcrt/file.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 616e205..25c5626 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2468,9 +2468,8 @@ static inline int get_utf8_char_len(char ch) /********************************************************************* * (internal) read_utf8 */ -static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) +static int read_utf8(ioinfo *fdinfo, MSVCRT_wchar_t *buf, unsigned int count) { - ioinfo *fdinfo = get_ioinfo_nolock(fd); HANDLE hand = fdinfo->handle; char min_buf[4], *readbuf, lookahead; DWORD readbuf_size, pos=0, num_read=1, char_len, i, j; @@ -2645,12 +2644,10 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) * the file pointer on the \r character while getc() goes on to * the following \n */ -static int read_i(int fd, void *buf, unsigned int count) +static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) { DWORD num_read, utf16; char *bufstart = buf; - HANDLE hand = msvcrt_fdtoh(fd); - ioinfo *fdinfo = get_ioinfo_nolock(fd); if (count == 0) return 0; @@ -2661,8 +2658,8 @@ static int read_i(int fd, void *buf, unsigned int count) } /* Don't trace small reads, it gets *very* annoying */ if (count > 4) - TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); - if (hand == INVALID_HANDLE_VALUE) + TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n", fd, fdinfo->handle, buf, count); + if (fdinfo->handle == INVALID_HANDLE_VALUE) { *MSVCRT__errno() = MSVCRT_EBADF; return -1; @@ -2676,9 +2673,9 @@ static int read_i(int fd, void *buf, unsigned int count) } if((fdinfo->wxflag&WX_TEXT) && (fdinfo->exflag&EF_UTF8)) - return read_utf8(fd, buf, count); + return read_utf8(fdinfo, buf, count); - if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL)) + if (fdinfo->lookahead[0]!='\n' || ReadFile(fdinfo->handle, bufstart, count, &num_read, NULL)) { if (fdinfo->lookahead[0] != '\n') { @@ -2691,7 +2688,7 @@ static int read_i(int fd, void *buf, unsigned int count) fdinfo->lookahead[1] = '\n'; } - if(count>1+utf16 && ReadFile(hand, bufstart+1+utf16, count-1-utf16, &num_read, NULL)) + if(count>1+utf16 && ReadFile(fdinfo->handle, bufstart+1+utf16, count-1-utf16, &num_read, NULL)) num_read += 1+utf16; else num_read = 1+utf16; @@ -2736,7 +2733,7 @@ static int read_i(int fd, void *buf, unsigned int count) DWORD len; lookahead[1] = '\n'; - if (ReadFile(hand, lookahead, 1+utf16, &len, NULL) && len) + if (ReadFile(fdinfo->handle, lookahead, 1+utf16, &len, NULL) && len) { if(lookahead[0]=='\n' && (!utf16 || lookahead[1]==0) && j==0) { @@ -2809,9 +2806,10 @@ static int read_i(int fd, void *buf, unsigned int count) */ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) { - int num_read; - num_read = read_i(fd, buf, count); - return num_read; + ioinfo *info = get_ioinfo(fd); + int num_read = read_i(fd, info, buf, count); + release_ioinfo(info); + return num_read; } /********************************************************************* @@ -3558,14 +3556,14 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; - if ((r = read_i(file->_file,&c,1)) != 1) { + if ((r = MSVCRT__read(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; return MSVCRT_EOF; } return c; } else { - file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); + file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0;

1 0

Piotr Caban : msvcrt: Use fd critical section in msvcrt_free_fd.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: b052afd4afab68eb9319e2b19fb18152f395b409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b052afd4afab68eb9319e2b19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:23 2015 +0200 msvcrt: Use fd critical section in msvcrt_free_fd. --- dlls/msvcrt/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1077752..616e205 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -332,10 +332,8 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - ioinfo *fdinfo; + ioinfo *fdinfo = get_ioinfo(fd); - LOCK_FILES(); - fdinfo = get_ioinfo_nolock(fd); if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; @@ -358,7 +356,9 @@ static void msvcrt_free_fd(int fd) break; } } + release_ioinfo(fdinfo); + LOCK_FILES(); if (fd == MSVCRT_fdend - 1) MSVCRT_fdend--; if (fd < MSVCRT_fdstart)

1 0

Nikolay Sivov : comctl32/toolbar: Remove always true condition (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: b7969dfd9413ab21ccf0a36d085f78077cb351e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7969dfd9413ab21ccf0a36d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 11:10:24 2015 +0300 comctl32/toolbar: Remove always true condition (Coverity). --- dlls/comctl32/toolbar.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ecf0604..2c7ed63 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3347,8 +3347,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb if (nIndex == -1) return -1; - if (!(btnPtr = &infoPtr->buttons[nIndex])) return -1; - + btnPtr = &infoPtr->buttons[nIndex]; if (lpTbInfo->dwMask & TBIF_COMMAND) lpTbInfo->idCommand = btnPtr->idCommand; if (lpTbInfo->dwMask & TBIF_IMAGE)

1 0

Alexandre Julliard : server: Check for the current owner window on the server side for releases.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 25d9fc3ecc0bd283437e5d52e3c4ba3b7ed1b303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d9fc3ecc0bd283437e5d52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:46:01 2015 +0900 server: Check for the current owner window on the server side for releases. --- dlls/user32/clipboard.c | 17 +++-------------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 +-- server/clipboard.c | 9 +++++---- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index c55b830..cd3fdd75 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -121,26 +121,15 @@ static BOOL CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) /************************************************************************** * CLIPBOARD_ReleaseOwner */ -BOOL CLIPBOARD_ReleaseOwner(void) +void CLIPBOARD_ReleaseOwner( HWND hwnd ) { - BOOL bRet = FALSE; - SERVER_START_REQ( set_clipboard_info ) { req->flags = SET_CB_RELOWNER | SET_CB_SEQNO; - - if (wine_server_call_err( req )) - { - ERR("Failed to set clipboard.\n"); - } - else - { - bRet = TRUE; - } + req->owner = wine_server_user_handle( hwnd ); + wine_server_call( req ); } SERVER_END_REQ; - - return bRet; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e0c1b43..1fbecb9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -222,7 +222,7 @@ extern HMODULE user32_module DECLSPEC_HIDDEN; struct dce; struct tagWND; -extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; +extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7090cb0..7a3f484 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1875,8 +1875,7 @@ BOOL WINAPI DestroyWindow( HWND hwnd ) WIN_SendDestroyMsg( hwnd ); if (!IsWindow( hwnd )) return TRUE; - if (GetClipboardOwner() == hwnd) - CLIPBOARD_ReleaseOwner(); + CLIPBOARD_ReleaseOwner( hwnd ); /* Destroy the window storage */ diff --git a/server/clipboard.c b/server/clipboard.c index 7a77ed2..9acee98 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -172,11 +172,12 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) return 1; } -static int release_clipboard_owner( struct clipboard *clipboard ) +static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) { - if (clipboard->open_thread && clipboard->open_thread->process != current->process) + if ((clipboard->open_thread && clipboard->open_thread->process != current->process) || + (win && clipboard->owner_win != get_user_full_handle( win ))) { - set_error(STATUS_WAS_LOCKED); + set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); return 0; } clipboard->owner_win = 0; @@ -221,7 +222,7 @@ DECL_HANDLER(set_clipboard_info) } else if (req->flags & SET_CB_RELOWNER) { - if (!release_clipboard_owner( clipboard )) return; + if (!release_clipboard_owner( clipboard, req->owner )) return; } if (req->flags & SET_CB_VIEWER) clipboard->viewer = get_user_full_handle( req->viewer );

1 0