November 2021 - Wine-commits

Jacek Caban : win32u: Move NtUserGetUpdatedClipboardFormats implementation from user32.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 6a768e2882a6315806f157f312563e3285f7cff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a768e2882a6315806f157f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:54:10 2021 +0100 win32u: Move NtUserGetUpdatedClipboardFormats implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 29 ----------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 8b00fcf5c9e..df5b40366c1 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -901,35 +901,6 @@ UINT WINAPI EnumClipboardFormats( UINT format ) } -/************************************************************************** - * GetUpdatedClipboardFormats (USER32.@) - */ -BOOL WINAPI GetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) -{ - BOOL ret; - - if (!out_size) - { - SetLastError( ERROR_NOACCESS ); - return FALSE; - } - - USER_Driver->pUpdateClipboard(); - - SERVER_START_REQ( get_clipboard_formats ) - { - if (formats) wine_server_set_reply( req, formats, size * sizeof(*formats) ); - ret = !wine_server_call_err( req ); - *out_size = reply->count; - } - SERVER_END_REQ; - - TRACE( "%p %u returning %u formats, ret %u\n", formats, size, *out_size, ret ); - if (!ret && !formats && *out_size) SetLastError( ERROR_NOACCESS ); - return ret; -} - - /************************************************************************** * GetClipboardData (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c464664e581..f9b6c18848c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -394,7 +394,7 @@ @ stdcall GetTouchInputInfo(long long ptr long) @ stdcall GetUpdateRect(long ptr long) @ stdcall GetUpdateRgn(long long long) -@ stdcall GetUpdatedClipboardFormats(ptr long ptr) +@ stdcall GetUpdatedClipboardFormats(ptr long ptr) NtUserGetUpdatedClipboardFormats @ stdcall GetUserObjectInformationA (long long ptr long ptr) @ stdcall GetUserObjectInformationW (long long ptr long ptr) NtUserGetObjectInformation @ stdcall GetUserObjectSecurity (long ptr ptr long ptr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index d592e007a6e..cddf3885282 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -116,6 +116,34 @@ BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ) return ret; } +/************************************************************************** + * NtUserGetUpdatedClipboardFormats (win32u.@) + */ +BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) +{ + BOOL ret; + + if (!out_size) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + + user_driver->pUpdateClipboard(); + + SERVER_START_REQ( get_clipboard_formats ) + { + if (formats) wine_server_set_reply( req, formats, size * sizeof(*formats) ); + ret = !wine_server_call_err( req ); + *out_size = reply->count; + } + SERVER_END_REQ; + + TRACE( "%p %u returning %u formats, ret %u\n", formats, size, *out_size, ret ); + if (!ret && !formats && *out_size) SetLastError( ERROR_NOACCESS ); + return ret; +} + /************************************************************************** * NtUserGetClipboardFormatName (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 005bd5af165..f91f8d57059 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1168,6 +1168,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserCountClipboardFormats, + NtUserGetUpdatedClipboardFormats, NtUserIsClipboardFormatAvailable, GDIRealizePalette, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9c98aa645b9..870a6cda9a1 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1004,7 +1004,7 @@ @ stub NtUserGetUniformSpaceMapping @ stub NtUserGetUpdateRect @ stub NtUserGetUpdateRgn -@ stub NtUserGetUpdatedClipboardFormats +@ stdcall NtUserGetUpdatedClipboardFormats(ptr long ptr) @ stub NtUserGetWOWClass @ stub NtUserGetWindowBand @ stub NtUserGetWindowCompositionAttribute diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 71a9909cfba..00fec65427f 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,6 +195,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); INT (WINAPI *pNtUserCountClipboardFormats)(void); + BOOL (WINAPI *pNtUserGetUpdatedClipboardFormats)( UINT *formats, UINT size, UINT *out_size ); BOOL (WINAPI *pNtUserIsClipboardFormatAvailable)( UINT format ); /* Wine-specific functions */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 50f000bdb3c..18949db3e43 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -601,6 +601,11 @@ INT WINAPI NtUserCountClipboardFormats(void) return unix_funcs->pNtUserCountClipboardFormats(); } +BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) +{ + return unix_funcs->pNtUserGetUpdatedClipboardFormats( formats, size, out_size ); +} + BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ) { return unix_funcs->pNtUserIsClipboardFormatAvailable( format ); diff --git a/include/ntuser.h b/include/ntuser.h index 0fed1368acf..53bbd85b173 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -40,6 +40,7 @@ BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, HWINSTA WINAPI NtUserGetProcessWindowStation(void); HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); +BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len );

