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

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

I left a few comments on the tests. Otherwise, I quite like the patch series. Force-setting the extended attributes on visible-but-starting-with-a-dot files seems like a good compromise to fix the bug at hand without requiring a ton of attribute setting and I couldn't think of any better solution. This won't fix the case of Wine-created dot files when the show_dot_files option is enabled if the user then disables the option, which again seems like a good compromise. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28247

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > + > + 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" ); > + if (h == INVALID_HANDLE_VALUE) return; > + > + GetTempFileNameW( temppathW, L".foo", 0, filenameW ); > + if (!rename_file( h, filenameW )) return; ```suggestion:-0+0 winetest_push_context("foo -> .foo"); rename_file( h, filenameW ); winetest_pop_context(); ``` Or something like that. Similarly for the other rename_file() call below. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28246

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > + if (!ret) return FALSE; > + > + size = offsetof( FILE_RENAME_INFORMATION, FileName ) + ntpath.Length; > + fri = HeapAlloc( GetProcessHeap(), 0, size ); > + lok( fri != NULL, "HeapAlloc failed\n" ); > + if (!fri) return FALSE; > + 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 ); > + lok( status == STATUS_SUCCESS, "got %#lx\n", status ); > + return status == STATUS_SUCCESS; Let's get rid of the return and make the function void. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28245

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > + 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" ); > + if (h == INVALID_HANDLE_VALUE) return; Similarly here, better to get rid of the return entirely. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28244

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > } > > +#define lok ok_(__FILE__, line) > +#define rename_file(h,f) rename_file_(__LINE__,(h),(f)) > +static BOOL rename_file_( int line, 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 ); > + lok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); > + if (!ret) return FALSE; Please get rid of the ok() and if() {}, we can just assume that the RtlDosPathNameToNtPathName_U() call works correctly (i.e. if it fails we have bigger problems and arguably crashing and burning is better than reporting a failure and silently skipping the test). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28242

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > +{ > + FILE_RENAME_INFORMATION *fri; > + UNICODE_STRING ntpath; > + IO_STATUS_BLOCK io; > + NTSTATUS status; > + BOOLEAN ret; > + ULONG size; > + > + ret = pRtlDosPathNameToNtPathName_U( filename, &ntpath, NULL, NULL ); > + lok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); > + if (!ret) return FALSE; > + > + size = offsetof( FILE_RENAME_INFORMATION, FileName ) + ntpath.Length; > + fri = HeapAlloc( GetProcessHeap(), 0, size ); > + lok( fri != NULL, "HeapAlloc failed\n" ); > + if (!fri) return FALSE; Same here for this HeapAlloc() call with very small size. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28243

1 0

Re: [PATCH v21 0/6] MR1148: ntdll: Mark created files beginning with a dot as not hidden.
by Matteo Bruni (＠Mystral) 28 Mar '23

28 Mar '23

Matteo Bruni (@Mystral) commented about dlls/ntdll/tests/file.c: > CloseHandle( h ); > } > > +#define lok ok_(__FILE__, line) > +#define rename_file(h,f) rename_file_(__LINE__,(h),(f)) > +static BOOL rename_file_( int line, HANDLE h, const WCHAR *filename ) I'd avoid these line shenanigans, we now have test contexts to disambiguate ok() calls from different tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1148#note_28241

1 0

[PATCH 0/5] MR2524: msvcrt: _StructuredTaskCollection cancelling
by Torge Matthies (＠tmatthies) 28 Mar '23

28 Mar '23

Some refactoring + implementation of `_StructuredTaskCollection::_Cancel` and `_StructuredTaskCollection::_IsCanceling`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2524

2 6

[PATCH v2 0/8] MR1979: msvcrt: Remaining implementations and stubs for cm3
by Torge Matthies (＠tmatthies) 28 Mar '23

28 Mar '23

Based on !2524. This adds the remaining stubs needed for Crazy Machines 3 to work and decode preview images correctly in online mode. -- v2: msvcr110: Add _Context::_IsSynchronouslyBlocked stub. msvcr110: Add _Cancellation_beacon::_Cancellation_beacon_dtor stub. msvcr110: Add _Cancellation_beacon::_Cancellation_beacon_ctor stub. msvcr100: Implement _StructuredTaskCollection::_IsCanceling. msvcr100: Implement _StructuredTaskCollection canceling. msvcr100: Use enum for _StructuredTaskCollection status bits. msvcr100: Use enum for _StructuredTaskCollection return value. msvcr100: Only wake task collection waiters when finished >= count. https://gitlab.winehq.org/wine/wine/-/merge_requests/1979

2 8

[PATCH 0/5] MR1979: msvcrt: Remaining implementations and stubs for cm3
by Torge Matthies (＠tmatthies) 28 Mar '23

28 Mar '23

This adds the remaining `_StructuredTaskCollection` functions and other stubs needed for Crazy Machines 3 to work and decode preview images correctly in online mode. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1979

3 15