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

Nikolay Sivov : ole32: Fix length of buffer allocated by SNB_UserUnmarshal () (Valgrind).
by Alexandre Julliard 04 Jun '15

04 Jun '15

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 : shell32/tests: Fix one of test failures on win2k.
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 8c11e6b2f09edf9d32b88e7d9c876522e4ed177f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c11e6b2f09edf9d32b88e7d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 00:57:12 2015 +0300 shell32/tests: Fix one of test failures on win2k. --- 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 492d446..22eabf5 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -398,6 +398,7 @@ static void test_ShellFolderViewDual(void) &IID_IShellDispatch6, &IID_IShellDispatch5, &IID_IShellDispatch4, + &IID_IShellDispatch2, &IID_NULL }; IShellFolderViewDual *viewdual;

1 0

Michael Müller : wbemprox: Treat \r as whitespace.
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: 688db4d273ed7f2155094bae03033eafc62760ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=688db4d273ed7f2155094bae0… Author: Michael Müller <michael(a)fds-team.de> Date: Sun May 24 03:53:13 2015 +0200 wbemprox: Treat \r as whitespace. --- dlls/wbemprox/tests/query.c | 4 +++- dlls/wbemprox/wql.y | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a7bf201..b46ff52 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -96,7 +96,9 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=', '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 }; + static const WCHAR query9[] = + {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 6eabe19..734c4da 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -583,6 +583,7 @@ static int get_token( const WCHAR *s, int *token ) { case ' ': case '\t': + case '\r': case '\n': for (i = 1; isspaceW( s[i] ); i++) {} *token = TK_SPACE;

1 0

Thomas Faller : gdi32: Prevent unneeded operations by flag check.
by Alexandre Julliard 04 Jun '15

04 Jun '15

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

Sebastian Lackner : server: Fix opening clipboard from multiple threads.
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: e05e99d7548d5c7b1c0ec6176532a6a6ffb7cf0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05e99d7548d5c7b1c0ec6176… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 3 18:12:07 2015 +0200 server: Fix opening clipboard from multiple threads. --- dlls/user32/tests/clipboard.c | 17 ++++++++++++++++- server/clipboard.c | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index a9aef84..2a0d6e2 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,9 +24,18 @@ #include "wingdi.h" #include "winuser.h" +static DWORD WINAPI open_clipboard_thread(LPVOID arg) +{ + HWND hWnd = arg; + ok(OpenClipboard(hWnd), "OpenClipboard failed\n"); + return 0; +} + static void test_ClipboardOwner(void) { + HANDLE thread; HWND hWnd1, hWnd2; + DWORD dwret; BOOL ret; SetLastError(0xdeadbeef); @@ -56,7 +65,13 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); + thread = CreateThread(NULL, 0, open_clipboard_thread, hWnd1, 0, NULL); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + dwret = WaitForSingleObject(thread, 1000); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + CloseHandle(thread); + ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); + ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); diff --git a/server/clipboard.c b/server/clipboard.c index 9acee98..87dde50 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -138,7 +138,7 @@ void cleanup_clipboard_thread(struct thread *thread) static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { win = get_user_full_handle( win ); - if (clipboard->open_thread && (clipboard->open_thread != current || clipboard->open_win != win)) + if (clipboard->open_thread && clipboard->open_win != win) { set_error(STATUS_WAS_LOCKED); return 0;

1 0

Piotr Caban : msvcrt: Use fd critical section in _setmode.
by Alexandre Julliard 04 Jun '15

04 Jun '15

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: Don't lock __badioinfo.
by Alexandre Julliard 04 Jun '15

04 Jun '15

Module: wine Branch: master Commit: eec7a565bec2564ef4aef650ea3e5ff93a776085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec7a565bec2564ef4aef650e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 4 11:24:52 2015 +0200 msvcrt: Don't lock __badioinfo. --- dlls/msvcrt/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c9f9cae..07863be 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -260,6 +260,8 @@ static inline ioinfo* get_ioinfo_nolock(int fd) static inline ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); + if(ret == &MSVCRT___badioinfo) + return ret; if(!(ret->exflag & EF_CRIT_INIT)) { LOCK_FILES(); if(!(ret->exflag & EF_CRIT_INIT)) { @@ -274,7 +276,7 @@ static inline ioinfo* get_ioinfo(int fd) static inline void release_ioinfo(ioinfo *info) { - if(info->exflag & EF_CRIT_INIT) + if(info!=&MSVCRT___badioinfo && info->exflag & EF_CRIT_INIT) LeaveCriticalSection(&info->crit); }

1 0

Piotr Caban : msvcrt: Use fd critical section in _write.
by Alexandre Julliard 04 Jun '15

04 Jun '15

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

Alexandre Julliard : user32/tests: Add tests for clipboard sequence number and notifications.
by Alexandre Julliard 04 Jun '15

04 Jun '15

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 _futime64.
by Alexandre Julliard 03 Jun '15

03 Jun '15

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