- Wine-Commits - list.winehq.org

Dmitry Timoshkov : sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 4551a6a3c78ba0f2718d1ad6fffbb027f8cde255 URL: https://gitlab.winehq.org/wine/wine/-/commit/4551a6a3c78ba0f2718d1ad6fffbb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 6 15:30:46 2022 +0300 sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f2583de38d4a9370137f578f8c239041ae080ac1) Conflicts: dlls/advapi32/tests/security.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++--- dlls/sechost/security.c | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c73e28a98e6..f783f46996d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4216,6 +4216,7 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; DWORD GLE; DWORD altGLE; + DWORD ace_Mask; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -4236,9 +4237,12 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ - { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_ALL }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, 1 }, + { "D:(A;;020000000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ }, + { "D:(A;;0X40000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_WRITE }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, READ_CONTROL | DELETE | WRITE_DAC | WRITE_OWNER }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, @@ -4272,7 +4276,20 @@ static void test_ConvertStringSecurityDescriptor(void) (cssd[i].altGLE && GLE == cssd[i].altGLE), "(%02u) Unexpected last error %d\n", i, GLE); if (ret) + { + if (cssd[i].ace_Mask) + { + ACCESS_ALLOWED_ACE *ace; + + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "(%02u) Got %u\n", i, acl->AclRevision); + + ace = (ACCESS_ALLOWED_ACE *)(acl + 1); + ok(ace->Mask == cssd[i].ace_Mask, "(%02u) Expected %08x, got %08x\n", + i, cssd[i].ace_Mask, ace->Mask); + } LocalFree(pSD); + } } /* test behaviour with NULL parameters */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 4aee8c723d2..a27a4f001b7 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -900,8 +900,8 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) const WCHAR *string = *string_ptr; unsigned int i; - if (string[0] == '0' && string[1] == 'x') - return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 0 ); for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) {

1 0

Zhiyi Zhang : comctl32/tests: Test that changing focus for edit controls doesn't repaint immediately.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: e83b7ecf8bf63594059942becbed0d33a95a005f URL: https://gitlab.winehq.org/wine/wine/-/commit/e83b7ecf8bf63594059942becbed0d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/tests: Test that changing focus for edit controls doesn't repaint immediately. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 2a27ffe423c3e8ccaafe3452ea76be2cfd25fdbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index e3b2f408047..92677d5db1b 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3322,6 +3322,22 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static const struct message setfocus_sent_only_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, + { 0 } +}; + +static const struct message killfocus_sent_only_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_KILLFOCUS), 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, PARENT_ID }, + { 0 } +}; + static void test_cue_banner(void) { HWND hwnd_edit; @@ -3433,6 +3449,18 @@ static void test_change_focus(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + /* Test message sequences without waiting for posted messages */ + SetFocus(parent_wnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(hwnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_sent_only_combined_seq, + "Set focus sent only", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(parent_wnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_sent_only_combined_seq, + "Kill focus sent only", TRUE); + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hwnd);

1 0

Zhiyi Zhang : comctl32/edit: Don't repaint immediately when getting focus.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9b7d51640bc249f84e662c949249dea56010f13f URL: https://gitlab.winehq.org/wine/wine/-/commit/9b7d51640bc249f84e662c949249de… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Don't repaint immediately when getting focus. Fix MSXML 3.0 installer username edit control missing part of its edge. The application has a static control overlapping an edit control. Repainting the edit control immediately will cause the edit control to be painted under the static control. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit a336b43a93ce7e0db813a6dac329b8aa1b5ccd9f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d9354a107b1..8b309b009ba 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3684,7 +3684,7 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) */ static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) { - UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + UINT flags = RDW_INVALIDATE; es->flags |= EF_FOCUSED; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 92677d5db1b..295abe198f2 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3454,7 +3454,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_sent_only_combined_seq, - "Set focus sent only", TRUE); + "Set focus sent only", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd);

1 0