1 0

Jacek Caban : win32u: Move NtUserGetClipboardSequenceNumber implementation from user32.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 39b9f1318e9baf0aa8cd844c02129fb74bfe99b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b9f1318e9baf0aa8cd844c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:54:29 2021 +0100 win32u: Move NtUserGetClipboardSequenceNumber implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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,

1 0

Jacek Caban : win32u: Move NtUserAddClipboardFormatListener and NtUserRemoveClipboardFormatListener implementations from user32.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: daf5664b0a0d672932762bfb0e707e5462733776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf5664b0a0d672932762bfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:54:45 2021 +0100 win32u: Move NtUserAddClipboardFormatListener and NtUserRemoveClipboardFormatListener implementations from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 33 --------------------------------- dlls/user32/user32.spec | 4 ++-- dlls/win32u/clipboard.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 14 ++++++++++++++ include/ntuser.h | 2 ++ 8 files changed, 56 insertions(+), 37 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 033d6eb2505..de0d5a20dcc 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -996,36 +996,3 @@ INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount) return -1; } - - -/************************************************************************** - * AddClipboardFormatListener (USER32.@) - */ -BOOL WINAPI AddClipboardFormatListener(HWND hwnd) -{ - BOOL ret; - - SERVER_START_REQ( add_clipboard_listener ) - { - req->window = wine_server_user_handle( hwnd ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - -/************************************************************************** - * RemoveClipboardFormatListener (USER32.@) - */ -BOOL WINAPI RemoveClipboardFormatListener(HWND hwnd) -{ - BOOL ret; - - SERVER_START_REQ( remove_clipboard_listener ) - { - req->window = wine_server_user_handle( hwnd ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5bc3fcd8c06..c8f98637792 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -1,5 +1,5 @@ @ stdcall ActivateKeyboardLayout(long long) -@ stdcall AddClipboardFormatListener(long) +@ stdcall AddClipboardFormatListener(long) NtUserAddClipboardFormatListener @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) @ stdcall AdjustWindowRectExForDpi(ptr long long long long) @@ -617,7 +617,7 @@ @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @ stdcall ReleaseDC(long long) -@ stdcall RemoveClipboardFormatListener(long) +@ stdcall RemoveClipboardFormatListener(long) NtUserRemoveClipboardFormatListener @ stdcall RemoveMenu(long long long) @ stdcall RemovePropA(long str) @ stdcall RemovePropW(long wstr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 56db9a61e44..3e555f4c49e 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -219,3 +219,35 @@ DWORD WINAPI NtUserGetClipboardSequenceNumber(void) TRACE( "returning %u\n", seqno ); return seqno; } + +/************************************************************************** + * NtUserAddClipboardFormatListener (win32u.@) + */ +BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ) +{ + BOOL ret; + + SERVER_START_REQ( add_clipboard_listener ) + { + req->window = wine_server_user_handle( hwnd ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + +/************************************************************************** + * NtUserRemoveClipboardFormatListener (win32u.@) + */ +BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ) +{ + BOOL ret; + + SERVER_START_REQ( remove_clipboard_listener ) + { + req->window = wine_server_user_handle( hwnd ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 2c39420d1d1..3eb38177a1f 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -101,6 +101,7 @@ static void * const syscalls[] = NtGdiSetVirtualResolution, NtGdiSwapBuffers, NtGdiTransformPoints, + NtUserAddClipboardFormatListener, NtUserCloseDesktop, NtUserCloseWindowStation, NtUserCreateDesktopEx, @@ -117,6 +118,7 @@ static void * const syscalls[] = NtUserOpenDesktop, NtUserOpenInputDesktop, NtUserOpenWindowStation, + NtUserRemoveClipboardFormatListener, NtUserRemoveProp, NtUserSetObjectInformation, NtUserSetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9bf198947ac..e075ccbe23f 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -750,7 +750,7 @@ @ stub NtUserAcquireIAMKey @ stub NtUserAcquireInteractiveControlBackgroundAccess @ stub NtUserActivateKeyboardLayout -@ stub NtUserAddClipboardFormatListener +@ stdcall -syscall NtUserAddClipboardFormatListener(long) @ stub NtUserAddVisualIdentifier @ stub NtUserAlterWindowStyle @ stub NtUserAssociateInputContext @@ -1145,7 +1145,7 @@ @ stub NtUserRemoteRedrawRectangle @ stub NtUserRemoteRedrawScreen @ stub NtUserRemoteStopScreenUpdates -@ stub NtUserRemoveClipboardFormatListener +@ stdcall -syscall NtUserRemoveClipboardFormatListener(long) @ stub NtUserRemoveInjectionDevice @ stub NtUserRemoveMenu @ stdcall -syscall NtUserRemoveProp(long wstr) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index f81fd005c9a..45685c3ba21 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -88,6 +88,7 @@ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ + SYSCALL_ENTRY( NtUserAddClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ @@ -104,6 +105,7 @@ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ + SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserRemoveProp ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b39701a78af..c86e7062314 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -214,3 +214,17 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardViewer( UINT *args ) { return HandleToUlong( NtUserGetClipboardViewer() ); } + +NTSTATUS WINAPI wow64_NtUserAddClipboardFormatListener( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return NtUserAddClipboardFormatListener( hwnd ); +} + +NTSTATUS WINAPI wow64_NtUserRemoveClipboardFormatListener( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return NtUserRemoveClipboardFormatListener( hwnd ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 301992230e6..17032bded47 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -23,6 +23,7 @@ #include <wingdi.h> #include <winternl.h> +BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); INT WINAPI NtUserCountClipboardFormats(void); @@ -47,6 +48,7 @@ HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK acc BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); +BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle );

1 0

Jacek Caban : win32u: Move NtUserGetPriorityClipboardFormat implementation from user32.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 92f2d659f55ae4a2b9171bcfd996bd7d679ecae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f2d659f55ae4a2b9171bcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:55:06 2021 +0100 win32u: Move NtUserGetPriorityClipboardFormat implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 20 -------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 19 +++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index de0d5a20dcc..62a17f5d021 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -976,23 +976,3 @@ HANDLE WINAPI GetClipboardData( UINT format ) return 0; } } - - -/************************************************************************** - * GetPriorityClipboardFormat (USER32.@) - */ -INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount) -{ - int i; - - TRACE( "%p %u\n", list, nCount ); - - if (NtUserCountClipboardFormats() == 0) - return 0; - - for (i = 0; i < nCount; i++) - if (NtUserIsClipboardFormatAvailable(list[i])) - return list[i]; - - return -1; -} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c8f98637792..3825b6a4df2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -358,7 +358,7 @@ @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) @ stdcall GetPointerType(long ptr) -@ stdcall GetPriorityClipboardFormat(ptr long) +@ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) @ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 3e555f4c49e..7acab5de631 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -144,6 +144,25 @@ BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *ou return ret; } +/************************************************************************** + * NtUserGetPriorityClipboardFormat (win32u.@) + */ +INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ) +{ + int i; + + TRACE( "%p %u\n", list, count ); + + if (NtUserCountClipboardFormats() == 0) + return 0; + + for (i = 0; i < count; i++) + if (NtUserIsClipboardFormatAvailable( list[i] )) + return list[i]; + + return -1; +} + /************************************************************************** * NtUserGetClipboardFormatName (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f91f8d57059..a03e1365737 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1168,6 +1168,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserCountClipboardFormats, + NtUserGetPriorityClipboardFormat, NtUserGetUpdatedClipboardFormats, NtUserIsClipboardFormatAvailable, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e075ccbe23f..256ab822803 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -976,7 +976,7 @@ @ stub NtUserGetPointerProprietaryId @ stub NtUserGetPointerType @ stub NtUserGetPrecisionTouchPadConfiguration -@ stub NtUserGetPriorityClipboardFormat +@ stdcall NtUserGetPriorityClipboardFormat(ptr long) @ stub NtUserGetProcessDpiAwarenessContext @ stub NtUserGetProcessUIContextInformation @ stdcall -syscall NtUserGetProcessWindowStation() diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 00fec65427f..92f7c83576e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,6 +195,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); INT (WINAPI *pNtUserCountClipboardFormats)(void); + INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); BOOL (WINAPI *pNtUserGetUpdatedClipboardFormats)( UINT *formats, UINT size, UINT *out_size ); BOOL (WINAPI *pNtUserIsClipboardFormatAvailable)( UINT format ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 18949db3e43..dd3186ed2da 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -601,6 +601,11 @@ INT WINAPI NtUserCountClipboardFormats(void) return unix_funcs->pNtUserCountClipboardFormats(); } +INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ) +{ + return unix_funcs->pNtUserGetPriorityClipboardFormat( list, count ); +} + BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) { return unix_funcs->pNtUserGetUpdatedClipboardFormats( formats, size, out_size ); diff --git a/include/ntuser.h b/include/ntuser.h index 17032bded47..9fcd94128fd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -39,6 +39,7 @@ HWND WINAPI NtUserGetClipboardViewer(void); BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags ); BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); +INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread );

1 0

Ismael Luceno : server: Fix missing include for uid_t.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: c35df50c307789a177d07e6c74b0be830dc59f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35df50c307789a177d07e6c… Author: Ismael Luceno <ismael(a)iodev.co.uk> Date: Fri Nov 12 19:39:35 2021 +0100 server: Fix missing include for uid_t. Explicitly include <sys/types.h> to make uid_t available to users of server/security.h. This is a problem on musl, and possibly other non-glibc systems. Signed-off-by: Ismael Luceno <ismael(a)iodev.co.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/security.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/security.h b/server/security.h index 5388bc9c419..2f5c2b0c694 100644 --- a/server/security.h +++ b/server/security.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_SECURITY_H #define __WINE_SERVER_SECURITY_H +#include <sys/types.h> + extern const LUID SeIncreaseQuotaPrivilege; extern const LUID SeSecurityPrivilege; extern const LUID SeTakeOwnershipPrivilege;

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: a5bea3e89f5b43db4842219f98f9ff1a369b6a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5bea3e89f5b43db4842219f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 13 13:02:53 2021 +0100 po: Update Polish translation. Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 1062 ++++++++++++++++++++++++-------------------------------------- 1 file changed, 415 insertions(+), 647 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5bea3e89f5b43db4842…

1 0

Rémi Bernon : winspool.drv: Fix incorrect read of enumerated printer count.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: ff0f5e40249037c2456e43bf901633097d7ae430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0f5e40249037c2456e43bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 14 10:20:26 2021 +0100 winspool.drv: Fix incorrect read of enumerated printer count. This was changed from a unsigned int to a pointer in e5d37832ee66d011ba572a9b571e9fb44a7b2b4d and this use was missed, causing prefix creation hang if the allocated printers array is not filled with zeros. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3424c69d196..ac8f0994a1c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -800,7 +800,7 @@ static BOOL init_unix_printers( void ) if (printer->is_default) default_printer = printer->name; } - if (!default_printer && enum_params.num) default_printer = enum_params.printers[0].name; + if (!default_printer && num) default_printer = enum_params.printers[0].name; if (default_printer) SetDefaultPrinterW( default_printer ); if (ppd_dir)

1 0

Gabriel Ivăncescu : comctl32: Redraw children when the combo box is dropped down.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: c82d6ee4a77f9fc0f44e0d36d155a3c3f3a6f6d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82d6ee4a77f9fc0f44e0d36… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 12 18:50:01 2021 +0200 comctl32: Redraw children when the combo box is dropped down. Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child, so it requires a refresh as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 4208ff8b9c9..2f3652c64bd 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1003,8 +1003,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

Gabriel Ivăncescu : user32: Redraw children when the combo box is dropped down.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 0d4392077e1b41ae23535ec41a22c6732bc9f168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d4392077e1b41ae23535ec4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 12 18:50:02 2021 +0200 user32: Redraw children when the combo box is dropped down. Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child, so it requires a refresh as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1b53a2d6ad8..aeb7fa08e5f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1003,8 +1003,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

Mark Jansen : comctl32: Safely handle large wParam in SB_GETPARTS.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: bb24e756253272a929b970ea8b76336cb8c14254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb24e756253272a929b970ea… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Nov 12 10:46:52 2021 -0500 comctl32: Safely handle large wParam in SB_GETPARTS. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 9078e4a70bc..ac93d7712c0 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -401,6 +401,8 @@ STATUSBAR_GetParts (const STATUS_INFO *infoPtr, INT num_parts, INT parts[]) TRACE("(%d)\n", num_parts); if (parts) { + if (num_parts > infoPtr->numParts) + num_parts = infoPtr->numParts; for (i = 0; i < num_parts; i++) { parts[i] = infoPtr->parts[i].x; }

1 0