July 2023 - Wine-commits - list.winehq.org

Michael Stefaniuc : Release 8.0.2.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 0e34edfd8098552a3453f1de1987b81f95d2d9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e34edfd8098552a3453f1de1987b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 26 22:16:20 2023 +0200 Release 8.0.2. --- ANNOUNCE | 314 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 159 insertions(+), 176 deletions(-)

1 0

Zhiyi Zhang : findstr: Add basic functionality.
by Alexandre Julliard 19 Jul '23

19 Jul '23

1 0

Olivier F. R. Dierick : dxdiag: Ignore option /64bit on the commandline.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: d8b9460f17075b459d6737e990a4ccd6bb067426 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b9460f17075b459d6737e990a4cc… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Oct 6 19:59:25 2021 +0200 dxdiag: Ignore option /64bit on the commandline. The builtin dxdiag doesn't know about option /64bit and display an error dialog. Some games use that option internally on startup and the dialog is annoying. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49964 (cherry picked from commit 60ef0f86772559187c04098e4c3d8b4678062a1c) --- programs/dxdiag/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index f57eec99292..b6ea5306d06 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -159,6 +159,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info break; + case '6': + if (wcsnicmp(cmdline, L"64bit", 5)) + return FALSE; + cmdline += 5; + break; + case 'd': case 'D': if (wcsnicmp(cmdline, L"dontskip", 8))

1 0

