November 2021 - Wine-commits

Alexandre Julliard : configure: Regenerate with autoconf 2.71.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 4d2f2e80793610b2e134e3ee66caabffb8eae747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2f2e80793610b2e134e3ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 13 14:41:23 2021 +0100 configure: Regenerate with autoconf 2.71. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14153 +++++++++++++++++++++++++++++--------------------- configure.ac | 13 +- include/config.h.in | 15 +- 3 files changed, 8296 insertions(+), 5885 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d2f2e80793610b2e134…

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: b9f6d1be00a7231de3d910beb4067a0ec0193649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f6d1be00a7231de3d910be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 13 15:01:37 2021 +0100 tools: Upgrade the config.guess/config.sub scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 1169 +++++++++++++++++++++++++++------------------------- tools/config.sub | 93 +++-- 2 files changed, 678 insertions(+), 584 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f6d1be00a7231de3d9…

1 0

Alexandre Julliard : gdi32/tests: Use the OS/2 last char for the Ansi charset limit.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: d2e7a977cfaca4d5784f063ead5eadf3344064eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e7a977cfaca4d5784f063e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 14 11:52:12 2021 +0100 gdi32/tests: Use the OS/2 last char for the Ansi charset limit. Fixes a test failure with the cmmi10.ttf font. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 11150685bcd..0c346fa5e6b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3997,7 +3997,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) expect_break_W = os2_first_char; expect_default_W = expect_break_W - 1; expect_first_A = expect_default_W - 1; - expect_last_A = min(expect_last_W, 0xff); + expect_last_A = min(os2_last_char, 0xff); } expect_break_A = expect_break_W; expect_default_A = expect_default_W;

1 0

Alexandre Julliard : makefiles: Don't copy the source makefile into the sub-directory stub makefiles.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: b78ef40ab170f5a2ec1ca86bf72b102a33a92593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78ef40ab170f5a2ec1ca86b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 13 11:47:40 2021 +0100 makefiles: Don't copy the source makefile into the sub-directory stub makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9a9e443456e..161cbb8d879 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1578,7 +1578,7 @@ static FILE *open_input_makefile( const struct makefile *make ) FILE *ret; if (make->obj_dir) - input_file_name = root_src_dir_path( obj_dir_path( make, strmake( "%s.in", output_makefile_name ))); + input_file_name = root_src_dir_path( obj_dir_path( make, "Makefile.in" )); else input_file_name = output_makefile_name; /* always use output name for main Makefile */ @@ -3629,7 +3629,7 @@ static void output_subdirs( struct makefile *make ) strarray_addall( &all_targets, make->all_targets ); for (i = 0; i < subdirs.count; i++) { - strarray_add( &makefile_deps, src_dir_path( submakes[i], strmake ( "%s.in", output_makefile_name ))); + strarray_add( &makefile_deps, src_dir_path( submakes[i], "Makefile.in" )); strarray_addall_uniq( &make->phony_targets, submakes[i]->phony_targets ); strarray_addall_uniq( &make->uninstall_files, submakes[i]->uninstall_files ); strarray_addall_uniq( &dependencies, submakes[i]->dependencies ); @@ -3998,6 +3998,13 @@ static void output_stub_makefile( struct makefile *make ) struct strarray targets = empty_strarray; const char *make_var = strarray_get_value( &top_makefile->vars, "MAKE" ); + if (make->obj_dir) create_dir( make->obj_dir ); + + output_file_name = obj_dir_path( make, "Makefile" ); + output_file = create_temp_file( output_file_name ); + + output( "# Auto-generated stub makefile; all rules forward to the top-level makefile\n\n" ); + if (make_var) output( "MAKE = %s\n\n", make_var ); output( "all:\n" ); @@ -4021,6 +4028,10 @@ static void output_stub_makefile( struct makefile *make ) output( ".PHONY:" ); output_filenames( targets ); output( "\n" ); + + fclose( output_file ); + output_file = NULL; + rename_temp_file( output_file_name ); } @@ -4059,17 +4070,14 @@ static void output_silent_rules(void) /******************************************************************* - * output_dependencies + * output_top_makefile */ -static void output_dependencies( struct makefile *make ) +static void output_top_makefile( struct makefile *make ) { - struct strarray ignore_files = empty_strarray; char buffer[1024]; FILE *src_file; int i, found = 0; - if (make->obj_dir) create_dir( make->obj_dir ); - output_file_name = obj_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name ); @@ -4085,20 +4093,29 @@ static void output_dependencies( struct makefile *make ) if (!found) output( "\n%s (everything below this line is auto-generated; DO NOT EDIT!!)\n", separator ); - if (make == top_makefile) - { - if (silent_rules) output_silent_rules(); - for (i = 0; i < subdirs.count; i++) output_sources( submakes[i] ); - output_sources( make ); - } - else output_stub_makefile( make ); - + if (silent_rules) output_silent_rules(); + for (i = 0; i < subdirs.count; i++) output_sources( submakes[i] ); + output_sources( make ); /* disable implicit rules */ output( ".SUFFIXES:\n" ); fclose( output_file ); output_file = NULL; rename_temp_file( output_file_name ); +} + + +/******************************************************************* + * output_dependencies + */ +static void output_dependencies( struct makefile *make ) +{ + struct strarray ignore_files = empty_strarray; + + if (make->obj_dir) create_dir( make->obj_dir ); + + if (make == top_makefile) output_top_makefile( make ); + else output_stub_makefile( make ); strarray_addall( &ignore_files, make->distclean_files ); strarray_addall( &ignore_files, make->clean_files );

1 0

Alexandre Julliard : makefiles: Always use winebuild to build static libraries.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 9248dbaf0d4e52b601855fe367dfda4c5c46d5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9248dbaf0d4e52b601855fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 14 12:27:32 2021 +0100 makefiles: Always use winebuild to build static libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 161cbb8d879..1ef79ebfa88 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3423,13 +3423,15 @@ static void output_module( struct makefile *make ) static void output_static_lib( struct makefile *make ) { strarray_add( &make->clean_files, make->staticlib ); - output( "%s:", obj_dir_path( make, make->staticlib )); + output( "%s: %s", obj_dir_path( make, make->staticlib ), tools_path( make, "winebuild" )); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n\t%srm -f $@ && %s rc $@", cmd_prefix( "AR" ), ar ); + output( "\n" ); + output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); + output_filenames( target_flags ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( " && %s $@\n", ranlib ); + output( "\n" ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib )); if (crosstarget) { @@ -4042,7 +4044,6 @@ static void output_silent_rules(void) { static const char *cmds[] = { - "AR", "BISON", "BUILD", "CC",

1 0

Alexandre Julliard : makefiles: Do not install external libraries.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 665ebe2a7a2292f780607b09c3c9e3b170ccd6d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ebe2a7a2292f780607b09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 14 13:06:26 2021 +0100 makefiles: Do not install external libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1ef79ebfa88..5d59123678e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3053,7 +3053,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || - make->staticlib)); + (make->staticlib && !make->extlib))); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) @@ -3422,17 +3422,21 @@ static void output_module( struct makefile *make ) */ static void output_static_lib( struct makefile *make ) { - strarray_add( &make->clean_files, make->staticlib ); - output( "%s: %s", obj_dir_path( make, make->staticlib ), tools_path( make, "winebuild" )); - output_filenames_obj_dir( make, make->object_files ); - output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n" ); - output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); - output_filenames( target_flags ); - output_filenames_obj_dir( make, make->object_files ); - output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n" ); - add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib )); + if (!crosstarget || !make->extlib) + { + strarray_add( &make->clean_files, make->staticlib ); + output( "%s: %s", obj_dir_path( make, make->staticlib ), tools_path( make, "winebuild" )); + output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->unixobj_files ); + output( "\n" ); + output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); + output_filenames( target_flags ); + output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->unixobj_files ); + output( "\n" ); + add_install_rule( make, make->staticlib, make->staticlib, + strmake( "d%s/%s", so_dir, make->staticlib )); + } if (crosstarget) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3445,8 +3449,9 @@ static void output_static_lib( struct makefile *make ) tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); - add_install_rule( make, make->staticlib, name, - strmake( "d%s/%s", pe_dir, make->staticlib )); + if (!make->extlib) + add_install_rule( make, make->staticlib, name, + strmake( "d%s/%s", pe_dir, make->staticlib )); } }

1 0

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

15 Nov '21

Module: wine Branch: master Commit: 70f8330d0e726bddc562dbdd2d4ffc78de5535b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f8330d0e726bddc562dbdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:53:28 2021 +0100 win32u: Move NtUserGetClipboardFormatName 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 | 12 +----------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 25 +++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 6 ++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 9 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index b9bcc184ca1..2e0c6b92d39 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -82,7 +82,7 @@ static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; DWORD le = GetLastError(); - BOOL r = GetClipboardFormatNameW( id, buffer, 256 ); + BOOL r = NtUserGetClipboardFormatName( id, buffer, 256 ); SetLastError(le); if (r) @@ -658,16 +658,6 @@ UINT WINAPI RegisterClipboardFormatA( LPCSTR name ) } -/************************************************************************** - * GetClipboardFormatNameW (USER32.@) - */ -INT WINAPI GetClipboardFormatNameW( UINT format, LPWSTR buffer, INT maxlen ) -{ - if (format < MAXINTATOM || format > 0xffff) return 0; - return GlobalGetAtomNameW( format, buffer, maxlen ); -} - - /************************************************************************** * GetClipboardFormatNameA (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 87f4dc468bf..319dda49eb5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -276,7 +276,7 @@ @ stdcall GetClipCursor(ptr) @ stdcall GetClipboardData(long) @ stdcall GetClipboardFormatNameA(long ptr long) -@ stdcall GetClipboardFormatNameW(long ptr long) +@ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName @ stdcall GetClipboardOwner() @ stdcall GetClipboardSequenceNumber () @ stdcall GetClipboardViewer() diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 8d0e09fdb55..c2fd07ac5b9 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -53,3 +53,28 @@ INT WINAPI NtUserCountClipboardFormats(void) TRACE( "returning %d\n", count ); return count; } + +/************************************************************************** + * NtUserGetClipboardFormatName (win32u.@) + */ +INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen ) +{ + char buf[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ATOM_BASIC_INFORMATION *abi = (ATOM_BASIC_INFORMATION *)buf; + UINT length = 0; + + if (format < MAXINTATOM || format > 0xffff) return 0; + if (maxlen <= 0) + { + SetLastError( ERROR_MORE_DATA ); + return 0; + } + if (!set_ntstatus( NtQueryInformationAtom( format, AtomBasicInformation, + buf, sizeof(buf), NULL ))) + return 0; + + length = min( abi->NameLength / sizeof(WCHAR), maxlen - 1 ); + if (length) memcpy( buffer, abi->Name, length * sizeof(WCHAR) ); + buffer[length] = 0; + return length; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 762729f815e..a84633b2215 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -105,6 +105,7 @@ static void * const syscalls[] = NtUserCloseWindowStation, NtUserCreateDesktopEx, NtUserCreateWindowStation, + NtUserGetClipboardFormatName, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index daea9cfe21a..d1774804293 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -903,7 +903,7 @@ @ stub NtUserGetClipCursor @ stub NtUserGetClipboardAccessToken @ stub NtUserGetClipboardData -@ stub NtUserGetClipboardFormatName +@ stdcall -syscall NtUserGetClipboardFormatName(long ptr long) @ stub NtUserGetClipboardOwner @ stub NtUserGetClipboardSequenceNumber @ stub NtUserGetClipboardViewer diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a78c7bb906b..7526f4414dd 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -232,6 +232,12 @@ extern ULONG query_reg_ascii_value( HKEY hkey, const char *name, extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN; +static inline BOOL set_ntstatus( NTSTATUS status ) +{ + if (status) SetLastError( RtlNtStatusToDosError( status )); + return !status; +} + static inline WCHAR *win32u_wcsrchr( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 8430d0b1527..b78b4697e6c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -92,6 +92,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 2686d75a094..f12516843fb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -190,3 +190,12 @@ NTSTATUS WINAPI wow64_NtUserGetLayeredWindowAttributes( UINT *args ) return NtUserGetLayeredWindowAttributes( hwnd, key, alpha, flags ); } + +NTSTATUS WINAPI wow64_NtUserGetClipboardFormatName( UINT *args ) +{ + UINT format = get_ulong( &args ); + WCHAR *buffer = get_ptr( &args ); + INT maxlen = get_ulong( &args ); + + return NtUserGetClipboardFormatName( format, buffer, maxlen ); +} diff --git a/include/ntuser.h b/include/ntuser.h index de493b7a6d7..a68c8458213 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -31,6 +31,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *d ULONG heap_size ); HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); +INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen ); BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags ); BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed );

1 0

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

15 Nov '21

Module: wine Branch: master Commit: a4e800f380be6733c46f0a202c0333f28ec0f954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e800f380be6733c46f0a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:53:40 2021 +0100 win32u: Move NtUserIsClipboardFormatAvailable 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 | 24 +---------------- dlls/user32/edit.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 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 + 9 files changed, 74 insertions(+), 26 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 2e0c6b92d39..8023eee4944 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -939,28 +939,6 @@ UINT WINAPI EnumClipboardFormats( UINT format ) } -/************************************************************************** - * IsClipboardFormatAvailable (USER32.@) - */ -BOOL WINAPI IsClipboardFormatAvailable( UINT format ) -{ - BOOL ret = FALSE; - - if (!format) return FALSE; - - USER_Driver->pUpdateClipboard(); - - SERVER_START_REQ( get_clipboard_formats ) - { - req->format = format; - if (!wine_server_call_err( req )) ret = (reply->count > 0); - } - SERVER_END_REQ; - TRACE( "%s -> %u\n", debugstr_format( format ), ret ); - return ret; -} - - /************************************************************************** * GetUpdatedClipboardFormats (USER32.@) */ @@ -1080,7 +1058,7 @@ INT WINAPI GetPriorityClipboardFormat(UINT *list, INT nCount) return 0; for (i = 0; i < nCount; i++) - if (IsClipboardFormatAvailable(list[i])) + if (NtUserIsClipboardFormatAvailable(list[i])) return list[i]; return -1; diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4de206aa12f..cf5e807de21 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3313,7 +3313,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) /* copy */ EnableMenuItem(popup, 3, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED)); /* paste */ - EnableMenuItem(popup, 4, MF_BYPOSITION | (IsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(popup, 4, MF_BYPOSITION | (NtUserIsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* delete */ EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* select all */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 319dda49eb5..3a46765c038 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -460,7 +460,7 @@ @ stdcall -import IsCharUpperA(long) @ stdcall -import IsCharUpperW(long) @ stdcall IsChild(long long) -@ stdcall IsClipboardFormatAvailable(long) +@ stdcall IsClipboardFormatAvailable(long) NtUserIsClipboardFormatAvailable @ stdcall IsDialogMessage(long ptr) IsDialogMessageA @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index c2fd07ac5b9..4c64655b69e 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -34,6 +34,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); +/* get a debug string for a format id */ +static const char *debugstr_format( UINT id ) +{ + WCHAR buffer[256]; + DWORD le = GetLastError(); + BOOL r = NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) ); + SetLastError(le); + + if (r) + 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 ); + } +} + /************************************************************************** * NtUserCountClipboardFormats (win32u.@) */ @@ -54,6 +95,27 @@ INT WINAPI NtUserCountClipboardFormats(void) return count; } +/************************************************************************** + * NtUserIsClipboardFormatAvailable (win32u.@) + */ +BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ) +{ + BOOL ret = FALSE; + + if (!format) return FALSE; + + user_driver->pUpdateClipboard(); + + SERVER_START_REQ( get_clipboard_formats ) + { + req->format = format; + if (!wine_server_call_err( req )) ret = (reply->count > 0); + } + SERVER_END_REQ; + TRACE( "%s -> %u\n", debugstr_format( format ), ret ); + return ret; +} + /************************************************************************** * NtUserGetClipboardFormatName (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4737aa30cd2..005bd5af165 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1168,6 +1168,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserCountClipboardFormats, + NtUserIsClipboardFormatAvailable, GDIRealizePalette, GDISelectPalette, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d1774804293..dbfe196dbcf 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1050,7 +1050,7 @@ @ stub NtUserInvalidateRect @ stub NtUserInvalidateRgn @ stub NtUserIsChildWindowDpiMessageEnabled -@ stub NtUserIsClipboardFormatAvailable +@ stdcall NtUserIsClipboardFormatAvailable(long) @ stub NtUserIsMouseInPointerEnabled @ stub NtUserIsMouseInputEnabled @ stub NtUserIsNonClientDpiScalingEnabled diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7526f4414dd..71a9909cfba 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 *pNtUserIsClipboardFormatAvailable)( UINT format ); /* Wine-specific functions */ UINT (WINAPI *pGDIRealizePalette)( HDC hdc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index d236fb6b2db..50f000bdb3c 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 NtUserIsClipboardFormatAvailable( UINT format ) +{ + return unix_funcs->pNtUserIsClipboardFormatAvailable( format ); +} + UINT WINAPI GDIRealizePalette( HDC hdc ) { return unix_funcs->pGDIRealizePalette( hdc ); diff --git a/include/ntuser.h b/include/ntuser.h index a68c8458213..083d6cb4a1b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -38,6 +38,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 NtUserIsClipboardFormatAvailable( UINT format ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access );

1 0

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

15 Nov '21

Module: wine Branch: master Commit: e8dac807aae9ed9f078ba6399fcb4d17120dd253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8dac807aae9ed9f078ba639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:53:50 2021 +0100 win32u: Move NtUserGetClipboardOwner 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 | 21 +-------------------- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 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 + 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 8023eee4944..a1fe923ffb3 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -729,7 +729,7 @@ BOOL WINAPI CloseClipboard(void) BOOL WINAPI EmptyClipboard(void) { BOOL ret; - HWND owner = GetClipboardOwner(); + HWND owner = NtUserGetClipboardOwner(); TRACE( "owner %p\n", owner ); @@ -750,25 +750,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * GetClipboardOwner (USER32.@) - */ -HWND WINAPI GetClipboardOwner(void) -{ - HWND hWndOwner = 0; - - SERVER_START_REQ( get_clipboard_info ) - { - if (!wine_server_call_err( req )) hWndOwner = wine_server_ptr_handle( reply->owner ); - } - SERVER_END_REQ; - - TRACE( "returning %p\n", hWndOwner ); - - return hWndOwner; -} - - /************************************************************************** * GetOpenClipboardWindow (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3a46765c038..7592b477b6b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -277,7 +277,7 @@ @ stdcall GetClipboardData(long) @ stdcall GetClipboardFormatNameA(long ptr long) @ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName -@ stdcall GetClipboardOwner() +@ stdcall GetClipboardOwner() NtUserGetClipboardOwner @ stdcall GetClipboardSequenceNumber () @ stdcall GetClipboardViewer() @ stdcall GetComboBoxInfo(long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 55d12a6d62c..bc0b06c3f94 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1949,7 +1949,7 @@ static void WIN_SendDestroyMsg( HWND hwnd ) if (hwnd == info.hwndActive) WINPOS_ActivateOtherWindow( hwnd ); } - if (hwnd == GetClipboardOwner()) CLIPBOARD_ReleaseOwner( hwnd ); + if (hwnd == NtUserGetClipboardOwner()) CLIPBOARD_ReleaseOwner( hwnd ); /* * Send the WM_DESTROY to the window. diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 4c64655b69e..4e584ceb71c 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -140,3 +140,20 @@ INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen buffer[length] = 0; return length; } + +/************************************************************************** + * NtUserGetClipboardOwner (win32u.@) + */ +HWND WINAPI NtUserGetClipboardOwner(void) +{ + HWND owner = 0; + + SERVER_START_REQ( get_clipboard_info ) + { + if (!wine_server_call_err( req )) owner = wine_server_ptr_handle( reply->owner ); + } + SERVER_END_REQ; + + TRACE( "returning %p\n", owner ); + return owner; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index a84633b2215..9bc6265e79b 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -106,6 +106,7 @@ static void * const syscalls[] = NtUserCreateDesktopEx, NtUserCreateWindowStation, NtUserGetClipboardFormatName, + NtUserGetClipboardOwner, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index dbfe196dbcf..34a1caf6bcd 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -904,7 +904,7 @@ @ stub NtUserGetClipboardAccessToken @ stub NtUserGetClipboardData @ stdcall -syscall NtUserGetClipboardFormatName(long ptr long) -@ stub NtUserGetClipboardOwner +@ stdcall -syscall NtUserGetClipboardOwner() @ stub NtUserGetClipboardSequenceNumber @ stub NtUserGetClipboardViewer @ stub NtUserGetComboBoxInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index b78b4697e6c..62375014010 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -93,6 +93,7 @@ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ + SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index f12516843fb..f0d520bfaa4 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -199,3 +199,8 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardFormatName( UINT *args ) return NtUserGetClipboardFormatName( format, buffer, maxlen ); } + +NTSTATUS WINAPI wow64_NtUserGetClipboardOwner( UINT *args ) +{ + return HandleToUlong( NtUserGetClipboardOwner() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 083d6cb4a1b..27fb6b60bc3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -32,6 +32,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *d HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen ); +HWND WINAPI NtUserGetClipboardOwner(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 );

1 0

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

15 Nov '21

Module: wine Branch: master Commit: e2ede91cf1e3a6231c3158ee1c0cb76995cedfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ede91cf1e3a6231c3158ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:53:59 2021 +0100 win32u: Move NtUserGetClipboardViewer 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 | 19 ------------------- 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(+), 21 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index a1fe923ffb3..8b00fcf5c9e 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -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.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 7592b477b6b..c464664e581 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -279,7 +279,7 @@ @ stdcall GetClipboardFormatNameW(long ptr long) NtUserGetClipboardFormatName @ stdcall GetClipboardOwner() NtUserGetClipboardOwner @ stdcall GetClipboardSequenceNumber () -@ stdcall GetClipboardViewer() +@ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) @ stdcall GetCurrentInputMessageSource(ptr) @ stdcall GetCursor() diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 4e584ceb71c..d592e007a6e 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -157,3 +157,20 @@ HWND WINAPI NtUserGetClipboardOwner(void) TRACE( "returning %p\n", 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; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 9bc6265e79b..699c0667b16 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -107,6 +107,7 @@ static void * const syscalls[] = NtUserCreateWindowStation, NtUserGetClipboardFormatName, NtUserGetClipboardOwner, + NtUserGetClipboardViewer, NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 34a1caf6bcd..9c98aa645b9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -906,7 +906,7 @@ @ stdcall -syscall NtUserGetClipboardFormatName(long ptr long) @ stdcall -syscall NtUserGetClipboardOwner() @ stub NtUserGetClipboardSequenceNumber -@ stub NtUserGetClipboardViewer +@ stdcall -syscall NtUserGetClipboardViewer() @ stub NtUserGetComboBoxInfo @ stub NtUserGetControlBrush @ stub NtUserGetControlColor diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 62375014010..79179bcf1b2 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( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index f0d520bfaa4..7b34d8140a0 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -204,3 +204,8 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardOwner( UINT *args ) { return HandleToUlong( NtUserGetClipboardOwner() ); } + +NTSTATUS WINAPI wow64_NtUserGetClipboardViewer( UINT *args ) +{ + return HandleToUlong( NtUserGetClipboardViewer() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 27fb6b60bc3..0fed1368acf 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); +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 );

1 0