August 2020 - Wine-commits - list.winehq.org

Jacek Caban : conhost: Implement IOCTL_CONDRV_SET_TITLE.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: d2496e2d5c5ea4bde34659ba88cea52e8c27facb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2496e2d5c5ea4bde34659ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 24 13:21:56 2020 +0200 conhost: Implement IOCTL_CONDRV_SET_TITLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 ++ programs/conhost/conhost.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 922a250993..afc91ecfce 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3966,6 +3966,8 @@ static void test_pseudo_console_child(HANDLE input) ret = SetConsoleMode(input, mode | ENABLE_AUTO_POSITION); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + + test_console_title(); } static DWORD WINAPI read_pipe_proc( void *handle ) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7f1978bffb..c658deb1cf 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -73,6 +73,23 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) +{ + WCHAR *title = NULL; + + TRACE( "%s\n", debugstr_wn(in_title, size) ); + + if (size) + { + if (!(title = malloc( size ))) return STATUS_NO_MEMORY; + memcpy( title, in_title, size ); + } + free( console->title ); + console->title = title; + console->title_len = size; + return STATUS_SUCCESS; +} + static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { @@ -180,6 +197,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; } + case IOCTL_CONDRV_SET_TITLE: + if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; + return set_console_title( console, in_data, in_size ); + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Sven Baars : kernel32: Fix some string leaks (Coverity).
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 8ea62f2ed13865d866a38b80f24caca02ef72447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea62f2ed13865d866a38b80… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 24 17:02:02 2020 +0200 kernel32: Fix some string leaks (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8c03a45602..a1b3979555 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1775,11 +1775,13 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, RegCloseKey( section_key ); if (res) { + HeapFree( GetProcessHeap(), 0, entry_copy ); SetLastError( res ); RegCloseKey( key ); return FALSE; } } + HeapFree( GetProcessHeap(), 0, entry_copy ); } } RegCloseKey( key ); @@ -1917,6 +1919,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, { lstrcpynW( buffer + ret, section, size - ret - 1 ); ret = min( ret + strlenW( section ) + 1, size - 1 ); + HeapFree( GetProcessHeap(), 0, section ); } RegCloseKey( key );

1 0

Sven Baars : kernel32: Free the right variable (Coverity).
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 47fe53172971cfd233b30b33cf0d710c6317279c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fe53172971cfd233b30b33… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Aug 24 17:02:03 2020 +0200 kernel32: Free the right variable (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index a1b3979555..43b303fa25 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1290,7 +1290,7 @@ static BOOL delete_section( const WCHAR *filename, const WCHAR *section ) { if (!(path = get_key_value( subkey, entry ))) { - HeapFree( GetProcessHeap(), 0, path ); + HeapFree( GetProcessHeap(), 0, entry ); continue; }

1 0

Arkadiusz Hiler : Revert "ntdll/tests: Add test to check if GetTickCount is updated after sleeping.".
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 9012096b47d8422a296734ecbedb226188e93501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9012096b47d8422a296734ec… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Aug 18 16:27:15 2020 +0300 Revert "ntdll/tests: Add test to check if GetTickCount is updated after sleeping.". This reverts commit 4617f83fcf0a34fe41b0e38dde1567195395efca. The assumption that GetTickCount() gets updated after Sleep(1) holds only when there is no other software running on the system. If any program uses timeBeginPeriod() with values 1-15 then this assumption breaks. A lot of common user software calls timeBeginPeriod() - this includes browsers, media players, voice communicators, IDEs and store fronts. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index a00d507e4e..d756a8c839 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0, changed = 0; + int i = 0; i = 0; do @@ -253,15 +253,6 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } - - for (i = 0; i < 100; i++) - { - t1 = GetTickCount(); - Sleep(1); - t2 = GetTickCount(); - if (t1 != t2) changed++; - } - todo_wine ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); } START_TEST(time)

1 0

Zebediah Figura : server: Report named pipe device files as type "File".
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: aaea13a128b76fa0076b8852187c7d10e5eb5d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaea13a128b76fa0076b8852… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 16 19:36:03 2020 -0500 server: Report named pipe device files as type "File". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 ++++------ server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 29c777e91e..916ac8cbe7 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e && !wcsnicmp( string->Buffer, expect, string->Length / sizeof(WCHAR) ); } -#define test_object_type(a,b) _test_object_type(__LINE__,a,b,FALSE) -#define test_object_type_todo(a,b) _test_object_type(__LINE__,a,b,TRUE) -static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name, BOOL todo ) +#define test_object_type(a,b) _test_object_type(__LINE__,a,b) +static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name ) { char buffer[1024]; UNICODE_STRING *str = (UNICODE_STRING *)buffer, expect; @@ -1243,8 +1242,7 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length, "unexpected len %u\n", len ); - todo_wine_if (todo) - ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); + ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); } #define test_object_name(a,b,c) _test_object_name(__LINE__,a,b,c) @@ -1463,7 +1461,7 @@ static void test_query_object(void) ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe", TRUE ); - test_object_type_todo( handle, L"File" ); + test_object_type( handle, L"File" ); test_file_info( handle ); pNtClose( handle ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de..e7e5436c0e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops = { sizeof(struct named_pipe_device_file), /* size */ named_pipe_device_file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */

1 0

Martin Storsjo : ntdll: Add initial tests for arm64 RtlVirtualUnwind.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 32c618b7c5f5c1891de7833986ad95c9aeec69f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c618b7c5f5c1891de78339… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Aug 22 01:15:47 2020 +0300 ntdll: Add initial tests for arm64 RtlVirtualUnwind. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 284 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 284 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c618b7c5f5c1891de7…

1 0

Carlos Rivera : kernel32: Remove obsolete comment.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 70fdc36d296b77d1d130761342778b3b636f00bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=70fdc36d296b77d1d1307613… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Sun Aug 23 19:01:01 2020 +0100 kernel32: Remove obsolete comment. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index bfaba6cdeb..8c03a45602 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1547,8 +1547,6 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, /*********************************************************************** * GetPrivateProfileIntA (KERNEL32.@) - * - * FIXME: rewrite using unicode */ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT def_val, LPCSTR filename )

1 0

Alex Henrie : user32: Comment out SetWindowFullScreenState.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: a13f78cca755a182c26ae197c696d8ebc27c82f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13f78cca755a182c26ae197… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 23 18:59:52 2020 -0600 user32: Comment out SetWindowFullScreenState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49728 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d2a1487971..8051ae3f76 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -717,7 +717,7 @@ @ stdcall SetWindowCompositionAttribute(ptr ptr) @ stdcall SetWindowContextHelpId(long long) @ stdcall SetWindowDisplayAffinity(long long) -@ stub SetWindowFullScreenState +# @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) @ stdcall -arch=win64 SetWindowLongPtrA(long long long) @ stdcall -arch=win64 SetWindowLongPtrW(long long long)

1 0

Paul Gofman : ntdll: Also save unwind info for rbp in call_consolidate_callback() on x64.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 057e7f19407f0291cb4240c23fc391263ba9faa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057e7f19407f0291cb4240c2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 23:56:41 2020 +0300 ntdll: Also save unwind info for rbp in call_consolidate_callback() on x64. Fixes Bloons TD 6 crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 564b74b7be..87acff3dcd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1029,9 +1029,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_SEH(".seh_pushframe\n\t") __ASM_SEH(".seh_endprologue\n\t") - "subq $0xf8,%rsp\n\t" /* 10*16 (float regs) + 7*8 (int regs) + 32 (shadow store). */ - __ASM_SEH(".seh_stackalloc 0xf8\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 0xf8\n\t") + "subq $0x108,%rsp\n\t" /* 10*16 (float regs) + 8*8 (int regs) + 32 (shadow store) + 8 (align). */ + __ASM_SEH(".seh_stackalloc 0x108\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x108\n\t") /* Setup CFI unwind to context. */ "movq %rcx,0x10(%rbp)\n\t" @@ -1058,6 +1058,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_escape 0x10,0x20,0x06,0x76,0x10,0x06,0x23,0x90,0x05\n\t") /* %xmm15 */ /* Setup SEH unwind registers restore. */ + "movq 0xa0(%rcx),%rax\n\t" /* context->Rbp */ + "movq %rax,0x100(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rbp, 0x100\n\t") "movq 0x90(%rcx),%rax\n\t" /* context->Rbx */ "movq %rax,0x20(%rsp)\n\t" __ASM_SEH(".seh_savereg %rbx, 0x20\n\t")

1 0

Zebediah Figura : ntdll: Read the condition variable and manipulate the lock on the PE side.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 8bd95a80f263a8df6873f8e3a8b10fdce4136fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd95a80f263a8df6873f8e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 20 15:38:42 2020 -0500 ntdll: Read the condition variable and manipulate the lock on the PE side. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49712 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 21 +++-------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/sync.c | 84 ++++++++---------------------------------- dlls/ntdll/unix/unix_private.h | 7 +--- dlls/ntdll/unixlib.h | 10 ++--- 5 files changed, 27 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd95a80f263a8df6873…

1 0