Nikolay Sivov : mfplat: Implement MFCreatePathFromURL().
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 8d6a9890a94bfb46dcebcabe9ed2d37b0d2d0277 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d6a9890a94bfb46dcebcabe9ed2d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 8 14:38:43 2023 +0200 mfplat: Implement MFCreatePathFromURL(). (cherry picked from commit 32cec5e6282edf0496ef0e6bb231fdc125df283f) --- dlls/mfplat/main.c | 25 +++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e1315de125a..7027b4f9516 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9464,3 +9464,28 @@ LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG return sign ? -(LONGLONG)ret : ret; #undef LLOVERFLOW } + +/*********************************************************************** + * MFCreatePathFromURL (mfplat.@) + */ +HRESULT WINAPI MFCreatePathFromURL(const WCHAR *url, WCHAR **ret_path) +{ + WCHAR path[MAX_PATH]; + DWORD length; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_w(url), ret_path); + + if (!url || !ret_path) + return E_POINTER; + + length = ARRAY_SIZE(path); + if (FAILED(hr = PathCreateFromUrlW(url, path, &length, 0))) + return hr; + + if (!(*ret_path = CoTaskMemAlloc((length + 1) * sizeof(*path)))) + return E_OUTOFMEMORY; + + memcpy(*ret_path, path, (length + 1) * sizeof(*path)); + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d9c8136cdd6..2f18d6380d6 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -62,7 +62,7 @@ @ stub MFCreateMediaTypeFromRepresentation @ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream -@ stub MFCreatePathFromURL +@ stdcall MFCreatePathFromURL(wstr ptr) @ stdcall MFCreatePresentationDescriptor(long ptr ptr) @ stdcall MFCreateSample(ptr) @ stub MFCreateSocket diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1f61e25d00..7c7907f8c54 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -263,6 +263,7 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreatePathFromURL)(const WCHAR *url, WCHAR **path); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); @@ -1123,6 +1124,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); + X(MFCreatePathFromURL); X(MFCreateTrackedSample); X(MFCreateTransformActivate); X(MFCreateVideoMediaTypeFromSubtype); @@ -8539,6 +8541,131 @@ static void test_MFInitMediaTypeFromAMMediaType(void) IMFMediaType_Release(media_type); } +static void test_MFCreatePathFromURL(void) +{ + static const struct + { + const WCHAR *url; + const WCHAR *path; + HRESULT hr; + } + tests[] = + { + /* 0 leading slash */ + { L"file:c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:cx|/foo/bar", L"cx|\\foo\\bar" }, + { L"file:c:foo/bar", L"c:foo\\bar" }, + { L"file:c|foo/bar", L"c:foo\\bar" }, + { L"file:c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:foo%20ba%2fr", L"foo ba/r" }, + { L"file:foo/bar/", L"foo\\bar\\" }, + + /* 1 leading (back)slash */ + { L"file:/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:/c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:/cx|/foo/bar", L"\\cx|\\foo\\bar" }, + { L"file:/c:foo/bar", L"c:foo\\bar" }, + { L"file:/c|foo/bar", L"c:foo\\bar" }, + { L"file:/c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:/foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:/foo/bar/", L"\\foo\\bar\\" }, + + /* 2 leading (back)slashes */ + { L"file://c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://c:/d:/foo/bar", L"c:\\d:\\foo\\bar" }, + { L"file://c|/d|/foo/bar", L"c:\\d|\\foo\\bar" }, + { L"file://cx|/foo/bar", L"\\\\cx|\\foo\\bar" }, + { L"file://c:foo/bar", L"c:foo\\bar" }, + { L"file://c|foo/bar", L"c:foo\\bar" }, + { L"file://c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file://c%3a/foo/../bar", L"\\\\c:\\foo\\..\\bar" }, + { L"file://c%7c/foo/../bar", L"\\\\c|\\foo\\..\\bar" }, + { L"file://foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://localhost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://localhost/c:/foo%20ba%5Cr", L"c:\\foo ba\\r" }, + { L"file://LocalHost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\\\localhost\\c:\\foo\\bar", L"c:\\foo\\bar" }, + { L"file://incomplete", L"\\\\incomplete" }, + + /* 3 leading (back)slashes (omitting hostname) */ + { L"file:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"File:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:///c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:///foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:///foo/bar/", L"\\foo\\bar\\" }, + { L"file:///localhost/c:/foo/bar", L"\\localhost\\c:\\foo\\bar" }, + + /* 4 leading (back)slashes */ + { L"file:////c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:////c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file:////foo%20ba%2fr", L"\\\\foo%20ba%2fr" }, + + /* 5 and more leading (back)slashes */ + { L"file://///c:/foo/bar", L"\\\\c:\\foo\\bar" }, + { L"file://///c:/foo%20ba%2fr", L"\\\\c:\\foo ba/r" }, + { L"file://///foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://////c:/foo/bar", L"\\\\c:\\foo\\bar" }, + + /* Leading (back)slashes cannot be escaped */ + { L"file:%2f%2flocalhost%2fc:/foo/bar", L"//localhost/c:\\foo\\bar" }, + { L"file:%5C%5Clocalhost%5Cc:/foo/bar", L"\\\\localhost\\c:\\foo\\bar" }, + + /* Hostname handling */ + { L"file://l%6fcalhost/c:/foo/bar", L"\\\\localhostc:\\foo\\bar" }, + { L"file://localhost:80/c:/foo/bar", L"\\\\localhost:80c:\\foo\\bar" }, + { L"file://host/c:/foo/bar", L"\\\\hostc:\\foo\\bar" }, + { L"file://host//c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/\\c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/c:foo/bar", L"\\\\hostc:foo\\bar" }, + { L"file://host/foo/bar", L"\\\\host\\foo\\bar" }, + { L"file:\\\\host\\c:\\foo\\bar", L"\\\\hostc:\\foo\\bar" }, + { L"file:\\\\host\\ca\\foo\\bar", L"\\\\host\\ca\\foo\\bar" }, + { L"file:\\\\host\\c|\\foo\\bar", L"\\\\hostc|\\foo\\bar" }, + { L"file:\\%5Chost\\c:\\foo\\bar", L"\\\\host\\c:\\foo\\bar" }, + { L"file:\\\\host\\cx:\\foo\\bar", L"\\\\host\\cx:\\foo\\bar" }, + { L"file:///host/c:/foo/bar", L"\\host\\c:\\foo\\bar" }, + + /* Not file URLs */ + { L"c:\\foo\\bar", NULL, E_INVALIDARG }, + { L"foo/bar", NULL, E_INVALIDARG }, + { L"http://foo/bar", NULL, E_INVALIDARG }, + }; + unsigned int i; + WCHAR *path; + HRESULT hr; + + if (!pMFCreatePathFromURL) + { + win_skip("MFCreatePathFromURL() is not available.\n"); + return; + } + + hr = pMFCreatePathFromURL(NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + path = (void *)0xdeadbeef; + hr = pMFCreatePathFromURL(NULL, &path); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(path == (void *)0xdeadbeef, "Unexpected pointer %p.\n", path); + + hr = pMFCreatePathFromURL(L"file://foo", NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = pMFCreatePathFromURL(tests[i].url, &path); + ok(hr == tests[i].hr, "Unexpected hr %#lx, expected %#lx.\n", hr, tests[i].hr); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(path, tests[i].path), "Unexpected path %s, expected %s.\n", + debugstr_w(path), debugstr_w(tests[i].path)); + CoTaskMemFree(path); + } + } +} + START_TEST(mfplat) { char **argv; @@ -8622,6 +8749,7 @@ START_TEST(mfplat) test_MFCreateVideoMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromAMMediaType(); + test_MFCreatePathFromURL(); CoUninitialize(); }

