marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Change some clipboard functions to void return. 

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Ken Thomases 2017-01-11 11:06:20 -06:00 committed by Alexandre Julliard
parent 26067cc0b9
commit 3208d1497a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/winemac.drv/clipboard.c
View File

@ -1623,15 +1623,14 @@ static void render_format(UINT id)
* Grab the Win32 clipboard when a Mac app has taken ownership of the
* pasteboard, and fill it with the pasteboard data types.
*/
static BOOL grab_win32_clipboard(void)
static void grab_win32_clipboard(void)
{
if (!OpenClipboard(clipboard_hwnd)) return FALSE;
if (!OpenClipboard(clipboard_hwnd)) return;
EmptyClipboard();
is_clipboard_owner = TRUE;
last_clipboard_update = GetTickCount64();
set_win32_clipboard_formats_from_mac_pasteboard();
CloseClipboard();
return TRUE;
}
@ -1641,27 +1640,25 @@ static BOOL grab_win32_clipboard(void)
* Periodically update the clipboard while the clipboard is owned by a
* Mac app.
*/
static BOOL update_clipboard(void)
static void update_clipboard(void)
{
static BOOL updating;
BOOL ret = TRUE;
TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n",
is_clipboard_owner, last_clipboard_update, GetTickCount64());
if (updating) return TRUE;
if (updating) return;
updating = TRUE;
if (is_clipboard_owner)
{
if (GetTickCount64() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY)
ret = grab_win32_clipboard();
grab_win32_clipboard();
}
else if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window))
ret = grab_win32_clipboard();
grab_win32_clipboard();
updating = FALSE;
return ret;
}