June 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Add some tests for trailing slashes in paths.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 1a00dfe408b7bffeb9b1c4103c4eee1922d489f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a00dfe408b7bffeb9b1c410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 28 12:50:20 2022 +0200 ntdll/tests: Add some tests for trailing slashes in paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 15 +++++++++++++++ dlls/ntdll/tests/path.c | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 106413a83fc..b0b8eee1f2f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4251,6 +4251,21 @@ static void test_NtCreateFile(void) pRtlFreeUnicodeString( &nameW ); SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); + + wcscat( path, L"\\" ); + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + + status = pNtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, + 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, 0, NULL, 0); + todo_wine + ok( status == STATUS_OBJECT_NAME_INVALID, "failed %s %lx\n", debugstr_w(nameW.Buffer), status ); + if (!status) DeleteFileW( path ); + status = pNtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, + 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, + FILE_DIRECTORY_FILE, NULL, 0); + todo_wine + ok( !status, "failed %s %lx\n", debugstr_w(nameW.Buffer), status ); + if (!status) RemoveDirectoryW( path ); } static void test_read_write(void) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 190c431ff79..0931d61450d 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -648,8 +648,14 @@ static void test_nt_names(void) { NULL, L"/??\\C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_SYNTAX_BAD }, { NULL, L"\\??" L"/C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:/windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"\\??\\C:\\windows\\system32\\", STATUS_FILE_IS_A_DIRECTORY }, + { NULL, L"\\??\\C:\\windows\\SyStEm32\\", STATUS_FILE_IS_A_DIRECTORY }, + { NULL, L"\\??\\C:\\windows\\system32\\\\", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\windows\\system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { NULL, L"\\??\\C:\\windows\\sys\001", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", NULL, STATUS_SUCCESS }, @@ -669,8 +675,13 @@ static void test_nt_names(void) { L"\\??\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\", STATUS_FILE_IS_A_DIRECTORY }, + { L"\\??\\C:\\windows\\", L"SyStEm32\\", STATUS_FILE_IS_A_DIRECTORY }, + { L"\\??\\C:\\windows\\", L"system32\\\\", STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\windows\\", L"system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { L"\\??\\C:\\windows\\", L"\\system32\\kernel32.dll", STATUS_INVALID_PARAMETER }, { L"\\??\\C:\\windows\\", L"/system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND },

1 0

Giovanni Mascellani : mfplat/buffer: Fix the image copy function for IMC2/IMC4 buffers with odd height.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: fcb8edee6bcd0652cb43e1f59d967a59ba037940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb8edee6bcd0652cb43e1f5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:48:05 2022 +0200 mfplat/buffer: Fix the image copy function for IMC2/IMC4 buffers with odd height. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 3 +-- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 39407ccc9e2..a7ba306223d 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -100,8 +100,7 @@ static void copy_image_imc1(BYTE *dest, LONG dest_stride, const BYTE *src, LONG static void copy_image_imc2(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) { - MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines / 2); - MFCopyImage(dest + dest_stride / 2, dest_stride, src + src_stride / 2, src_stride, width / 2, lines / 2); + MFCopyImage(dest, dest_stride / 2, src, src_stride / 2, width / 2, lines); } static inline struct buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f09ae368ccc..48f7a444add 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6073,7 +6073,6 @@ static void test_MFCreate2DMediaBuffer(void) case MAKEFOURCC('I','M','C','4'): for (j = 0; j < ptr->height; j++) for (k = 0; k < stride / 2; k++) - todo_wine_if(ptr->height % 2 == 1 && j >= 2) ok(data[j * (pitch / 2) + k] == (((j + ptr->height) % 16) << 4) + (k % 16), "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", data[j * (pitch / 2) + k], (((j + ptr->height) % 16) << 4) + (k % 16), i, j + ptr->height, k);

1 0

Alexandre Julliard : ntdll: Fix returned status code for paths with a trailing slash.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 3af025879583dff92540e29a92031a1078296484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af025879583dff92540e29a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 28 13:16:51 2022 +0200 ntdll: Fix returned status code for paths with a trailing slash. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 25 ++++--------------------- dlls/ntdll/tests/file.c | 5 +---- dlls/ntdll/tests/path.c | 11 +++++------ dlls/ntdll/unix/file.c | 7 +++++-- dlls/ucrtbase/tests/misc.c | 2 +- server/fd.c | 6 +++++- 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index bd8d8c91b2f..b29e2c3dc4e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -432,27 +432,10 @@ static void test__lcreat( void ) ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) ); filehandle=_lcreat (slashname, 0); /* illegal name */ - if (HFILE_ERROR==filehandle) { - err=GetLastError (); - ok (err==ERROR_INVALID_NAME || err==ERROR_PATH_NOT_FOUND, - "creating file \"%s\" failed with error %d\n", slashname, err); - } else { /* only NT succeeds */ - _lclose(filehandle); - find=FindFirstFileA (slashname, &search_results); - if (INVALID_HANDLE_VALUE!=find) - { - ret = FindClose (find); - ok (0 != ret, "FindClose complains (%ld)\n", GetLastError ()); - slashname[strlen(slashname)-1]=0; - ok (!strcmp (slashname, search_results.cFileName), - "found unexpected name \"%s\"\n", search_results.cFileName); - ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes, - "attributes of file \"%s\" are 0x%04lx\n", search_results.cFileName, - search_results.dwFileAttributes); - } - ret = DeleteFileA( slashname ); - ok( ret, "DeleteFile failed (%ld)\n", GetLastError( ) ); - } + ok( filehandle == HFILE_ERROR, "succeeded\n" ); + err=GetLastError (); + ok (err==ERROR_INVALID_NAME || err==ERROR_PATH_NOT_FOUND, + "creating file \"%s\" failed with error %d\n", slashname, err); filehandle=_lcreat (filename, 8); /* illegal attribute */ if (HFILE_ERROR==filehandle) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f8ef38f38c2..065a9251c2a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4255,15 +4255,12 @@ static void test_NtCreateFile(void) status = pNtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, 0, NULL, 0); - todo_wine ok( status == STATUS_OBJECT_NAME_INVALID, "failed %s %lx\n", debugstr_w(nameW.Buffer), status ); - if (!status) DeleteFileW( path ); status = pNtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_DIRECTORY_FILE, NULL, 0); - todo_wine ok( !status, "failed %s %lx\n", debugstr_w(nameW.Buffer), status ); - if (!status) RemoveDirectoryW( path ); + RemoveDirectoryW( path ); } static void test_read_write(void) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index d5d6e9c217a..4732f6a6aa8 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -627,7 +627,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) static void test_nt_names(void) { - static const struct { const WCHAR *root, *name; NTSTATUS expect, broken; BOOL todo; } tests[] = + static const struct { const WCHAR *root, *name; NTSTATUS expect, broken; } tests[] = { { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS }, { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, @@ -652,9 +652,9 @@ static void test_nt_names(void) { NULL, L"\\??\\C:\\windows\\SyStEm32\\", STATUS_FILE_IS_A_DIRECTORY }, { NULL, L"\\??\\C:\\windows\\system32\\\\", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, - { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\sys\001", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\", NULL, STATUS_OBJECT_NAME_INVALID }, @@ -678,9 +678,9 @@ static void test_nt_names(void) { L"\\??\\C:\\windows\\", L"SyStEm32\\", STATUS_FILE_IS_A_DIRECTORY }, { L"\\??\\C:\\windows\\", L"system32\\\\", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, - { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"\\system32\\kernel32.dll", STATUS_INVALID_PARAMETER }, { L"\\??\\C:\\windows\\", L"/system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, @@ -720,7 +720,6 @@ static void test_nt_names(void) } if (attr.RootDirectory) NtClose( attr.RootDirectory ); if (handle) NtClose( handle ); - todo_wine_if( tests[i].todo ) ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 4873f7f093c..e09e8cafc82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3187,7 +3187,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer /* grow the buffer if needed */ - if (unix_len - pos < MAX_DIR_ENTRY_LEN + 2) + if (unix_len - pos < MAX_DIR_ENTRY_LEN + 3) { char *new_name; unix_len += 2 * MAX_DIR_ENTRY_LEN; @@ -3208,7 +3208,9 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer if (ret > 0 && ret <= MAX_DIR_ENTRY_LEN) { unix_name[pos] = '/'; - unix_name[pos + 1 + ret] = 0; + pos += ret + 1; + if (end < next) unix_name[pos++] = '/'; + unix_name[pos] = 0; status = STATUS_NO_SUCH_FILE; break; } @@ -3218,6 +3220,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { status = STATUS_OBJECT_NAME_COLLISION; } + if (end < next) strcat( unix_name, "/" ); } else if (status == STATUS_OBJECT_NAME_NOT_FOUND) status = STATUS_OBJECT_PATH_NOT_FOUND; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9cc50d85d78..069de0787b7 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1309,7 +1309,7 @@ static void test__stat32(void) ok(!ret, "_stat32('%s') returned %d\n", path, ret); strcat(path, "\\"); ret = _stat32(path, &buf); - todo_wine ok(ret, "_stat32('%s') returned %d\n", path, ret); + ok(ret, "_stat32('%s') returned %d\n", path, ret); close(fd); remove(path); } diff --git a/server/fd.c b/server/fd.c index 1b4b98b0e76..eaebe044f37 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1959,7 +1959,11 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam if (fd->unix_fd == -1) { - file_set_error(); + /* check for trailing slash on file path */ + if ((errno == ENOENT || errno == ENOTDIR) && name[strlen(name) - 1] == '/') + set_error( STATUS_OBJECT_NAME_INVALID ); + else + file_set_error(); goto error; } }

1 0

Alexandre Julliard : cabinet: Make sure the cabinet file name doesn't end with a backslash.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: cdeaf7c87f2d87e638b397552e6cca36ab1ccc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdeaf7c87f2d87e638b39755… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 28 13:20:05 2022 +0200 cabinet: Make sure the cabinet file name doesn't end with a backslash. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 7e2e6b8fdde..aae71d0e2a5 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2055,6 +2055,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state } if (filenamelen) strcat(fullpath, cab->mii.nextname); + else if (fullpath[0]) + fullpath[strlen(fullpath)-1] = 0; /* remove trailing backslash */ TRACE("full cab path/file name: %s\n", debugstr_a(fullpath));

1 0

Alexandre Julliard : ntdll: Fix returned status code for non-directory in path.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: fef675e764d268d85be9f9ad2b2e62b66e1b1511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef675e764d268d85be9f9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 28 13:01:26 2022 +0200 ntdll: Fix returned status code for non-directory in path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 -- dlls/ntdll/tests/path.c | 8 ++++---- dlls/ntdll/unix/file.c | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b0b8eee1f2f..f8ef38f38c2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -417,11 +417,9 @@ static void open_file_test(void) pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); - todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 0931d61450d..d5d6e9c217a 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -653,9 +653,9 @@ static void test_nt_names(void) { NULL, L"\\??\\C:\\windows\\system32\\\\", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, - { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\sys\001", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", NULL, STATUS_SUCCESS }, @@ -679,9 +679,9 @@ static void test_nt_names(void) { L"\\??\\C:\\windows\\", L"system32\\\\", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"system32\\foobar\\", STATUS_OBJECT_NAME_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, - { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\Kernel32.Dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"\\system32\\kernel32.dll", STATUS_INVALID_PARAMETER }, { L"\\??\\C:\\windows\\", L"/system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..4873f7f093c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2594,7 +2594,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i not_found: unix_name[pos - 1] = 0; - return STATUS_OBJECT_PATH_NOT_FOUND; + return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -3200,9 +3200,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer /* if this is the last element, not finding it is not necessarily fatal */ if (!name_len) { - if (status == STATUS_OBJECT_PATH_NOT_FOUND) + if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - status = STATUS_OBJECT_NAME_NOT_FOUND; if (disposition != FILE_OPEN && disposition != FILE_OVERWRITE) { ret = ntdll_wcstoumbs( name, end - name, unix_name + pos + 1, MAX_DIR_ENTRY_LEN + 1, TRUE ); @@ -3220,6 +3219,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer status = STATUS_OBJECT_NAME_COLLISION; } } + else if (status == STATUS_OBJECT_NAME_NOT_FOUND) status = STATUS_OBJECT_PATH_NOT_FOUND; if (status != STATUS_SUCCESS) break;

1 0

Giovanni Mascellani : mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: fcabfeea8f79b610d5547ab2c0d05752f9279ff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcabfeea8f79b610d5547ab2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:48:03 2022 +0200 mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 22 +++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 +++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67cf8954c36..6ad667a7404 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant integral bitwise and.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: vkd3d Branch: master Commit: 06c22b6a653f90f48280b23b3cc71f8905166fdf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06c22b6a653f90f48280b23… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 27 17:22:42 2022 +0200 vkd3d-shader/hlsl: Fold constant integral bitwise and. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index bea9864e..33dc7001 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -453,6 +453,32 @@ static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u & src2->value[k].u; + break; + + default: + FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -526,6 +552,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_bit_xor(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_AND: + success = fold_bit_and(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant integral max().
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: vkd3d Branch: master Commit: 8cb865d65ab75aaaf3149db5a8baefb3b521affb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cb865d65ab75aaaf3149db… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 27 17:22:39 2022 +0200 vkd3d-shader/hlsl: Fold constant integral max(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 64067397..95bed02a 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -369,6 +369,35 @@ static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + dst->value[k].i = max(src1->value[k].i, src2->value[k].i); + break; + + case HLSL_TYPE_UINT: + dst->value[k].u = max(src1->value[k].u, src2->value[k].u); + break; + + default: + FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -430,6 +459,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_mod(ctx, res, arg1, arg2); break; + case HLSL_OP2_MAX: + success = fold_max(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant integral bitwise or.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: vkd3d Branch: master Commit: 98ebe9b69c07682bccf5dcaa4001a4c4f6432a71 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98ebe9b69c07682bccf5dca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 27 17:22:43 2022 +0200 vkd3d-shader/hlsl: Fold constant integral bitwise or. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 33dc7001..20384180 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -479,6 +479,32 @@ static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u | src2->value[k].u; + break; + + default: + FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -556,6 +582,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_bit_and(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_OR: + success = fold_bit_or(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant integral bitwise xor.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: vkd3d Branch: master Commit: 4016ddff7760a4553c6da6abf7e548d20b1c75cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4016ddff7760a4553c6da6a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 27 17:22:41 2022 +0200 vkd3d-shader/hlsl: Fold constant integral bitwise xor. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 01f394b8..bea9864e 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -427,6 +427,32 @@ static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u ^ src2->value[k].u; + break; + + default: + FIXME("Fold bit xor for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -496,6 +522,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_min(ctx, res, arg1, arg2); break; + case HLSL_OP2_BIT_XOR: + success = fold_bit_xor(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0