1 0

Zebediah Figura : ntdll: Make fd_set_file_info() static.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: dedb9185d829d01b944dc8b432bf8ee78550bc81 URL: https://gitlab.winehq.org/wine/wine/-/commit/dedb9185d829d01b944dc8b432bf8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:56:02 2023 -0600 ntdll: Make fd_set_file_info() static. (cherry picked from commit 4827ae13928259b22e48765be3f14aef5bc26146) --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 957d9f3b801..981b0c57b35 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1618,7 +1618,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr ) { struct stat st;

1 0

Torge Matthies : ntdll/tests: Add test for file attributes of files with names beginning with a dot.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 316138ec2ba03c9c86e2c440bd687f5e7438b374 URL: https://gitlab.winehq.org/wine/wine/-/commit/316138ec2ba03c9c86e2c440bd687f… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll/tests: Add test for file attributes of files with names beginning with a dot. (cherry picked from commit 4ad7575884797335430673c47113c9ed43e09fba) --- dlls/ntdll/tests/file.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6186afdfb63..beaa4734931 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4051,6 +4051,97 @@ static void test_file_attribute_tag_information(void) CloseHandle( h ); } +static void rename_file( HANDLE h, const WCHAR *filename ) +{ + FILE_RENAME_INFORMATION *fri; + UNICODE_STRING ntpath; + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOLEAN ret; + ULONG size; + + ret = pRtlDosPathNameToNtPathName_U( filename, &ntpath, NULL, NULL ); + ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); + + size = offsetof( FILE_RENAME_INFORMATION, FileName ) + ntpath.Length; + fri = HeapAlloc( GetProcessHeap(), 0, size ); + ok( fri != NULL, "HeapAlloc failed\n" ); + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; + fri->FileNameLength = ntpath.Length; + memcpy( fri->FileName, ntpath.Buffer, ntpath.Length ); + pRtlFreeUnicodeString( &ntpath ); + + status = pNtSetInformationFile( h, &io, fri, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, fri ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); +} + +static void test_dotfile_file_attributes(void) +{ + char temppath[MAX_PATH], filename[MAX_PATH]; + WCHAR temppathW[MAX_PATH], filenameW[MAX_PATH]; + FILE_BASIC_INFORMATION info = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + DWORD attrs; + HANDLE h; + + GetTempPathA( MAX_PATH, temppath ); + GetTempFileNameA( temppath, ".foo", 0, filename ); + h = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + status = nt_get_file_attrs(filename, &attrs); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + info.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + status = pNtSetInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + + status = nt_get_file_attrs(filename, &attrs); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( attrs & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", attrs ); + todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( info.FileAttributes & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", info.FileAttributes ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); + + GetTempPathW( MAX_PATH, temppathW ); + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + h = CreateFileW( filenameW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + GetTempFileNameW( temppathW, L".foo", 0, filenameW ); + winetest_push_context("foo -> .foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + winetest_push_context(".foo -> foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); +} + static void test_file_mode(void) { UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; @@ -5499,6 +5590,7 @@ START_TEST(file) test_file_id_information(); test_file_access_information(); test_file_attribute_tag_information(); + test_dotfile_file_attributes(); test_file_mode(); test_file_readonly_access(); test_query_volume_information_file();

1 0

