September 2016 - Wine-Commits

Bruno Jesus : dinput: Fix phase conversion on periodic effects.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 5ab0126f1d6f2c0edbee7668214c9fbef86a6563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab0126f1d6f2c0edbee76682… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 14 02:25:32 2016 -0300 dinput: Fix phase conversion on periodic effects. Based on idea by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 9205c9c..bb45792 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -632,7 +632,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; - This->effect.u.periodic.phase = (tsp->dwPhase / 9) * 8; /* == (/ 36 * 32) */ + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ + This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; /* dinput uses microseconds, linux uses miliseconds */ if (tsp->dwPeriod <= 1000) This->effect.u.periodic.period = 1;

1 0

Alexandre Julliard : user32/tests: Comment out a test that crashes on 64-bit Vista.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 30179166d2e517b4083b9eb3ccd9dea79fc8e24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30179166d2e517b4083b9eb3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:19:33 2016 +0900 user32/tests: Comment out a test that crashes on 64-bit Vista. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2b030ca..ff5b6fb 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1667,11 +1667,13 @@ static void test_handles( HWND hwnd ) todo_wine ok( !h, "got %p\n", h ); GlobalFree( empty_moveable ); - ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); - h = SetClipboardData( format_id2, ptr ); - /* some platforms don't allocate a 0-size block correctly */ - todo_wine ok( !h || broken( HeapSize( GetProcessHeap(), 0, ptr ) == 1), "got %p\n", h ); - HeapFree( GetProcessHeap(), 0, ptr ); + if (0) /* crashes on vista64 */ + { + ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); + h = SetClipboardData( format_id2, ptr ); + ok( !h, "got %p\n", h ); + HeapFree( GetProcessHeap(), 0, ptr ); + } h = SetClipboardData( format_id2, empty_fixed ); ok( h == empty_fixed, "got %p\n", h );

1 0

Bruno Jesus : ws2_32: Fix handling of POLLHUP in WSAPoll.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: a549245dfc2e5c89aa21b30486237e2e889d99c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a549245dfc2e5c89aa21b3048… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 13 15:38:15 2016 -0300 ws2_32: Fix handling of POLLHUP in WSAPoll. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 15 ++++++++++++++- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2d54013..9d0b60e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5378,7 +5378,20 @@ int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) if (ufds[i].fd != -1) { release_sock_fd(wfds[i].fd, ufds[i].fd); - wfds[i].revents = convert_poll_u2w(ufds[i].revents); + if (ufds[i].revents & POLLHUP) + { + /* Check if the socket still exists */ + int fd = get_sock_fd(wfds[i].fd, 0, NULL); + if (fd != -1) + { + wfds[i].revents = WS_POLLHUP; + release_sock_fd(wfds[i].fd, fd); + } + else + wfds[i].revents = WS_POLLNVAL; + } + else + wfds[i].revents = convert_poll_u2w(ufds[i].revents); } else wfds[i].revents = WS_POLLNVAL; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d216542..320f820 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6672,7 +6672,6 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); @@ -6737,7 +6736,6 @@ todo_wine POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead);

1 0

Sebastian Lackner : uxtheme: Return E_NOTIMPL in HRESULT stub functions.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 461bfc64ba84250941e79cc898784bdcd8d1670c URL: http://source.winehq.org/git/wine.git/?a=commit;h=461bfc64ba84250941e79cc89… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:26:39 2016 +0200 uxtheme: Return E_NOTIMPL in HRESULT stub functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- dlls/uxtheme/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 753ac36..8f0eabe 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1626,7 +1626,7 @@ HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, FIXME("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 7d07680..625be24 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -762,7 +762,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** @@ -1188,7 +1188,7 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) { FIXME("%s %s: stub\n", debugstr_w(pszIniFileName), debugstr_w(pszUnknown)); - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /**********************************************************************

1 0

Huw Davies : winmm/tests: Remove a test that can crash on Win 8 and 10.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: ec6e47ddaed7efb4e9802ebb96637e151c6373ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6e47ddaed7efb4e9802ebb9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 13 18:21:19 2016 +0100 winmm/tests: Remove a test that can crash on Win 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 5c9185e..0cbe57e 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -668,10 +668,6 @@ static void test_recordWAVE(HWND hwnd) ok(!err,"mci status samplespersec returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"11025"), "mci status samplespersec expected 11025, got: %s\n", buf); - /* MCI seems to solely support PCM, no need for ACM conversion. */ - err = mciSendStringA("set x format tag 2", NULL, 0, NULL); - ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned %s\n", dbg_mcierr(err)); - /* MCI appears to scan the available devices for support of this format, * returning MCIERR_OUTOFRANGE on machines with no sound. * However some w2k8/w7 machines return no error when there's no wave

1 0

Huw Davies : winmm/tests: Add a small Sleep() to prevent a notification test from failing.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: eeb70819eb7fa9e75e8b0c8ca47cdfc3aa8bdfe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb70819eb7fa9e75e8b0c8ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 13 11:02:19 2016 +0100 winmm/tests: Add a small Sleep() to prevent a notification test from failing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7e9b33a..5c9185e 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1116,6 +1116,8 @@ static void test_asyncWAVE(HWND hwnd) trace("position after resume: %sms\n",buf); test_notification(hwnd,"play (aborted by pause/resume/pause)",0); + /* A small Sleep() here prevents the notification test failing with MCI_NOTIFY_SUCCESSFUL */ + Sleep(10); err = mciSendStringA("close mysound wait", NULL, 0, NULL); ok(!err,"mci close wait returned %s\n", dbg_mcierr(err)); test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED);

