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

Nikolay Sivov : ole32: Fix length of buffer allocated by SNB_UserUnmarshal () (Valgrind).
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: bfa23b637e903fec2424734c1927cb0fed5da689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa23b637e903fec2424734c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 00:49:13 2015 +0300 ole32: Fix length of buffer allocated by SNB_UserUnmarshal() (Valgrind). --- dlls/ole32/usrmarshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 2cb97f3..d22f9f7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2247,7 +2247,7 @@ unsigned char * __RPC_USER SNB_UserUnmarshal(ULONG *pFlags, unsigned char *pBuff WCHAR **ptrW; ULONG i; - ptrW = *pSnb = umcb->pStubMsg->pfnAllocate((wire->strcnt+1)*sizeof(WCHAR*) + wire->datalen); + ptrW = *pSnb = umcb->pStubMsg->pfnAllocate((wire->strcnt+1)*sizeof(WCHAR*) + wire->datalen*sizeof(WCHAR)); dest = (WCHAR*)(*pSnb + wire->strcnt + 1); for (i = 0; i < wire->strcnt; i++)

1 0

Nikolay Sivov : oledb32: Handle CLSIDFromProgID() failure (Coverity).
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 1d08eb284ac3e9863e9fc689db4168030c431a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d08eb284ac3e9863e9fc689d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 18:32:12 2015 +0300 oledb32: Handle CLSIDFromProgID() failure (Coverity). --- dlls/oledb32/datainit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3cd3821..3e1f509 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -498,10 +498,10 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o TRACE("initial data source provider %s\n", debugstr_w(V_BSTR(&propset->rgProperties[0].vValue))); initprov = IID_NULL; - CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); + hr = CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); free_dbpropset(count, propset); - if (!IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; + if (FAILED(hr) || !IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; } if (!*datasource)

1 0

Alexandre Julliard : user32/tests: Add tests for clipboard sequence number and notifications.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 9ce9ba30ead7560065c3179796eea81066b3b346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce9ba30ead7560065c317979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 20:13:53 2015 +0900 user32/tests: Add tests for clipboard sequence number and notifications. --- dlls/user32/tests/clipboard.c | 183 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2a0d6e2..e3ca808 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,6 +24,9 @@ #include "wingdi.h" #include "winuser.h" +static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); +static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; @@ -278,9 +281,14 @@ static CRITICAL_SECTION clipboard_cs; static HWND next_wnd; static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { + static UINT wm_drawclipboard; + static UINT wm_clipboardupdate; + LRESULT ret; + switch(msg) { case WM_DRAWCLIPBOARD: EnterCriticalSection(&clipboard_cs); + wm_drawclipboard++; LeaveCriticalSection(&clipboard_cs); break; case WM_CHANGECBCHAIN: @@ -289,10 +297,21 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA else if (next_wnd) SendMessageA(next_wnd, msg, wp, lp); break; + case WM_CLIPBOARDUPDATE: + wm_clipboardupdate++; + break; case WM_USER: ChangeClipboardChain(hwnd, next_wnd); PostQuitMessage(0); break; + case WM_USER+1: + ret = wm_drawclipboard; + wm_drawclipboard = 0; + return ret; + case WM_USER+2: + ret = wm_clipboardupdate; + wm_clipboardupdate = 0; + return ret; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -302,24 +321,183 @@ static DWORD WINAPI clipboard_thread(void *param) { HWND win = param; BOOL r; + HANDLE handle; + UINT count, old_seq = 0, seq; + + if (pGetClipboardSequenceNumber) old_seq = pGetClipboardSequenceNumber(); EnterCriticalSection(&clipboard_cs); SetLastError(0xdeadbeef); next_wnd = SetClipboardViewer(win); ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); + if (pAddClipboardFormatListener) + { + r = pAddClipboardFormatListener(win); + ok( r, "AddClipboardFormatListener failed err %d\n", GetLastError()); + } + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( seq == old_seq, "sequence changed\n" ); + } + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok( count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( seq == old_seq, "sequence changed\n" ); + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + /* sequence changes again, even though it was already empty */ + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + handle = SetClipboardData( CF_TEXT, create_text() ); + ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + SetClipboardData( CF_UNICODETEXT, 0 ); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( seq == old_seq, "sequence changed\n" ); + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + SetClipboardData( CF_WAVE, 0 ); + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + if (pGetClipboardSequenceNumber) + { + /* no synthesized format, so CloseClipboard doesn't change the sequence */ + seq = pGetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + old_seq = seq; + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( count, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); + + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + /* nothing changed */ + if (pGetClipboardSequenceNumber) + { + seq = pGetClipboardSequenceNumber(); + ok( seq == old_seq, "sequence changed\n" ); + } + count = SendMessageA( win, WM_USER+1, 0, 0 ); + ok( !count, "WM_DRAWCLIPBOARD received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0; @@ -361,6 +539,11 @@ static void test_messages(void) START_TEST(clipboard) { + HMODULE mod = GetModuleHandleA( "user32" ); + + pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); + pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

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

June 4, 2015

Module: wine Branch: master Commit: ba757eaec748841854a1410c9adfc08cef509719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba757eaec748841854a1410c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 4 11:25:00 2015 +0200 msvcrt: Use fd critical section in _write. --- dlls/msvcrt/file.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 07863be..0d4a6f4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3283,7 +3283,7 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { DWORD num_written; - ioinfo *info = get_ioinfo_nolock(fd); + ioinfo *info = get_ioinfo(fd); HANDLE hand = info->handle; /* Don't trace small writes, it gets *very* annoying */ @@ -3294,12 +3294,14 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (hand == INVALID_HANDLE_VALUE) { *MSVCRT__errno() = MSVCRT_EBADF; + release_ioinfo(info); return -1; } if (((info->exflag&EF_UTF8) || (info->exflag&EF_UTF16)) && count&1) { *MSVCRT__errno() = MSVCRT_EINVAL; + release_ioinfo(info); return -1; } @@ -3311,7 +3313,10 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { if (WriteFile(hand, buf, count, &num_written, NULL) && (num_written == count)) + { + release_ioinfo(info); return num_written; + } TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, hand, GetLastError()); *MSVCRT__errno() = MSVCRT_ENOSPC; @@ -3402,6 +3407,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if(!conv_len) { msvcrt_set_errno(GetLastError()); MSVCRT_free(p); + release_ioinfo(info); return -1; } @@ -3433,6 +3439,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (!WriteFile(hand, q, size, &num_written, NULL)) num_written = -1; + release_ioinfo(info); if(p) MSVCRT_free(p); if (num_written != size) @@ -3445,6 +3452,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) return count; } + release_ioinfo(info); return -1; }