Torge Matthies : ntdll: Handle hidden file names inside get_file_info instead of after it.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 1d600da399611613f7e26353724827498e052bde URL: https://gitlab.winehq.org/wine/wine/-/commit/1d600da399611613f7e26353724827… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Handle hidden file names inside get_file_info instead of after it. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit a8b6966a91453f5c6147dc2c74a337d016bbd53a) --- dlls/ntdll/unix/file.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 981b0c57b35..de22250ea60 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1292,18 +1292,22 @@ static BOOLEAN get_dir_case_sensitivity( const char *dir ) /*********************************************************************** * is_hidden_file * - * Check if the specified file should be hidden based on its name and the show dot files option. + * Check if the specified file should be hidden based on its unix path and the show dot files option. */ -static BOOL is_hidden_file( const UNICODE_STRING *name ) +static BOOL is_hidden_file( const char *name ) { - WCHAR *p, *end; + const char *p; if (show_dot_files) return FALSE; - end = p = name->Buffer + name->Length/sizeof(WCHAR); - while (p > name->Buffer && p[-1] == '\\') p--; - while (p > name->Buffer && p[-1] != '\\') p--; - return (p < end && *p == '.'); + p = name + strlen( name ); + while (p > name && p[-1] == '/') p--; + while (p > name && p[-1] != '/') p--; + if (*p++ != '.') return FALSE; + if (!*p || *p == '/') return FALSE; /* "." directory */ + if (*p++ != '.') return FALSE; + if (!*p || *p == '/') return FALSE; /* ".." directory */ + return TRUE; } @@ -1677,6 +1681,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) } *attr |= get_file_attributes( st ); + if (is_hidden_file( path )) + *attr |= FILE_ATTRIBUTE_HIDDEN; + attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); @@ -2252,11 +2259,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I if (class != FileNamesInformation) { if (st.st_dev != dir_data->id.dev) st.st_ino = 0; /* ignore inode if on a different device */ - - if (!show_dot_files && names->long_name[0] == '.' && names->long_name[1] && - (names->long_name[1] != '.' || names->long_name[2])) - attributes |= FILE_ATTRIBUTE_HIDDEN; - fill_file_info( &st, attributes, info, class ); } @@ -4213,7 +4215,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, info->AllocationSize = std.AllocationSize; info->EndOfFile = std.EndOfFile; info->FileAttributes = basic.FileAttributes; - if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN; } free( unix_name ); } @@ -4244,10 +4245,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) status = STATUS_INVALID_INFO_CLASS; else - { status = fill_file_info( &st, attributes, info, FileBasicInformation ); - if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN; - } free( unix_name ); } else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), status );

1 0

Torge Matthies : ntdll: Only infer hidden attribute from file name if xattr is not present.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 773b9206fec529ff06717dd6652278cce68466ca URL: https://gitlab.winehq.org/wine/wine/-/commit/773b9206fec529ff06717dd6652278… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Only infer hidden attribute from file name if xattr is not present. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit d433986924c142ab807363b0146160b2b6986a42) --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index beaa4734931..cdd924a7226 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4107,7 +4107,7 @@ static void test_dotfile_file_attributes(void) status = nt_get_file_attrs(filename, &attrs); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); ok( attrs & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", attrs ); - todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index de22250ea60..02e1ac805b8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1681,14 +1681,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) } *attr |= get_file_attributes( st ); - if (is_hidden_file( path )) - *attr |= FILE_ATTRIBUTE_HIDDEN; - attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); else { + if (is_hidden_file( path )) + *attr |= FILE_ATTRIBUTE_HIDDEN; if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret;

1 0

