Jacek Caban : win32u: Move NtUserGetClipboardSequenceNumber implementation from user32.
Alexandre Julliard
julliard at winehq.org
Mon Nov 15 16:01:27 CST 2021
Module: wine
Branch: master
Commit: 39b9f1318e9baf0aa8cd844c02129fb74bfe99b7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b9f1318e9baf0aa8cd844c02129fb74bfe99b7
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 12 12:54:29 2021 +0100
win32u: Move NtUserGetClipboardSequenceNumber implementation from user32.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/clipboard.c | 17 -----------------
dlls/user32/user32.spec | 2 +-
dlls/win32u/clipboard.c | 17 +++++++++++++++++
dlls/win32u/syscall.c | 1 +
dlls/win32u/win32u.spec | 2 +-
dlls/wow64win/syscall.h | 1 +
dlls/wow64win/user.c | 5 +++++
include/ntuser.h | 1 +
8 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c
index df5b40366c1..033d6eb2505 100644
--- a/dlls/user32/clipboard.c
+++ b/dlls/user32/clipboard.c
@@ -998,23 +998,6 @@ INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount)
}
-/**************************************************************************
- * GetClipboardSequenceNumber (USER32.@)
- */
-DWORD WINAPI GetClipboardSequenceNumber(VOID)
-{
- DWORD seqno = 0;
-
- SERVER_START_REQ( get_clipboard_info )
- {
- if (!wine_server_call_err( req )) seqno = reply->seqno;
- }
- SERVER_END_REQ;
-
- TRACE( "returning %u\n", seqno );
- return seqno;
-}
-
/**************************************************************************
* AddClipboardFormatListener (USER32.@)
*/
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index f9b6c18848c..5bc3fcd8c06 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -278,7 +278,7 @@
@ stdcall GetClipboardFormatNameA(long ptr long)
@ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName
@ stdcall GetClipboardOwner() NtUserGetClipboardOwner
-@ stdcall GetClipboardSequenceNumber ()
+@ stdcall GetClipboardSequenceNumber() NtUserGetClipboardSequenceNumber
@ stdcall GetClipboardViewer() NtUserGetClipboardViewer
@ stdcall GetComboBoxInfo(long ptr)
@ stdcall GetCurrentInputMessageSource(ptr)
diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c
index cddf3885282..56db9a61e44 100644
--- a/dlls/win32u/clipboard.c
+++ b/dlls/win32u/clipboard.c
@@ -202,3 +202,20 @@ HWND WINAPI NtUserGetClipboardViewer(void)
TRACE( "returning %p\n", viewer );
return viewer;
}
+
+/**************************************************************************
+ * NtUserGetClipboardSequenceNumber (win32u.@)
+ */
+DWORD WINAPI NtUserGetClipboardSequenceNumber(void)
+{
+ DWORD seqno = 0;
+
+ SERVER_START_REQ( get_clipboard_info )
+ {
+ if (!wine_server_call_err( req )) seqno = reply->seqno;
+ }
+ SERVER_END_REQ;
+
+ TRACE( "returning %u\n", seqno );
+ return seqno;
+}
diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c
index 699c0667b16..2c39420d1d1 100644
--- a/dlls/win32u/syscall.c
+++ b/dlls/win32u/syscall.c
@@ -107,6 +107,7 @@ static void * const syscalls[] =
NtUserCreateWindowStation,
NtUserGetClipboardFormatName,
NtUserGetClipboardOwner,
+ NtUserGetClipboardSequenceNumber,
NtUserGetClipboardViewer,
NtUserGetLayeredWindowAttributes,
NtUserGetObjectInformation,
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 870a6cda9a1..9bf198947ac 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -905,7 +905,7 @@
@ stub NtUserGetClipboardData
@ stdcall -syscall NtUserGetClipboardFormatName(long ptr long)
@ stdcall -syscall NtUserGetClipboardOwner()
-@ stub NtUserGetClipboardSequenceNumber
+@ stdcall -syscall NtUserGetClipboardSequenceNumber()
@ stdcall -syscall NtUserGetClipboardViewer()
@ stub NtUserGetComboBoxInfo
@ stub NtUserGetControlBrush
diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h
index 79179bcf1b2..f81fd005c9a 100644
--- a/dlls/wow64win/syscall.h
+++ b/dlls/wow64win/syscall.h
@@ -94,6 +94,7 @@
SYSCALL_ENTRY( NtUserCreateWindowStation ) \
SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \
SYSCALL_ENTRY( NtUserGetClipboardOwner ) \
+ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \
SYSCALL_ENTRY( NtUserGetClipboardViewer ) \
SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \
SYSCALL_ENTRY( NtUserGetObjectInformation ) \
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 7b34d8140a0..b39701a78af 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -205,6 +205,11 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardOwner( UINT *args )
return HandleToUlong( NtUserGetClipboardOwner() );
}
+NTSTATUS WINAPI wow64_NtUserGetClipboardSequenceNumber( UINT *args )
+{
+ return NtUserGetClipboardSequenceNumber();
+}
+
NTSTATUS WINAPI wow64_NtUserGetClipboardViewer( UINT *args )
{
return HandleToUlong( NtUserGetClipboardViewer() );
diff --git a/include/ntuser.h b/include/ntuser.h
index 53bbd85b173..301992230e6 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -33,6 +33,7 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK m
ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 );
INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen );
HWND WINAPI NtUserGetClipboardOwner(void);
+DWORD WINAPI NtUserGetClipboardSequenceNumber(void);
HWND WINAPI NtUserGetClipboardViewer(void);
BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags );
BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info,
More information about the wine-cvs
mailing list