1 0

Thomas Faller : gdi32: Prevent unneeded operations by flag check.
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 9244cac3afe8723375d2e9e5f0d3ffaf30b751dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9244cac3afe8723375d2e9e5f… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Jun 4 01:22:53 2015 +0200 gdi32: Prevent unneeded operations by flag check. --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 40ba7e7..9f0de0e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2255,7 +2255,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, sinEsc = 0; } - if (lprect) + if (lprect && (flags & (ETO_OPAQUE | ETO_CLIPPED))) { rc = *lprect; LPtoDP(hdc, (POINT*)&rc, 2);

1 0

Nikolay Sivov : wineoss: Properly initialize pollfd structure (Coverity).
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: d05999217e064d1fa42349984b8fa46bcfb93690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05999217e064d1fa42349984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:28:23 2015 +0300 wineoss: Properly initialize pollfd structure (Coverity). --- dlls/wineoss.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index c359fe0..3a2ab25 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -642,7 +642,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) TRACE("Thread startup\n"); pfd.fd = midiSeqFD; - pfd.fd = POLLIN; + pfd.events = POLLIN; while(!end_thread) { TRACE("Thread loop\n");

1 0

Nikolay Sivov : dwrite: Fix potential null pointer access in GetFontCollection() (Coverity).
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 6f99f196fc0bf48583a45ef1114e8a571f4dc3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f99f196fc0bf48583a45ef11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 18:57:54 2015 +0300 dwrite: Fix potential null pointer access in GetFontCollection() (Coverity). --- dlls/dwrite/layout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 365f0b2..8f42433 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1863,8 +1863,11 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou TRACE("(%p)->(%u %p %p)\n", This, position, collection, r); + if (position >= This->len) + return S_OK; + range = get_layout_range_by_pos(This, position); - *collection = range ? range->collection : NULL; + *collection = range->collection; if (*collection) IDWriteFontCollection_AddRef(*collection);

1 0

Nikolay Sivov : shell32/tests: Fix Verbs instance leak (Valgrind).
by Alexandre Julliard June 4, 2015

June 4, 2015

Module: wine Branch: master Commit: 98da69a83f504097d10f78414368f6edbeff8e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98da69a83f504097d10f78414… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 23:08:08 2015 +0300 shell32/tests: Fix Verbs instance leak (Valgrind). --- dlls/shell32/tests/shelldispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f9d92ee..492d446 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -822,6 +822,7 @@ if (0) { /* crashes on winxp/win2k3 */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(verb == NULL, "got %p\n", verb); + FolderItemVerbs_Release(verbs); FolderItem_Release(item); IShellDispatch_Release(sd); }

1 0

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

June 4, 2015

Module: wine Branch: master Commit: f00b7f4058489f8c517a083cedf879957e0b0bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00b7f4058489f8c517a083ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 4 11:24:44 2015 +0200 msvcrt: Use fd critical section in _setmode. --- dlls/msvcrt/file.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5644a61..c9f9cae 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2797,30 +2797,34 @@ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) */ int CDECL MSVCRT__setmode(int fd,int mode) { - int ret = get_ioinfo_nolock(fd)->wxflag & WX_TEXT ? MSVCRT__O_TEXT : MSVCRT__O_BINARY; - if(ret==MSVCRT__O_TEXT && (get_ioinfo_nolock(fd)->exflag & (EF_UTF8|EF_UTF16))) + ioinfo *info = get_ioinfo(fd); + int ret = info->wxflag & WX_TEXT ? MSVCRT__O_TEXT : MSVCRT__O_BINARY; + if(ret==MSVCRT__O_TEXT && (info->exflag & (EF_UTF8|EF_UTF16))) ret = MSVCRT__O_WTEXT; if(mode!=MSVCRT__O_TEXT && mode!=MSVCRT__O_BINARY && mode!=MSVCRT__O_WTEXT && mode!=MSVCRT__O_U16TEXT && mode!=MSVCRT__O_U8TEXT) { *MSVCRT__errno() = MSVCRT_EINVAL; + release_ioinfo(info); return -1; } if(mode == MSVCRT__O_BINARY) { - get_ioinfo_nolock(fd)->wxflag &= ~WX_TEXT; - get_ioinfo_nolock(fd)->exflag &= ~(EF_UTF8|EF_UTF16); + info->wxflag &= ~WX_TEXT; + info->exflag &= ~(EF_UTF8|EF_UTF16); + release_ioinfo(info); return ret; } - get_ioinfo_nolock(fd)->wxflag |= WX_TEXT; + info->wxflag |= WX_TEXT; if(mode == MSVCRT__O_TEXT) - get_ioinfo_nolock(fd)->exflag &= ~(EF_UTF8|EF_UTF16); + info->exflag &= ~(EF_UTF8|EF_UTF16); else if(mode == MSVCRT__O_U8TEXT) - get_ioinfo_nolock(fd)->exflag = (get_ioinfo_nolock(fd)->exflag & ~EF_UTF16) | EF_UTF8; + info->exflag = (info->exflag & ~EF_UTF16) | EF_UTF8; else - get_ioinfo_nolock(fd)->exflag = (get_ioinfo_nolock(fd)->exflag & ~EF_UTF8) | EF_UTF16; + info->exflag = (info->exflag & ~EF_UTF8) | EF_UTF16; + release_ioinfo(info); return ret; }

1 0

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

June 3, 2015

Module: wine Branch: master Commit: 9278190d4689f0b2a9f52948975f018b5cec515e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9278190d4689f0b2a9f529489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:40 2015 +0200 msvcrt: Use fd critical section in _futime64. --- dlls/msvcrt/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 25c5626..7bdb468 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1788,7 +1788,7 @@ int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf) */ int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) { - HANDLE hand = msvcrt_fdtoh(fd); + ioinfo *info = get_ioinfo(fd); FILETIME at, wt; if (!t) @@ -1802,11 +1802,13 @@ int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) time_to_filetime( t->modtime, &wt ); } - if (!SetFileTime(hand, NULL, &at, &wt)) + if (!SetFileTime(info->handle, NULL, &at, &wt)) { + release_ioinfo(info); msvcrt_set_errno(GetLastError()); return -1 ; } + release_ioinfo(info); return 0; }

1 0