system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 17:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32u: Move EnumClipboardFormats implementation from user32.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2022-04-22 14:46:17 +02:00 committed by Alexandre Julliard
parent 357d8654c9
commit ea9fb81c09
5 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/user32/clipboard.c
View file

@ -764,21 +764,7 @@ done:
*/
UINT WINAPI EnumClipboardFormats( UINT format )
{
UINT ret = 0;
SERVER_START_REQ( enum_clipboard_formats )
{
req->previous = format;
if (!wine_server_call_err( req ))
{
ret = reply->format;
SetLastError( ERROR_SUCCESS );
}
}
SERVER_END_REQ;
TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret ));
return ret;
return NtUserEnumClipboardFormats( format );
}

20
dlls/win32u/clipboard.c
View file

@ -334,6 +334,26 @@ DWORD WINAPI NtUserGetClipboardSequenceNumber(void)
return seqno;
}
/* see EnumClipboardFormats */
UINT enum_clipboard_formats( UINT format )
{
UINT ret = 0;
SERVER_START_REQ( enum_clipboard_formats )
{
req->previous = format;
if (!wine_server_call_err( req ))
{
ret = reply->format;
SetLastError( ERROR_SUCCESS );
}
}
SERVER_END_REQ;
TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret ));
return ret;
}
/**************************************************************************
* NtUserAddClipboardFormatListener (win32u.@)
*/

3
dlls/win32u/sysparams.c
View file

@ -4707,6 +4707,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code )
enable_thunk_lock = arg;
return 0;
case NtUserCallOneParam_EnumClipboardFormats:
return enum_clipboard_formats( arg );
case NtUserCallOneParam_GetClipCursor:
return get_clip_cursor( (RECT *)arg );

1
dlls/win32u/win32u_private.h
View file

@ -313,6 +313,7 @@ struct unix_funcs
};
/* clipboard.c */
extern UINT enum_clipboard_formats( UINT format ) DECLSPEC_HIDDEN;
extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN;
/* cursoricon.c */

6
include/ntuser.h
View file

@ -637,6 +637,7 @@ enum
NtUserCallOneParam_DispatchMessageA,
NtUserCallOneParam_EnableDC,
NtUserCallOneParam_EnableThunkLock,
NtUserCallOneParam_EnumClipboardFormats,
NtUserCallOneParam_GetClipCursor,
NtUserCallOneParam_GetCursorPos,
NtUserCallOneParam_GetIconParam,
@ -688,6 +689,11 @@ static inline void NtUserEnableThunkLock( BOOL enable )
NtUserCallOneParam( enable, NtUserCallOneParam_EnableThunkLock );
}
static inline UINT NtUserEnumClipboardFormats( UINT format )
{
return NtUserCallOneParam( format, NtUserCallOneParam_EnumClipboardFormats );
}
static inline BOOL NtUserGetClipCursor( RECT *rect )
{
return NtUserCallOneParam( (UINT_PTR)rect, NtUserCallOneParam_GetClipCursor );