1 0

Sebastian Lackner : kernel32: NtOpenFile returns STATUS_SUCCESS on success.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: c7a9ab82b7c8504e9eb568955dfb15718eed42e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a9ab82b7c8504e9eb568955… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 14 07:45:30 2016 +0200 kernel32: NtOpenFile returns STATUS_SUCCESS on success. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index b8222db..494db9c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1555,7 +1555,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) status = NtOpenFile( &pipe_dev, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); - if (status != ERROR_SUCCESS) + if (status != STATUS_SUCCESS) { HeapFree( GetProcessHeap(), 0, pipe_wait); RtlFreeUnicodeString( &nt_name );

1 0

Alexandre Julliard : server: Return the owner window in the close_clipboard request.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 305d89f1ed313dc74941b755be4848ab85d111b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305d89f1ed313dc74941b755b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 15:29:03 2016 +0900 server: Return the owner window in the close_clipboard request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 10 +++++----- include/wine/server_protocol.h | 4 ++-- server/clipboard.c | 2 +- server/protocol.def | 2 +- server/trace.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 01fdde7..dc94794 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -546,8 +546,8 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) */ BOOL WINAPI CloseClipboard(void) { - HWND viewer = 0; - BOOL ret, owner = FALSE; + HWND viewer = 0, owner = 0; + BOOL ret; TRACE("() Changed=%d\n", bCBHasChanged); @@ -565,7 +565,7 @@ BOOL WINAPI CloseClipboard(void) if ((ret = !wine_server_call_err( req ))) { viewer = wine_server_ptr_handle( reply->viewer ); - owner = reply->owner; + owner = wine_server_ptr_handle( reply->owner ); } } SERVER_END_REQ; @@ -574,10 +574,10 @@ BOOL WINAPI CloseClipboard(void) if (bCBHasChanged) { - if (owner) USER_Driver->pEndClipboardUpdate(); + USER_Driver->pEndClipboardUpdate(); bCBHasChanged = FALSE; } - if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)GetClipboardOwner(), 0 ); + if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); return TRUE; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e71e98b..bd55a0f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4483,7 +4483,7 @@ struct close_clipboard_reply { struct reply_header __header; user_handle_t viewer; - int owner; + user_handle_t owner; }; @@ -6365,6 +6365,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 516 +#define SERVER_PROTOCOL_VERSION 517 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index a5e0c37..43172ae 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -293,7 +293,7 @@ DECL_HANDLER(close_clipboard) if (req->changed) clipboard->seqno++; reply->viewer = close_clipboard( clipboard ); - reply->owner = (clipboard->owner_thread && clipboard->owner_thread->process == current->process); + reply->owner = clipboard->owner_win; } diff --git a/server/protocol.def b/server/protocol.def index 3a4f9c1..e17cf23 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3171,7 +3171,7 @@ enum caret_state int changed; /* did it change since the open? */ @REPLY user_handle_t viewer; /* first clipboard viewer */ - int owner; /* is the process already the owner? */ + user_handle_t owner; /* current clipboard owner */ @END diff --git a/server/trace.c b/server/trace.c index db52b0a..bcd7998 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3752,7 +3752,7 @@ static void dump_close_clipboard_request( const struct close_clipboard_request * static void dump_close_clipboard_reply( const struct close_clipboard_reply *req ) { fprintf( stderr, " viewer=%08x", req->viewer ); - fprintf( stderr, ", owner=%d", req->owner ); + fprintf( stderr, ", owner=%08x", req->owner ); } static void dump_set_clipboard_info_request( const struct set_clipboard_info_request *req )

1 0