Sebastian Lackner : ntdll: Improve stub of NtQueryEaFile.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: a01442574416e582294115bf82f0fe4397151cd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a01442574416e582294115bf82f0fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 6 07:03:33 2015 +0800 ntdll: Improve stub of NtQueryEaFile. Co-authored-by: Qian Hong <qhong(a)codeweavers.com> Co-authored-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> (cherry picked from commit 3c4cdfa7049eb3063c9b77efbbf3c90e5334bd28) Conflicts: dlls/ntdll/tests/file.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/file.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 15 +++++++-- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2ac21..8af5f8b89e7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -84,6 +84,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*); static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*); +static NTSTATUS (WINAPI *pNtQueryEaFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN); static WCHAR fooW[] = {'f','o','o',0}; @@ -5108,6 +5109,86 @@ static void test_flush_buffers_file(void) DeleteFileA(buffer); } +static void test_query_ea(void) +{ +#define EA_BUFFER_SIZE 4097 + unsigned char data[EA_BUFFER_SIZE + 8]; + unsigned char *buffer = (void *)(((DWORD_PTR)data + 7) & ~7); + DWORD buffer_len, i; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + + if (!(handle = create_temp_file(0))) return; + + /* test with INVALID_HANDLE_VALUE */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + memset(buffer, 0xcc, EA_BUFFER_SIZE); + buffer_len = EA_BUFFER_SIZE - 1; + status = pNtQueryEaFile(INVALID_HANDLE_VALUE, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + ok(buffer[0] == 0xcc, "data at position 0 overwritten\n"); + + /* test with 0xdeadbeef */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + memset(buffer, 0xcc, EA_BUFFER_SIZE); + buffer_len = EA_BUFFER_SIZE - 1; + status = pNtQueryEaFile((void *)0xdeadbeef, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + ok(buffer[0] == 0xcc, "data at position 0 overwritten\n"); + + /* test without buffer */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + status = pNtQueryEaFile(handle, &io, NULL, 0, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + + /* test with zero buffer */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + status = pNtQueryEaFile(handle, &io, buffer, 0, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + + /* test with very small buffer */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + memset(buffer, 0xcc, EA_BUFFER_SIZE); + buffer_len = 4; + status = pNtQueryEaFile(handle, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + for (i = 0; i < buffer_len && !buffer[i]; i++); + ok(i == buffer_len, "expected %u bytes filled with 0x00, got %u bytes\n", buffer_len, i); + ok(buffer[i] == 0xcc, "data at position %u overwritten\n", buffer[i]); + + /* test with very big buffer */ + U(io).Status = 0xdeadbeef; + io.Information = 0xdeadbeef; + memset(buffer, 0xcc, EA_BUFFER_SIZE); + buffer_len = EA_BUFFER_SIZE - 1; + status = pNtQueryEaFile(handle, &io, buffer, buffer_len, TRUE, NULL, 0, NULL, FALSE); + ok(status == STATUS_NO_EAS_ON_FILE, "expected STATUS_NO_EAS_ON_FILE, got %#x\n", status); + ok(U(io).Status == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", U(io).Status); + ok(io.Information == 0xdeadbeef, "expected 0xdeadbeef, got %#Ix\n", io.Information); + for (i = 0; i < buffer_len && !buffer[i]; i++); + ok(i == buffer_len, "expected %u bytes filled with 0x00, got %u bytes\n", buffer_len, i); + ok(buffer[i] == 0xcc, "data at position %u overwritten\n", buffer[i]); + + CloseHandle(handle); +#undef EA_BUFFER_SIZE +} + static void test_file_readonly_access(void) { static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; @@ -5281,6 +5362,7 @@ START_TEST(file) pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile"); pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile"); + pNtQueryEaFile = (void *)GetProcAddress(hntdll, "NtQueryEaFile"); test_read_write(); test_NtCreateFile(); @@ -5310,6 +5392,7 @@ START_TEST(file) test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl(); + test_query_ea(); test_flush_buffers_file(); test_mailslot_name(); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index da2119b28d3..50993a21732 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6676,9 +6676,20 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, BOOLEAN single_entry, void *list, ULONG list_len, ULONG *index, BOOLEAN restart ) { - FIXME( "(%p,%p,%p,%d,%d,%p,%d,%p,%d) stub\n", + int fd, needs_close; + NTSTATUS status; + + FIXME( "(%p,%p,%p,%d,%d,%p,%d,%p,%d) semi-stub\n", handle, io, buffer, length, single_entry, list, list_len, index, restart ); - return STATUS_ACCESS_DENIED; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (buffer && length) + memset( buffer, 0, length ); + + if (needs_close) close( fd ); + return STATUS_NO_EAS_ON_FILE; }

1 0

Alistair Leslie-Hughes : odbc: SQLGetInfoW allow NULL parameter InfoValue.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 87ce92d1a7c2e4ed3fd8d98b165cc23d9f0307d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/87ce92d1a7c2e4ed3fd8d98b165cc2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 24 17:01:35 2022 +1000 odbc: SQLGetInfoW allow NULL parameter InfoValue. MSDN states, a NULL InfoValue parameter will return as the length. unixODBC which we currently use, handles this scenario. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> (cherry picked from commit e8b7c1da6cc7de8374c02df126719844e4744bb5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..d60c2518736 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1041,12 +1041,6 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfo, &params ); TRACE("Returning %d\n", ret); return ret; @@ -2246,12 +2240,6 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfoW, &params ); TRACE("Returning %d\n", ret); return ret;

