Sebastian Lackner : server: Fix opening clipboard from multiple threads.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 4 09:32:02 CDT 2015
Module: wine
Branch: master
Commit: e05e99d7548d5c7b1c0ec6176532a6a6ffb7cf0e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05e99d7548d5c7b1c0ec6176532a6a6ffb7cf0e
Author: Sebastian Lackner <sebastian at 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;
More information about the wine-cvs
mailing list