Alexandre Julliard : server: Return the owner window in the release_clipboard request.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 2bf890d95f19f0de7e59927d1d1e65ca548af326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf890d95f19f0de7e59927d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 15:20:54 2016 +0900 server: Return the owner window in the release_clipboard request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 10 +++++++--- include/wine/server_protocol.h | 4 ++-- server/clipboard.c | 6 ++++-- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index e8ee10d..01fdde7 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -453,18 +453,22 @@ static UINT get_clipboard_flags(void) */ void CLIPBOARD_ReleaseOwner( HWND hwnd ) { - HWND viewer = 0; + HWND viewer = 0, owner = 0; SendMessageW( hwnd, WM_RENDERALLFORMATS, 0, 0 ); SERVER_START_REQ( release_clipboard ) { req->owner = wine_server_user_handle( hwnd ); - if (!wine_server_call( req )) viewer = wine_server_ptr_handle( reply->viewer ); + if (!wine_server_call( req )) + { + viewer = wine_server_ptr_handle( reply->viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } } SERVER_END_REQ; - if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)GetClipboardOwner(), 0 ); + if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e8b33b0..e71e98b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4536,7 +4536,7 @@ struct release_clipboard_reply { struct reply_header __header; user_handle_t viewer; - char __pad_12[4]; + user_handle_t owner; }; @@ -6365,6 +6365,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 515 +#define SERVER_PROTOCOL_VERSION 516 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index 323fdb9..a5e0c37 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -353,9 +353,11 @@ DECL_HANDLER(release_clipboard) if (!(owner = get_valid_window_handle( req->owner ))) return; if (clipboard->owner_win == owner) + { reply->viewer = release_clipboard( clipboard ); - else - set_error( STATUS_INVALID_OWNER ); + reply->owner = clipboard->owner_win; + } + else set_error( STATUS_INVALID_OWNER ); } diff --git a/server/protocol.def b/server/protocol.def index 86b209e..3a4f9c1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3205,6 +3205,7 @@ enum caret_state user_handle_t owner; /* clipboard owner to release */ @REPLY user_handle_t viewer; /* first clipboard viewer */ + user_handle_t owner; /* current clipboard owner */ @END diff --git a/server/request.h b/server/request.h index 58aebbc..29c0ccf 100644 --- a/server/request.h +++ b/server/request.h @@ -2046,6 +2046,7 @@ C_ASSERT( sizeof(struct empty_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct release_clipboard_request, owner) == 12 ); C_ASSERT( sizeof(struct release_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct release_clipboard_reply, viewer) == 8 ); +C_ASSERT( FIELD_OFFSET(struct release_clipboard_reply, owner) == 12 ); C_ASSERT( sizeof(struct release_clipboard_reply) == 16 ); C_ASSERT( sizeof(struct get_clipboard_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_info_reply, window) == 8 ); diff --git a/server/trace.c b/server/trace.c index d99c4b2..db52b0a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3782,6 +3782,7 @@ static void dump_release_clipboard_request( const struct release_clipboard_reque static void dump_release_clipboard_reply( const struct release_clipboard_reply *req ) { fprintf( stderr, " viewer=%08x", req->viewer ); + fprintf( stderr, ", owner=%08x", req->owner ); } static void dump_get_clipboard_info_request( const struct get_clipboard_info_request *req )

1 0

