March 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : urlmon/tests: Fix race condition in abort test.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7db96e3a5925946c2b36cfab9b71f3ed07246198 URL: https://gitlab.winehq.org/wine/wine/-/commit/7db96e3a5925946c2b36cfab9b71f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 17:48:59 2022 +0200 urlmon/tests: Fix race condition in abort test. The result can arrive before we have time to abort. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53268 (cherry picked from commit 44a81794dfc4e293f94654f2ef4dbfa0c5e81e95) Conflicts: dlls/urlmon/tests/protocol.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b997be7fa01..d202fd9275a 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1193,8 +1193,8 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR if(tested_protocol == FTP_TEST) ok(hrResult == E_PENDING || hrResult == S_OK, "hrResult = %08x, expected E_PENDING or S_OK\n", hrResult); else - ok(hrResult == expect_hrResult, "hrResult = %08x, expected: %08x\n", - hrResult, expect_hrResult); + ok(hrResult == expect_hrResult || (test_abort && hrResult == S_OK), /* result can come in before the abort */ + "hrResult = %08x, expected: %08x\n", hrResult, expect_hrResult); if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort || hrResult == INET_E_REDIRECT_FAILED) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else @@ -3331,7 +3331,8 @@ static void test_protocol_terminate(IInternetProtocol *protocol) ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 1, &cb); - ok(hres == (test_abort ? S_OK : S_FALSE), "Read failed: %08x\n", hres); + ok(hres == S_FALSE || (test_abort && hres == S_OK), /* result can come in before the abort */ + "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); ok(hres == S_OK, "Terminate failed: %08x\n", hres); @@ -3421,7 +3422,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym return; } - if(!direct_read && !test_abort && !bind_from_cache) + if(!direct_read && !bind_from_cache) SET_EXPECT(ReportResult); if(flags & TEST_DISABLEAUTOREDIRECT)

1 0

Mihail Ivanchev : include: Add prototype for ReOpenFile().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7ef77024d20d92a2204ae6ccdbcf8133ca52b7c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ef77024d20d92a2204ae6ccdbcf81… Author: Mihail Ivanchev <contact(a)ivanchev.net> Date: Sat Oct 22 08:18:57 2022 +0000 include: Add prototype for ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53821 (cherry picked from commit 10e7c824e0b2599f4707d30be2edfc0eb83cfba6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..11aef4c7c6b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2575,6 +2575,7 @@ WINBASEAPI BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_ WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *); +WINBASEAPI HANDLE WINAPI ReOpenFile(HANDLE,DWORD,DWORD,DWORD); WINADVAPI BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWORD *,DWORD *); WINADVAPI BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWORD *,DWORD *); #define ReadEventLog WINELIB_NAME_AW(ReadEventLog)

1 0

Alistair Leslie-Hughes : crypt32: Only report Unimplemented decoder when not found in external dll.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 2d871a6b1d8532784b881df4fa0b08dc67c80601 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d871a6b1d8532784b881df4fa0b08… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 28 12:22:30 2021 +1000 crypt32: Only report Unimplemented decoder when not found in external dll. Some applications spam this fixme. fixme:cryptasn:CRYPT_GetBuiltinDecoder Unsupported decoder for lpszStructType 1.3.6.1.4.1.311.2.1.4 This OID is supported in wintrust.dll which crypt32 uses, so this console fixme doesn't make sense. The fixme will only appear if no support for the requested decoder is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53800 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> (cherry picked from commit 42bd5ea4c4c4c42af872b5a6a12e6109fc3e2ddf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/decode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d4a13a55a1b..9f6a8ea9f6c 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6296,7 +6296,7 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeRsaPubKey_Bcrypt; break; default: - FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6353,8 +6353,6 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCTL; else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) decodeFunc = CRYPT_AsnDecodeObjectIdentifier; - else - FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); return decodeFunc; } @@ -6433,6 +6431,13 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, debugstr_a(lpszStructType)); decodeFunc = CRYPT_LoadDecoderExFunc(dwCertEncodingType, lpszStructType, &hFunc); + if (!decodeFunc) + { + if (IS_INTOID(lpszStructType)) + FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + else + FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); + } } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded,

1 0

Alexandre Julliard : shell32: Don't return an uninitialized pointer on error in enum_trash_items().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: ba4a8793889872c616f9989d8a70be563e998788 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba4a8793889872c616f9989d8a70be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 16:18:00 2022 +0200 shell32: Don't return an uninitialized pointer on error in enum_trash_items(). (cherry picked from commit 33c56be5ae1cf757c1aeda0e075d63cc924f683b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/recyclebin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 8cfc1042fe7..ffe12823e7a 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -392,6 +392,7 @@ static HRESULT enum_trash_items( LPITEMIDLIST **pidls, int *ret_count ) InitOnceExecuteOnce( &trash_dir_once, init_trash_dirs, NULL, NULL ); if (!trash_dir) return E_FAIL; + *pidls = NULL; file = heap_alloc( (lstrlenW(trash_dir) + lstrlenW(L"\\*") + 1) * sizeof(WCHAR) ); lstrcpyW( file, trash_dir ); lstrcatW( file, L"\\*" );

1 0

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