November 2021 - Wine-Commits

Alexandre Julliard : configure: Regenerate with autoconf 2.71.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

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

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

Nov. 15, 2021

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

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

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

Jacek Caban : win32u: Move NtUserGetClipboardOwner implementation from user32.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

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

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

Nov. 15, 2021

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

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

Nov. 15, 2021

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

Ismael Luceno : server: Fix missing include for uid_t.
by Alexandre Julliard Nov. 15, 2021

Nov. 15, 2021

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

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

Nov. 12, 2021

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

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

Nov. 12, 2021

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

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

Nov. 12, 2021

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