Alexandre Julliard : user32: Clean up clipboard debug traces.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: c1f62c898562cfabf4f93749480f9deb1e4090d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f62c898562cfabf4f937494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:44:47 2016 +0900 user32: Clean up clipboard debug traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 76 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index d8fb68d..e8ee10d 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -55,6 +55,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); */ static BOOL bCBHasChanged = FALSE; +/* get a debug string for a format id */ +static const char *debugstr_format( UINT id ) +{ + WCHAR buffer[256]; + + if (GetClipboardFormatNameW( id, buffer, 256 )) + return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); + + switch (id) + { +#define BUILTIN(id) case id: return #id; + BUILTIN(CF_TEXT) + BUILTIN(CF_BITMAP) + BUILTIN(CF_METAFILEPICT) + BUILTIN(CF_SYLK) + BUILTIN(CF_DIF) + BUILTIN(CF_TIFF) + BUILTIN(CF_OEMTEXT) + BUILTIN(CF_DIB) + BUILTIN(CF_PALETTE) + BUILTIN(CF_PENDATA) + BUILTIN(CF_RIFF) + BUILTIN(CF_WAVE) + BUILTIN(CF_UNICODETEXT) + BUILTIN(CF_ENHMETAFILE) + BUILTIN(CF_HDROP) + BUILTIN(CF_LOCALE) + BUILTIN(CF_DIBV5) + BUILTIN(CF_OWNERDISPLAY) + BUILTIN(CF_DSPTEXT) + BUILTIN(CF_DSPBITMAP) + BUILTIN(CF_DSPMETAFILEPICT) + BUILTIN(CF_DSPENHMETAFILE) +#undef BUILTIN + default: return wine_dbg_sprintf( "%04x", id ); + } +} /* formats that can be synthesized are: CF_TEXT, CF_OEMTEXT, CF_UNICODETEXT, CF_BITMAP, CF_DIB, CF_DIBV5, CF_ENHMETAFILE, CF_METAFILEPICT */ @@ -359,7 +396,7 @@ static HANDLE render_synthesized_format( UINT format, UINT from ) HANDLE data = GetClipboardData( from ); if (!data) return 0; - TRACE( "rendering %04x from %04x\n", format, from ); + TRACE( "rendering %s from %s\n", debugstr_format( format ), debugstr_format( from )); switch (format) { @@ -388,7 +425,7 @@ static HANDLE render_synthesized_format( UINT format, UINT from ) } if (data) { - TRACE( "adding %04x %p\n", format, data ); + TRACE( "adding %s %p\n", debugstr_format( format ), data ); SetClipboardData( format, data ); } return data; @@ -550,7 +587,7 @@ BOOL WINAPI EmptyClipboard(void) BOOL ret; HWND owner = GetClipboardOwner(); - TRACE("()\n"); + TRACE( "owner %p\n", owner ); if (owner) SendMessageTimeoutW( owner, WM_DESTROYCLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, 5000, NULL ); @@ -572,7 +609,6 @@ BOOL WINAPI EmptyClipboard(void) /************************************************************************** * GetClipboardOwner (USER32.@) - * FIXME: Can't return the owner if the clipboard is owned by an external X-app */ HWND WINAPI GetClipboardOwner(void) { @@ -584,7 +620,7 @@ HWND WINAPI GetClipboardOwner(void) } SERVER_END_REQ; - TRACE(" hWndOwner(%p)\n", hWndOwner); + TRACE( "returning %p\n", hWndOwner ); return hWndOwner; } @@ -603,7 +639,7 @@ HWND WINAPI GetOpenClipboardWindow(void) } SERVER_END_REQ; - TRACE(" hWndClipWindow(%p)\n", hWndOpen); + TRACE( "returning %p\n", hWndOpen ); return hWndOpen; } @@ -629,7 +665,7 @@ HWND WINAPI SetClipboardViewer( HWND hwnd ) if (hwnd) SendNotifyMessageW( hwnd, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); - TRACE( "(%p): returning %p\n", hwnd, prev ); + TRACE( "%p returning %p\n", hwnd, prev ); return prev; } @@ -647,7 +683,7 @@ HWND WINAPI GetClipboardViewer(void) } SERVER_END_REQ; - TRACE(" hWndViewer=%p\n", hWndViewer); + TRACE( "returning %p\n", hWndViewer ); return hWndViewer; } @@ -688,7 +724,7 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) HANDLE hResult = 0; UINT flags; - TRACE( "%04x %p\n", format, data ); + TRACE( "%s %p\n", debugstr_format( format ), data ); if (!format) { @@ -728,9 +764,9 @@ INT WINAPI CountClipboardFormats(void) /************************************************************************** * EnumClipboardFormats (USER32.@) */ -UINT WINAPI EnumClipboardFormats(UINT wFormat) +UINT WINAPI EnumClipboardFormats( UINT format ) { - TRACE("(%04X)\n", wFormat); + UINT ret = 0; if (!(get_clipboard_flags() & CB_OPEN)) { @@ -739,18 +775,20 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat) return 0; } SetLastError( 0 ); - return USER_Driver->pEnumClipboardFormats(wFormat); + ret = USER_Driver->pEnumClipboardFormats( format ); + TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret )); + return ret; } /************************************************************************** * IsClipboardFormatAvailable (USER32.@) */ -BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) +BOOL WINAPI IsClipboardFormatAvailable( UINT format ) { - BOOL bret = USER_Driver->pIsClipboardFormatAvailable(wFormat); - TRACE("%04x, returning %d\n", wFormat, bret); - return bret; + BOOL ret = USER_Driver->pIsClipboardFormatAvailable( format ); + TRACE( "%s -> %u\n", debugstr_format( format ), ret ); + return ret; } @@ -791,7 +829,7 @@ HANDLE WINAPI GetClipboardData( UINT format ) { HANDLE data = 0; - TRACE( "%04x\n", format ); + TRACE( "%s\n", debugstr_format( format )); if (!(get_clipboard_flags() & CB_OPEN)) { @@ -816,7 +854,7 @@ INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount) { int i; - TRACE("()\n"); + TRACE( "%p %u\n", list, nCount ); if(CountClipboardFormats() == 0) return 0; @@ -847,7 +885,7 @@ DWORD WINAPI GetClipboardSequenceNumber(VOID) } SERVER_END_REQ; - TRACE("returning %x\n", seqno); + TRACE( "returning %u\n", seqno ); return seqno; }

1 0