November 2018 - Wine-devel - list.winehq.org

[website] German translation for release 3.19
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

2 1

[website] German translation for release 3.18
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.17
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 4/4] server: Fail to open a file if it has explicit delete disposition set.
by Dmitry Timoshkov 09 Nov '18

09 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/file.c | 10 ---------- server/fd.c | 11 +++++++++++ server/trace.c | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7a905526b3..81fa7971b3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2759,16 +2759,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); -todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2967,16 +2962,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/server/fd.c b/server/fd.c index f2d83b4d58..b0a1a1cf75 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1830,6 +1830,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, { unsigned int err; struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd ); + struct list *ptr; if (!inode) { @@ -1844,6 +1845,16 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, list_add_head( &inode->open, &fd->inode_entry ); closed_fd = NULL; + LIST_FOR_EACH( ptr, &inode->open ) + { + struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); + if (fd_ptr->closed->unlink == 1 /* only explicit disposition matters */) + { + set_error( STATUS_DELETE_PENDING ); + goto error; + } + } + /* check directory options */ if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode)) { diff --git a/server/trace.c b/server/trace.c index 9a84067662..c36ecdbef0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5450,6 +5450,7 @@ static const struct { "CONNECTION_REFUSED", STATUS_CONNECTION_REFUSED }, { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, + { "DELETE_PENDING", STATUS_DELETE_PENDING }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, { "DISK_FULL", STATUS_DISK_FULL }, -- 2.17.1

1 0

[PATCH 3/4] server: Track separately implicit and explicit file disposition.
by Dmitry Timoshkov 09 Nov '18

09 Nov '18

This simplifies next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/fd.c b/server/fd.c index 246b758f90..f2d83b4d58 100644 --- a/server/fd.c +++ b/server/fd.c @@ -166,7 +166,7 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - int unlink; /* whether to unlink on close */ + int unlink; /* whether to unlink on close: -1 - implicit FILE_DELETE_ON_CLOSE, 1 - explicit disposition */ char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; @@ -1869,7 +1869,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, goto error; } - fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) ? -1 : 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -2314,7 +2314,9 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); + fd->closed->unlink = unlink ? 1 : 0; + if (fd->options & FILE_DELETE_ON_CLOSE) + fd->closed->unlink = -1; } /* set new name for the fd */ -- 2.17.1

1 0

[PATCH 1/4] server: Allow setting delete disposition on a read-only directory.
by Dmitry Timoshkov 09 Nov '18

09 Nov '18

This makes next patch work for RemoveDirectory() call in dlls/kernel32/tests/profile.c,test_profile_directory_readonly(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index fa174f597e..246b758f90 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2307,8 +2307,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - /* can't unlink files we don't have permission to access */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + /* can't unlink files we don't have permission to write */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) { set_error( STATUS_CANNOT_DELETE ); return; -- 2.17.1

1 0

[website] German translation for release 3.16
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.0.3
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] po: Update German translation.
by Julian Rüger 09 Nov '18

09 Nov '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] rsaenh: Use the ARRAY_SIZE() macro and better types
by Michael Stefaniuc 09 Nov '18

09 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This was a very puzzling to validate and as it is crypto code I wanted to make sure this is a real no-op change: mpi.c: Even with the int to unsigned int change this is a no-op aka the same object files are generated when compiled with CFLAGS="-O2 -g0". rsa.c: There was never the same object file generated with any permutation of CFLAGS. With -O2 the assembler diff was hard to validate as quite a few location changed. Even more so when comparing the disassembled object files. With -O0 the assembler diff was just one line: .L2: cmpl $2, -4(%ebp) - jle .L5 + jbe .L5 movl $1, %eax "WHY is the 'jump lower equal' changing to a 'jump bigger equal'???" Nothing like making the wrong assumptions about the assembler mnemonincs... "jbe == Jump if Below or Equal" and it's the unsingned variant of jle. So for all practical purposes the same code is generated. dlls/rsaenh/mpi.c | 4 ++-- dlls/rsaenh/rsa.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e05fa59f8b..3fbca42a8c 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -3378,9 +3378,9 @@ static const struct { /* returns # of RM trials required for a given bit size */ int mp_prime_rabin_miller_trials(int size) { - int x; + unsigned int x; - for (x = 0; x < (int)(sizeof(sizes)/(sizeof(sizes[0]))); x++) { + for (x = 0; x < ARRAY_SIZE(sizes); x++) { if (sizes[x].k == size) { return sizes[x].t; } else if (sizes[x].k > size) { diff --git a/dlls/rsaenh/rsa.c b/dlls/rsaenh/rsa.c index 5e9019f53d..7bcfa750ef 100644 --- a/dlls/rsaenh/rsa.c +++ b/dlls/rsaenh/rsa.c @@ -29,6 +29,7 @@ */ #include "tomcrypt.h" +#include "windef.h" static const struct { int mpi_code, ltc_code; @@ -41,9 +42,9 @@ static const struct { /* convert a MPI error to a LTC error (Possibly the most powerful function ever! Oh wait... no) */ static int mpi_to_ltc_error(int err) { - int x; + unsigned int x; - for (x = 0; x < (int)(sizeof(mpi_to_ltc_codes)/sizeof(mpi_to_ltc_codes[0])); x++) { + for (x = 0; x < ARRAY_SIZE(mpi_to_ltc_codes); x++) { if (err == mpi_to_ltc_codes[x].mpi_code) { return mpi_to_ltc_codes[x].ltc_code; } -- 2.14.5

1 0