Torge Matthies : ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: f8f3633074ede2ce9e51173fda39999da8b2071e URL: https://gitlab.winehq.org/wine/wine/-/commit/f8f3633074ede2ce9e51173fda3999… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match. And make sure it doesn't get deleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53826 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> (cherry picked from commit 824547805559ee4993b8113436161638f3cd7990) --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cdd924a7226..b96b2e5b072 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4094,7 +4094,7 @@ static void test_dotfile_file_attributes(void) status = nt_get_file_attrs(filename, &attrs); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); - todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 02e1ac805b8..9bd73fa6c4b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1604,11 +1604,11 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON } -static int fd_set_dos_attrib( int fd, UINT attr ) +static int fd_set_dos_attrib( int fd, UINT attr, BOOL force_set ) { /* we only store the HIDDEN and SYSTEM attributes */ attr &= XATTR_ATTRIBS_MASK; - if (attr != 0) + if (force_set || attr != 0) { /* encode the attributes in Samba 3 ASCII format. Samba 4 has extended * this format with more features, but retains compatibility with the @@ -1622,7 +1622,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -static NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr, BOOL force_set_xattr ) { struct stat st; @@ -1641,7 +1641,11 @@ static NTSTATUS fd_set_file_info( int fd, UINT attr ) } if (fchmod( fd, st.st_mode ) == -1) return errno_to_status( errno ); - if (fd_set_dos_attrib( fd, attr ) == -1 && errno != ENOTSUP) + /* if the file has multiple names, we can't be sure that it is safe to not + set the extended attribute, since any of the names could start with a dot */ + force_set_xattr = force_set_xattr || st.st_nlink > 1; + + if (fd_set_dos_attrib( fd, attr, force_set_xattr ) == -1 && errno != ENOTSUP) WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); @@ -3967,6 +3971,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU OBJECT_ATTRIBUTES new_attr; UNICODE_STRING nt_name; char *unix_name; + BOOL name_hidden = FALSE; BOOL created = FALSE; unsigned int status; @@ -4009,6 +4014,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU if (status == STATUS_SUCCESS) { + name_hidden = is_hidden_file( unix_name ); status = open_unix_file( handle, unix_name, access, &new_attr, attributes, sharing, disposition, options, ea_buffer, ea_length ); free( unix_name ); @@ -4036,14 +4042,15 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU break; } - if (io->Information == FILE_CREATED && (attributes & XATTR_ATTRIBS_MASK)) + if (io->Information == FILE_CREATED && + ((attributes & XATTR_ATTRIBS_MASK) || name_hidden)) { int fd, needs_close; /* set any DOS extended attributes */ if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) { - if (fd_set_dos_attrib( fd, attributes ) == -1 && errno != ENOTSUP) + if (fd_set_dos_attrib( fd, attributes, TRUE ) == -1 && errno != ENOTSUP) WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)", errno, strerror( errno ) ); if (needs_close) close( fd ); @@ -4560,20 +4567,25 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { const FILE_BASIC_INFORMATION *info = ptr; LARGE_INTEGER mtime, atime; + char *unix_name; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status = status; + if (server_get_unix_name( handle, &unix_name )) unix_name = NULL; + mtime.QuadPart = info->LastWriteTime.QuadPart == -1 ? 0 : info->LastWriteTime.QuadPart; atime.QuadPart = info->LastAccessTime.QuadPart == -1 ? 0 : info->LastAccessTime.QuadPart; if (atime.QuadPart || mtime.QuadPart) status = set_file_times( fd, &mtime, &atime ); - if (status == STATUS_SUCCESS && info->FileAttributes) - status = fd_set_file_info( fd, info->FileAttributes ); + if (status == STATUS_SUCCESS) + status = fd_set_file_info( fd, info->FileAttributes, + unix_name && is_hidden_file( unix_name )); if (needs_close) close( fd ); + free( unix_name ); } else status = STATUS_INVALID_PARAMETER_3; break;

1 0

Alexandre Julliard : ntdll: Fix typo in the check for hidden files.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 652cb9c585dfddc6b821e26074958f887bb2215b URL: https://gitlab.winehq.org/wine/wine/-/commit/652cb9c585dfddc6b821e26074958f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 16 08:00:22 2023 -0500 ntdll: Fix typo in the check for hidden files. My fault, improperly tested last-minute fixup to the original patch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54939 (cherry picked from commit 428c4afeb073246858aaf5217e122cad88f5a8d8) --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9bd73fa6c4b..a6d332ec4e2 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1305,7 +1305,7 @@ static BOOL is_hidden_file( const char *name ) while (p > name && p[-1] != '/') p--; if (*p++ != '.') return FALSE; if (!*p || *p == '/') return FALSE; /* "." directory */ - if (*p++ != '.') return FALSE; + if (*p++ != '.') return TRUE; if (!*p || *p == '/') return FALSE; /* ".." directory */ return TRUE; }

1 0