wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Qian Hong : ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 71080cc0818e8cc3e8be0c30bcc6602be7db12d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71080cc0818e8cc3e8be0c30b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jun 2 22:09:48 2015 +0800 ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject. --- dlls/ntdll/om.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 22 +++++++++++----------- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/directory.c | 18 ++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 6 ++++++ server/trace.c | 15 ++++++++++++++- 7 files changed, 113 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71080cc0818e8cc3e8be0…

1 0

Sebastian Lackner : ntdll/tests: Don' t call lstrlenW on non-null-terminated buffer.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: d6a044c86a2977376341b6ac3a151366ec11d0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a044c86a2977376341b6ac3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 4 16:12:58 2015 +0200 ntdll/tests: Don't call lstrlenW on non-null-terminated buffer. --- dlls/ntdll/tests/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 21aa31f..730b0f1 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -350,7 +350,7 @@ static void test_NtQueryDirectoryFile_case(void) } mask.Buffer = testmask; - mask.Length = mask.MaximumLength = lstrlenW(testmask) * sizeof(WCHAR); + mask.Length = mask.MaximumLength = sizeof(testmask); pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, FALSE); ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status);

1 0

Nikolay Sivov : shell32/tests: Fix tests failures on win2k.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: d5d49464d30582c904c199be21975562be3366c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d49464d30582c904c199be2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 20:28:50 2015 +0300 shell32/tests: Fix tests failures on win2k. --- dlls/shell32/tests/shelldispatch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 22eabf5..1f27cfa 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -451,7 +451,7 @@ if (0) /* crashes on pre-vista */ { disp = (void*)0xdeadbeef; hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IShellFolderViewDual, (void**)&disp); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* win2k */, "got 0x%08x\n", hr); ok(disp == NULL, "got %p\n", disp); IShellView_Release(view); @@ -704,14 +704,14 @@ static void test_ParseName(void) item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, NULL, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); /* empty name */ str = SysAllocStringLen(NULL, 0); item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, str, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); SysFreeString(str); @@ -719,7 +719,7 @@ static void test_ParseName(void) str = SysAllocString(cadabraW); item = (void*)0xdeadbeef; hr = Folder_ParseName(folder, str, &item); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == E_INVALIDARG) /* win2k */, "got 0x%08x\n", hr); ok(item == NULL, "got %p\n", item); SysFreeString(str);

1 0

Ken Thomases : configure: Warn for a 64-bit build without CFI directive support.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 8c60dc0706c8f7674b2bf0106555bc44ac971ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c60dc0706c8f7674b2bf0106… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 4 13:57:59 2015 -0500 configure: Warn for a 64-bit build without CFI directive support. --- configure | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index f47c09e..279c3bc 100755 --- a/configure +++ b/configure @@ -14649,6 +14649,10 @@ $as_echo "#define __ASM_CFI(str) str" >>confdefs.h else $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h + if test "x$enable_win64" = "xyes" + then + as_fn_append wine_warnings "|building 64-bit Wine without support for CFI directives; exception handling will not work properly." + fi fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" diff --git a/configure.ac b/configure.ac index c61a975..9b25196 100644 --- a/configure.ac +++ b/configure.ac @@ -1987,6 +1987,10 @@ then AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) else AC_DEFINE([__ASM_CFI(str)],[""]) + if test "x$enable_win64" = "xyes" + then + WINE_WARNING([building 64-bit Wine without support for CFI directives; exception handling will not work properly.]) + fi fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer"

1 0

Ken Thomases : winemac: Remove extraneous CDECL attribute.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 0c395c24e3f7a5849b92e9d479ce574e7ab27df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c395c24e3f7a5849b92e9d47… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 4 13:57:32 2015 -0500 winemac: Remove extraneous CDECL attribute. --- dlls/winemac.drv/macdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a874dfb..a31d7e3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -197,7 +197,7 @@ extern void macdrv_clipboard_process_attach(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; -extern BOOL CDECL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; +extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN;

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 _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

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 _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

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

← Newer
1
...
50
51
52
53
54
55
56
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015