1 0

Huw Davies : nsi: Use the correct members for the error and discard counts.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 24c5f4f147e90ac0749396d493f4f825d0c24ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/24c5f4f147e90ac0749396d493f4f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 14:10:54 2022 -0500 nsi: Use the correct members for the error and discard counts. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53234 (cherry picked from commit 673da9cdecd8fed165bc467ece59c7d0ff24a403) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/nsi.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wine/nsi.h b/include/wine/nsi.h index b8e59c7bf54..916a92a549c 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -54,11 +54,9 @@ struct nsi_ndis_ifinfo_dynamic DWORD mtu; ULONG64 xmit_speed; ULONG64 rcv_speed; - ULONG64 in_errors; + ULONG64 unk2[3]; ULONG64 in_discards; - ULONG64 out_errors; - ULONG64 out_discards; - ULONG64 unk2; + ULONG64 in_errors; ULONG64 in_octets; ULONG64 in_ucast_pkts; ULONG64 in_mcast_pkts; @@ -67,7 +65,8 @@ struct nsi_ndis_ifinfo_dynamic ULONG64 out_ucast_pkts; ULONG64 out_mcast_pkts; ULONG64 out_bcast_pkts; - ULONG64 unk3[2]; + ULONG64 out_errors; + ULONG64 out_discards; ULONG64 in_ucast_octs; ULONG64 in_mcast_octs; ULONG64 in_bcast_octs;

1 0

David Kahurani : win32u: Use allocator mechanism to allocate DC attributes.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9e9152843bba79a62fc4ed99f84a5b0bd5d49fef URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9152843bba79a62fc4ed99f84a5b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Sep 19 10:58:45 2022 +0300 win32u: Use allocator mechanism to allocate DC attributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53645 (cherry picked from commit 903c91fc60aa7f3da127ab81e2c27844eec9bcdd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/win32u/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 3aae73779e9..ca0b08fa2d3 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -548,7 +548,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) release_dc_ptr( dc ); return 0; } - if (!(newdc->attr = calloc( 1, sizeof(*newdc->attr) ))) + if (!(newdc->attr = alloc_dc_attr() )) { free( newdc ); release_dc_ptr( dc );

1 0

Zebediah Figura : ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE).
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: bdc1b882cbd08703720b1ecd91e280834f282c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc1b882cbd08703720b1ecd91e280… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 19 23:31:43 2022 -0500 ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53706 (cherry picked from commit d0f34c232abb07c0e679d92917254c2f05b001c1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..da2119b28d3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5707,6 +5707,11 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n", handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); + /* some broken applications call this frequently with INVALID_HANDLE_VALUE, + * and run slowly if we make a server call every time */ + if (HandleToLong( handle ) == ~0) + return STATUS_INVALID_HANDLE; + switch (device) { case FILE_DEVICE_BEEP:

1 0

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: cd812463691120d558edbef724b0d56b347df2c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd812463691120d558edbef724b0d5… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Sep 2 23:16:25 2022 +0200 msvcp140: Add _ExceptionHolder::ReportUnhandledError stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> (cherry picked from commit 3f47b478b4508a2010bbe4a8a365abe70e929707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/details.c | 9 +++++++++ dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/details.c | 9 +++++++++ dlls/msvcp_win/msvcp_win.spec | 6 +++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 13a2fbbca96..517c3fdb39a 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1091,6 +1091,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) return FALSE; } +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} + __ASM_BLOCK_BEGIN(concurrency_details_vtables) __ASM_VTABLE(_Concurrent_queue_base_v4, VTABLE_ADD_FUNC(_Concurrent_queue_base_v4_dummy) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 3945a4bfbd4..ee75a8ad87f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index e3c3148a133..046a38a0785 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1105,6 +1105,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) FIXME("() stub\n"); return FALSE; } + +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} #endif __ASM_BLOCK_BEGIN(concurrency_details_vtables) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index c6ca765f158..60d2f816341 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() msvcp140.?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z

1 0

Paul Gofman : crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 9c6f810c2972f9e3d587a5e731afacdd6fd2b0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c6f810c2972f9e3d587a5e731afac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 20 15:47:54 2022 -0500 crypt32: Support CRYPT_STRING_HEX in CryptStringToBinary(). (cherry picked from commit 1120a1cb2951964f3b9f8467a0e34d3f2faf6bc2) Conflicts: dlls/crypt32/tests/base64.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/base64.c | 123 ++++++++++++++ dlls/crypt32/tests/base64.c | 386 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 505 insertions(+), 4 deletions(-)

1 0