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

Alexandre Julliard : user32: Merge the AcquireClipboard and EmptyClipboard driver entry points.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 070a82e743cbcfd82f211d79b2453a84c7eedec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070a82e743cbcfd82f211d79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:45:40 2015 +0900 user32: Merge the AcquireClipboard and EmptyClipboard driver entry points. --- dlls/user32/clipboard.c | 4 ---- dlls/user32/driver.c | 13 ------------- dlls/user32/user_private.h | 1 - dlls/winemac.drv/clipboard.c | 12 +----------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/clipboard.c | 20 ++++++++------------ dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 +- 9 files changed, 12 insertions(+), 45 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 666acf0..c55b830 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -295,10 +295,6 @@ BOOL WINAPI EmptyClipboard(void) * WM_DESTROYCLIPBOARD itself. */ CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen); - /* Acquire the selection. This will notify the previous owner - * to clear its cache. */ - USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 400d30a..ced8836 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -120,7 +120,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); GET_USER_FUNC(ClipCursor); - GET_USER_FUNC(AcquireClipboard); GET_USER_FUNC(EmptyClipboard); GET_USER_FUNC(SetClipboardData); GET_USER_FUNC(GetClipboardData); @@ -334,11 +333,6 @@ static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) return FALSE; } -static INT CDECL nulldrv_AcquireClipboard( HWND hwnd ) -{ - return 0; -} - static BOOL CDECL nulldrv_CountClipboardFormats(void) { return 0; @@ -536,7 +530,6 @@ static USER_DRIVER null_driver = nulldrv_SetCursorPos, nulldrv_ClipCursor, /* clipboard functions */ - nulldrv_AcquireClipboard, nulldrv_CountClipboardFormats, nulldrv_EmptyClipboard, nulldrv_EndClipboardUpdate, @@ -674,11 +667,6 @@ static BOOL CDECL loaderdrv_ClipCursor( LPCRECT clip ) return load_driver()->pClipCursor( clip ); } -static INT CDECL loaderdrv_AcquireClipboard( HWND hwnd ) -{ - return load_driver()->pAcquireClipboard( hwnd ); -} - static BOOL CDECL loaderdrv_CountClipboardFormats(void) { return load_driver()->pCountClipboardFormats(); @@ -791,7 +779,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ - loaderdrv_AcquireClipboard, loaderdrv_CountClipboardFormats, loaderdrv_EmptyClipboard, loaderdrv_EndClipboardUpdate, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 01b9728..e0c1b43 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -80,7 +80,6 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (CDECL *pClipCursor)(LPCRECT); /* clipboard functions */ - INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3851d23..97fa80e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1880,17 +1880,6 @@ static void check_clipboard_ownership(HWND *owner) /************************************************************************** - * AcquireClipboard (MACDRV.@) - */ -int CDECL macdrv_AcquireClipboard(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - check_clipboard_ownership(NULL); - return 0; -} - - -/************************************************************************** * CountClipboardFormats (MACDRV.@) */ INT CDECL macdrv_CountClipboardFormats(void) @@ -1955,6 +1944,7 @@ INT CDECL macdrv_CountClipboardFormats(void) void CDECL macdrv_EmptyClipboard(void) { TRACE("()\n"); + check_clipboard_ownership(NULL); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a7dbb30..a97177d 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,7 +4,6 @@ # USER driver -@ cdecl AcquireClipboard(long) macdrv_AcquireClipboard @ cdecl ActivateKeyboardLayout(long long) macdrv_ActivateKeyboardLayout @ cdecl Beep() macdrv_Beep @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) macdrv_ChangeDisplaySettingsEx diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 073e7cb..6c6b3b9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2924,9 +2924,9 @@ static DWORD WINAPI selection_thread_proc(LPVOID p) } /************************************************************************** - * AcquireClipboard (X11DRV.@) + * X11DRV_AcquireClipboard */ -int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) +void X11DRV_AcquireClipboard(HWND hWndClipWindow) { DWORD procid; HANDLE selectionThread; @@ -2953,7 +2953,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) GetCurrentThreadId(), GetWindowThreadProcessId(hWndClipWindow, NULL), hWndClipWindow); - return SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + return; } } @@ -2966,19 +2967,13 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); selectionThread = CreateThread(NULL, 0, selection_thread_proc, event, 0, NULL); - if (!selectionThread) + if (selectionThread) { - WARN("Could not start clipboard thread\n"); - CloseHandle(event); - return 0; + WaitForSingleObject(event, INFINITE); + CloseHandle(selectionThread); } - - WaitForSingleObject(event, INFINITE); CloseHandle(event); - CloseHandle(selectionThread); } - - return 1; } @@ -3005,6 +3000,7 @@ static void empty_clipboard(BOOL keepunowned) */ void CDECL X11DRV_EmptyClipboard(void) { + X11DRV_AcquireClipboard( GetOpenClipboardWindow() ); empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7146cfc..ea37dd7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2593,7 +2593,8 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) switch(msg) { case WM_X11DRV_ACQUIRE_SELECTION: - return X11DRV_AcquireClipboard( hwnd ); + X11DRV_AcquireClipboard( hwnd ); + return 0; case WM_X11DRV_SET_WIN_REGION: if ((data = get_win_data( hwnd ))) { diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ce084b5..d9bbebc 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -23,7 +23,6 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo -@ cdecl AcquireClipboard(long) X11DRV_AcquireClipboard @ cdecl CountClipboardFormats() X11DRV_CountClipboardFormats @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da13c6e..213f610 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -600,7 +600,7 @@ extern XContext win_data_context DECLSPEC_HIDDEN; extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; -extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; +extern void X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; extern void X11DRV_ResetSelectionOwner(void) DECLSPEC_HIDDEN; extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32/tests: Remove support for Win9x in clipboard test.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 4c64d137ff5e2d67a249d4043246fe825cd705b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64d137ff5e2d67a249d4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 17:13:40 2015 +0900 user32/tests: Remove support for Win9x in clipboard test. --- dlls/user32/tests/clipboard.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 01dbe93..f12e0cd 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,17 +24,6 @@ #include "wingdi.h" #include "winuser.h" -static BOOL is_win9x = FALSE; - -#define test_last_error(expected_error) \ - do \ - { \ - if (!is_win9x) \ - ok(GetLastError() == expected_error, \ - "Last error should be set to %d, not %d\n", \ - expected_error, GetLastError()); \ - } while (0) - static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -118,7 +107,7 @@ static void test_RegisterClipboardFormatA(void) SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); todo_wine { @@ -126,13 +115,13 @@ todo_wine SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GlobalGetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); } SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "FindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); if (0) { @@ -140,7 +129,7 @@ todo_wine SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "GlobalFindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } for (format_id = 0; format_id < 0xffff; format_id++) @@ -356,10 +345,6 @@ static void test_messages(void) START_TEST(clipboard) { - SetLastError(0xdeadbeef); - FindAtomW(NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) is_win9x = TRUE; - test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Alexandre Julliard : server: Use a standard timestamp for the clipboard.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b7f79bae86e62dd642f52145c0f480ba44e56a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f79bae86e62dd642f52145c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:02:11 2015 +0900 server: Use a standard timestamp for the clipboard. --- server/clipboard.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 0c39319..8f26703 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "file.h" #include "process.h" #include "user.h" #include "winuser.h" @@ -44,7 +45,7 @@ struct clipboard user_handle_t owner_win; /* window that owns the clipboard data */ user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int seqno; /* clipboard change sequence number */ - time_t seqno_timestamp; /* time stamp of last seqno increment */ + timeout_t seqno_timestamp; /* time stamp of last seqno increment */ }; static void clipboard_dump( struct object *obj, int verbose ); @@ -70,7 +71,7 @@ static const struct object_ops clipboard_ops = }; -#define MINUPDATELAPSE 2 +#define MINUPDATELAPSE (2 * TICKS_PER_SEC) /* dump a clipboard object */ static void clipboard_dump( struct object *obj, int verbose ) @@ -178,11 +179,9 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win, static int get_seqno( struct clipboard *clipboard ) { - time_t tm = time(NULL); - - if (!clipboard->owner_thread && (tm > (clipboard->seqno_timestamp + MINUPDATELAPSE))) + if (!clipboard->owner_thread && (current_time - clipboard->seqno_timestamp > MINUPDATELAPSE)) { - clipboard->seqno_timestamp = tm; + clipboard->seqno_timestamp = current_time; clipboard->seqno++; } return clipboard->seqno;

1 0

Alexandre Julliard : server: Use separate helper functions for setting and resetting clipboard windows.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b8fac8adbfecc221731dda0c13c6fd4e593dff42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fac8adbfecc221731dda0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:37:16 2015 +0900 server: Use separate helper functions for setting and resetting clipboard windows. --- server/clipboard.c | 66 +++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 8f26703..7e92121 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -135,44 +135,51 @@ void cleanup_clipboard_thread(struct thread *thread) release_object( winstation ); } -static int set_clipboard_window( struct clipboard *clipboard, user_handle_t win, int clear ) +static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { if (clipboard->open_thread && clipboard->open_thread != current) { set_error(STATUS_WAS_LOCKED); return 0; } - else if (!clear) - { - clipboard->open_win = win; - clipboard->open_thread = current; - } - else + clipboard->open_win = win; + clipboard->open_thread = current; + return 1; +} + +static int close_clipboard( struct clipboard *clipboard ) +{ + if (clipboard->open_thread != current) { - clipboard->open_thread = NULL; - clipboard->open_win = 0; + set_win32_error( ERROR_CLIPBOARD_NOT_OPEN ); + return 0; } + clipboard->open_thread = NULL; + clipboard->open_win = 0; return 1; } - -static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win, int clear ) +static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) { if (clipboard->open_thread && clipboard->open_thread->process != current->process) { set_error(STATUS_WAS_LOCKED); return 0; } - else if (!clear) - { - clipboard->owner_win = win; - clipboard->owner_thread = current; - } - else + clipboard->owner_win = win; + clipboard->owner_thread = current; + return 1; +} + +static int release_clipboard_owner( struct clipboard *clipboard ) +{ + if (clipboard->open_thread && clipboard->open_thread->process != current->process) { - clipboard->owner_win = 0; - clipboard->owner_thread = NULL; + set_error(STATUS_WAS_LOCKED); + return 0; } + clipboard->owner_win = 0; + clipboard->owner_thread = NULL; return 1; } @@ -200,33 +207,20 @@ DECL_HANDLER(set_clipboard_info) if (req->flags & SET_CB_OPEN) { - if (clipboard->open_thread) - { - /* clipboard already opened */ - set_error(STATUS_WAS_LOCKED); - return; - } - - if (!set_clipboard_window( clipboard, req->clipboard, 0 )) return; + if (!open_clipboard( clipboard, req->clipboard )) return; } else if (req->flags & SET_CB_CLOSE) { - if (clipboard->open_thread != current) - { - set_win32_error(ERROR_CLIPBOARD_NOT_OPEN); - return; - } - - if (!set_clipboard_window( clipboard, 0, 1 )) return; + if (!close_clipboard( clipboard )) return; } if (req->flags & SET_CB_OWNER) { - if (!set_clipboard_owner( clipboard, req->owner, 0 )) return; + if (!set_clipboard_owner( clipboard, req->owner )) return; } else if (req->flags & SET_CB_RELOWNER) { - if (!set_clipboard_owner( clipboard, 0, 1 )) return; + if (!release_clipboard_owner( clipboard )) return; } if (req->flags & SET_CB_VIEWER) clipboard->viewer = req->viewer;

