win32u: Move NtUserGetClipboardViewer implementation from user32.
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:
parent
e8dac807aa
commit
e2ede91cf1
|
@ -794,25 +794,6 @@ HWND WINAPI SetClipboardViewer( HWND hwnd )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
* GetClipboardViewer (USER32.@)
|
|
||||||
*/
|
|
||||||
HWND WINAPI GetClipboardViewer(void)
|
|
||||||
{
|
|
||||||
HWND hWndViewer = 0;
|
|
||||||
|
|
||||||
SERVER_START_REQ( get_clipboard_info )
|
|
||||||
{
|
|
||||||
if (!wine_server_call_err( req )) hWndViewer = wine_server_ptr_handle( reply->viewer );
|
|
||||||
}
|
|
||||||
SERVER_END_REQ;
|
|
||||||
|
|
||||||
TRACE( "returning %p\n", hWndViewer );
|
|
||||||
|
|
||||||
return hWndViewer;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* ChangeClipboardChain (USER32.@)
|
* ChangeClipboardChain (USER32.@)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -279,7 +279,7 @@
|
||||||
@ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName
|
@ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName
|
||||||
@ stdcall GetClipboardOwner() NtUserGetClipboardOwner
|
@ stdcall GetClipboardOwner() NtUserGetClipboardOwner
|
||||||
@ stdcall GetClipboardSequenceNumber ()
|
@ stdcall GetClipboardSequenceNumber ()
|
||||||
@ stdcall GetClipboardViewer()
|
@ stdcall GetClipboardViewer() NtUserGetClipboardViewer
|
||||||
@ stdcall GetComboBoxInfo(long ptr)
|
@ stdcall GetComboBoxInfo(long ptr)
|
||||||
@ stdcall GetCurrentInputMessageSource(ptr)
|
@ stdcall GetCurrentInputMessageSource(ptr)
|
||||||
@ stdcall GetCursor()
|
@ stdcall GetCursor()
|
||||||
|
|
|
@ -157,3 +157,20 @@ HWND WINAPI NtUserGetClipboardOwner(void)
|
||||||
TRACE( "returning %p\n", owner );
|
TRACE( "returning %p\n", owner );
|
||||||
return owner;
|
return owner;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* NtUserGetClipboardViewer (win32u.@)
|
||||||
|
*/
|
||||||
|
HWND WINAPI NtUserGetClipboardViewer(void)
|
||||||
|
{
|
||||||
|
HWND viewer = 0;
|
||||||
|
|
||||||
|
SERVER_START_REQ( get_clipboard_info )
|
||||||
|
{
|
||||||
|
if (!wine_server_call_err( req )) viewer = wine_server_ptr_handle( reply->viewer );
|
||||||
|
}
|
||||||
|
SERVER_END_REQ;
|
||||||
|
|
||||||
|
TRACE( "returning %p\n", viewer );
|
||||||
|
return viewer;
|
||||||
|
}
|
||||||
|
|
|
@ -107,6 +107,7 @@ static void * const syscalls[] =
|
||||||
NtUserCreateWindowStation,
|
NtUserCreateWindowStation,
|
||||||
NtUserGetClipboardFormatName,
|
NtUserGetClipboardFormatName,
|
||||||
NtUserGetClipboardOwner,
|
NtUserGetClipboardOwner,
|
||||||
|
NtUserGetClipboardViewer,
|
||||||
NtUserGetLayeredWindowAttributes,
|
NtUserGetLayeredWindowAttributes,
|
||||||
NtUserGetObjectInformation,
|
NtUserGetObjectInformation,
|
||||||
NtUserGetProcessWindowStation,
|
NtUserGetProcessWindowStation,
|
||||||
|
|
|
@ -906,7 +906,7 @@
|
||||||
@ stdcall -syscall NtUserGetClipboardFormatName(long ptr long)
|
@ stdcall -syscall NtUserGetClipboardFormatName(long ptr long)
|
||||||
@ stdcall -syscall NtUserGetClipboardOwner()
|
@ stdcall -syscall NtUserGetClipboardOwner()
|
||||||
@ stub NtUserGetClipboardSequenceNumber
|
@ stub NtUserGetClipboardSequenceNumber
|
||||||
@ stub NtUserGetClipboardViewer
|
@ stdcall -syscall NtUserGetClipboardViewer()
|
||||||
@ stub NtUserGetComboBoxInfo
|
@ stub NtUserGetComboBoxInfo
|
||||||
@ stub NtUserGetControlBrush
|
@ stub NtUserGetControlBrush
|
||||||
@ stub NtUserGetControlColor
|
@ stub NtUserGetControlColor
|
||||||
|
|
|
@ -94,6 +94,7 @@
|
||||||
SYSCALL_ENTRY( NtUserCreateWindowStation ) \
|
SYSCALL_ENTRY( NtUserCreateWindowStation ) \
|
||||||
SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \
|
SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \
|
||||||
SYSCALL_ENTRY( NtUserGetClipboardOwner ) \
|
SYSCALL_ENTRY( NtUserGetClipboardOwner ) \
|
||||||
|
SYSCALL_ENTRY( NtUserGetClipboardViewer ) \
|
||||||
SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \
|
SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \
|
||||||
SYSCALL_ENTRY( NtUserGetObjectInformation ) \
|
SYSCALL_ENTRY( NtUserGetObjectInformation ) \
|
||||||
SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \
|
SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \
|
||||||
|
|
|
@ -204,3 +204,8 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardOwner( UINT *args )
|
||||||
{
|
{
|
||||||
return HandleToUlong( NtUserGetClipboardOwner() );
|
return HandleToUlong( NtUserGetClipboardOwner() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NTSTATUS WINAPI wow64_NtUserGetClipboardViewer( UINT *args )
|
||||||
|
{
|
||||||
|
return HandleToUlong( NtUserGetClipboardViewer() );
|
||||||
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK m
|
||||||
ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 );
|
ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 );
|
||||||
INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen );
|
INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen );
|
||||||
HWND WINAPI NtUserGetClipboardOwner(void);
|
HWND WINAPI NtUserGetClipboardOwner(void);
|
||||||
|
HWND WINAPI NtUserGetClipboardViewer(void);
|
||||||
BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags );
|
BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags );
|
||||||
BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info,
|
BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info,
|
||||||
DWORD len, DWORD *needed );
|
DWORD len, DWORD *needed );
|
||||||
|
|
Loading…
Reference in New Issue