Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3208d149
Commit
3208d149
authored
Jan 11, 2017
by
Ken Thomases
Committed by
Alexandre Julliard
Jan 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac: Change some clipboard functions to void return.
Signed-off-by:
Ken Thomases
<
ken@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
26067cc0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
clipboard.c
dlls/winemac.drv/clipboard.c
+6
-9
No files found.
dlls/winemac.drv/clipboard.c
View file @
3208d149
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment