wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

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

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

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: 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 : 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 : 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 : 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

Thomas Faber : msvcrt/tests: Show that spawn does not require locking of fds.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: be0684dad50ffbc93b3ded4fbfebf1d1e4690589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0684dad50ffbc93b3ded4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 11 17:42:58 2021 -0500 msvcrt/tests: Show that spawn does not require locking of fds. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a33ae24230..ceb2165891f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1565,6 +1565,18 @@ static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hst DeleteFileA( "fdopen.err" ); } +static unsigned WINAPI read_pipe_thread(void *argument) +{ + unsigned char buffer[2]; + int ret; + int *pipefds = argument; + + ret = _read(pipefds[0], buffer, sizeof(buffer)); + ok(ret == 1, "ret = %d\n", ret); + ok(buffer[0] == 'a', "%x\n", buffer[0]); + return 0; +} + static void test_file_inherit( const char* selfname ) { int fd; @@ -1574,6 +1586,9 @@ static void test_file_inherit( const char* selfname ) STARTUPINFOA startup; SECURITY_ATTRIBUTES sa; HANDLE handles[3]; + HANDLE thread_handle; + int pipefds[2]; + intptr_t ret; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -1582,7 +1597,8 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); @@ -1595,12 +1611,37 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + /* Show that spawn works while a read is active */ + ok(_pipe(pipefds, 1, O_BINARY) == 0, "_pipe() failed\n"); + thread_handle = (HANDLE)_beginthreadex(NULL, 0, read_pipe_thread, pipefds, 0, NULL); + Sleep(100); /* try to make sure the thread is reading */ + fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "Couldn't create test file\n"); + arg_v[1] = "tests/file.c"; + arg_v[2] = "inherit"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); + arg_v[4] = 0; + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno); + ret = tell(fd); + ok(ret == 8, "bad position %Iu expecting 8\n", ret); + lseek(fd, 0, SEEK_SET); + ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); + close (fd); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + _write(pipefds[1], "a", 1); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + close(pipefds[0]); + close(pipefds[1]); + /* make file handle inheritable */ sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL;

1 0

Doug Lyons : msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 5a514d3f45472ce1a169f33d14cdcfb07c51441e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a514d3f45472ce1a169f33d… Author: Doug Lyons <douglyons(a)douglyons.com> Date: Thu Nov 11 17:32:45 2021 -0500 msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51647 Signed-off-by: Doug Lyons <douglyons(a)douglyons.com> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 5 ++--- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fd7168991f4..2b0395d7535 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -517,7 +517,7 @@ static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags) * 04 char file flags (wxflag): repeated for each fd * 4+NBFD HANDLE file handle: repeated for each fd */ -unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) +BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { int fd, last_fd; char* wxflag_ptr; @@ -543,7 +543,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) for (fd = 0; fd < last_fd; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ - fdinfo = get_ioinfo(fd); + fdinfo = get_ioinfo_nolock(fd); if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN) { *wxflag_ptr = fdinfo->wxflag; @@ -554,7 +554,6 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *wxflag_ptr = 0; *handle_ptr = INVALID_HANDLE_VALUE; } - release_ioinfo(fdinfo); wxflag_ptr++; handle_ptr++; } return TRUE; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f38976197fa..e50f3e6991b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -238,7 +238,7 @@ extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN; extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; #endif -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; +extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; /* run-time error codes */ #define _RT_STACK 0

1 0

Thomas Faber : comctl32/tests: Test SB_GETPARTS with large wParam.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 68b48acbc4879127e31114d935232c9a41ac35b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b48acbc4879127e31114d9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 10:47:39 2021 -0500 comctl32/tests: Test SB_GETPARTS with large wParam. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/status.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f7eec88c613..5de96c19f03 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -253,7 +253,7 @@ static void test_status_control(void) HWND hWndStatus; int r; int nParts[] = {50, 150, -1}; - int checkParts[] = {0, 0, 0}; + int checkParts[] = {0, 0, 0, 0, 0}; int borders[] = {0, 0, 0}; RECT rc; CHAR charArray[20]; @@ -304,12 +304,20 @@ static void test_status_control(void) expect(5,LOWORD(r)); expect(SBT_NOBORDERS,HIWORD(r)); - /* Get parts and borders */ + /* Get parts */ r = SendMessageA(hWndStatus, SB_GETPARTS, 3, (LPARAM)checkParts); ok(r == 3, "Expected 3, got %d\n", r); expect(50,checkParts[0]); expect(150,checkParts[1]); expect(-1,checkParts[2]); + r = SendMessageA(hWndStatus, SB_GETPARTS, 5, (LPARAM)checkParts); + ok(r == 3, "Expected 3, got %d\n", r); + expect(50,checkParts[0]); + expect(150,checkParts[1]); + expect(-1,checkParts[2]); + expect(0,checkParts[3]); + expect(0,checkParts[4]); + /* Get borders */ r = SendMessageA(hWndStatus, SB_GETBORDERS, 0, (LPARAM)borders); ok(r == TRUE, "Expected TRUE, got %d\n", r); expect(0,borders[0]);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021