1 0

Alexandre Julliard : server: Store the clipboard windows as full handles.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: e99c3f0c4b07e5413fc1cc52676895c9fff1b71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99c3f0c4b07e5413fc1cc526… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:38:23 2015 +0900 server: Store the clipboard windows as full handles. --- server/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 7e92121..f144ea1 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -137,6 +137,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) { set_error(STATUS_WAS_LOCKED); @@ -166,7 +167,7 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win ) set_error(STATUS_WAS_LOCKED); return 0; } - clipboard->owner_win = win; + clipboard->owner_win = get_user_full_handle( win ); clipboard->owner_thread = current; return 1; } @@ -223,7 +224,7 @@ DECL_HANDLER(set_clipboard_info) if (!release_clipboard_owner( clipboard )) return; } - if (req->flags & SET_CB_VIEWER) clipboard->viewer = req->viewer; + if (req->flags & SET_CB_VIEWER) clipboard->viewer = get_user_full_handle( req->viewer ); if (req->flags & SET_CB_SEQNO) clipboard->seqno++;

1 0

Alexandre Julliard : server: Allow opening the clipboard again with the same owner.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: bdf3f413afc2efae68b7545083d6eb0893cd2687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf3f413afc2efae68b754508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:39:18 2015 +0900 server: Allow opening the clipboard again with the same owner. --- dlls/user32/tests/clipboard.c | 3 ++- server/clipboard.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f12e0cd..a9aef84 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -51,11 +51,12 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(0), "OpenClipboard failed\n"); ok(!GetClipboardOwner(), "clipboard should still be not owned\n"); ok(!OpenClipboard(hWnd1), "OpenClipboard should fail since clipboard already opened\n"); + ok(OpenClipboard(0), "OpenClipboard again failed\n"); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - todo_wine ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); + ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); diff --git a/server/clipboard.c b/server/clipboard.c index f144ea1..7a77ed2 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) + if (clipboard->open_thread && (clipboard->open_thread != current || clipboard->open_win != win)) { set_error(STATUS_WAS_LOCKED); return 0;

1 0

Alexandre Julliard : server: Check for the current owner window on the server side for releases.
by Alexandre Julliard 03 Jun '15

03 Jun '15

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

Nikolay Sivov : riched20: Return 0x0 size for NULL objects.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 2a2446abdb5020535b65a4523329f9b953a3aae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2446abdb5020535b65a4523… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 17:26:15 2015 +0300 riched20: Return 0x0 size for NULL objects. --- dlls/riched20/richole.c | 10 ++++++++++ dlls/riched20/tests/richole.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index f3a4a01..7af3ae2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1420,8 +1420,12 @@ static HRESULT WINAPI IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); + TRACE("(%p,%p)\n", This, reo); + if (!reo) + return E_INVALIDARG; + if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; ME_InsertOLEFromCursor(This->editor, reo, 0); @@ -5037,6 +5041,12 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } + if (!run->ole_obj->poleobj) + { + pSize->cx = pSize->cy = 0; + return; + } + if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 318b386..101896e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3072,6 +3072,42 @@ static void test_SetFont(void) ITextSelection_Release(selection); } +static void test_InsertObject(void) +{ + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + IOleClientSite *clientsite; + REOBJECT reo; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, NULL); + + hr = IRichEditOle_InsertObject(reole, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "got 0x%08x\n", hr); + + reo.cbStruct = sizeof(reo); + reo.cp = 0; + memset(&reo.clsid, 0, sizeof(reo.clsid)); + reo.poleobj = NULL; + reo.pstg = NULL; + reo.polesite = clientsite; + reo.sizel.cx = 10; + reo.sizel.cy = 10; + reo.dvaspect = DVASPECT_CONTENT; + reo.dwFlags = 0; + reo.dwUser = 0; + + hr = IRichEditOle_InsertObject(reole, &reo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IOleClientSite_Release(clientsite); + release_interfaces(&hwnd, &reole, &doc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3104,4 +3140,5 @@ START_TEST(richole) test_Select(); test_GetStoryType(); test_SetFont(); + test_InsertObject(); }

1 0

Nikolay Sivov : comctl32/toolbar: Remove always true condition (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

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

Nikolay Sivov : d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 3d6ee7e5b9fa22e844eaa6177bf146aad4a05777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ee7e5b9fa22e844eaa6177… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 11:45:25 2015 +0300 d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity). --- dlls/d3d8/vertexdeclaration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 4be9127..968b76b 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -275,7 +275,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 { stream = ((*token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT); offset = 0; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(*token & D3DVSD_DATALOADTYPEMASK)) { DWORD type = ((*token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD reg = ((*token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); @@ -293,7 +293,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->usage_idx = wined3d_usage_lookup[reg].usage_idx; offset += wined3d_type_sizes[type]; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); }

1 0