From 5cf1692e74c33490b4b1311a12edc8d0fe095f42 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 3 Oct 2018 13:55:21 +1000 Subject: [PATCH] Rebase against c96eba60e347e9ce79f8b60e0fac9bf69c165ced --- ...d-tests-to-set-disposition-on-file-w.patch | 12 +++++------ ...low-to-set-disposition-on-file-which.patch | 20 +++++++++---------- patches/patchinstall.sh | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/ntdll-FileDispositionInformation/0001-ntdll-tests-Added-tests-to-set-disposition-on-file-w.patch b/patches/ntdll-FileDispositionInformation/0001-ntdll-tests-Added-tests-to-set-disposition-on-file-w.patch index 359cb86c..184c393c 100644 --- a/patches/ntdll-FileDispositionInformation/0001-ntdll-tests-Added-tests-to-set-disposition-on-file-w.patch +++ b/patches/ntdll-FileDispositionInformation/0001-ntdll-tests-Added-tests-to-set-disposition-on-file-w.patch @@ -1,4 +1,4 @@ -From c23cf737de05828c95cdd70c8455cb1e6c28fd62 Mon Sep 17 00:00:00 2001 +From 79b09aa1d8a91ae923d9f951e1c316492a5edb39 Mon Sep 17 00:00:00 2001 From: Qian Hong Date: Fri, 17 Apr 2015 00:59:02 +0800 Subject: [PATCH] ntdll/tests: Added tests to set disposition on file which is @@ -9,7 +9,7 @@ Subject: [PATCH] ntdll/tests: Added tests to set disposition on file which is 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index 5ac69b2..a734a1e 100644 +index 0f4281d..cafafa1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2695,12 +2695,13 @@ static void test_file_disposition_information(void) @@ -27,10 +27,10 @@ index 5ac69b2..a734a1e 100644 GetTempPathA( MAX_PATH, tmp_path ); -@@ -3023,6 +3024,74 @@ todo_wine - todo_wine - ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); - RemoveDirectoryA( buffer ); +@@ -3049,6 +3050,74 @@ todo_wine + fileDeleted = RemoveDirectoryA( buffer ); + todo_wine + ok( fileDeleted, "Directory should have been deleted\n" ); + + /* cannot set disposition on file with file mapping opened */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); diff --git a/patches/ntdll-FileDispositionInformation/0002-server-Do-not-allow-to-set-disposition-on-file-which.patch b/patches/ntdll-FileDispositionInformation/0002-server-Do-not-allow-to-set-disposition-on-file-which.patch index d0f2cd17..fec7e12d 100644 --- a/patches/ntdll-FileDispositionInformation/0002-server-Do-not-allow-to-set-disposition-on-file-which.patch +++ b/patches/ntdll-FileDispositionInformation/0002-server-Do-not-allow-to-set-disposition-on-file-which.patch @@ -1,8 +1,8 @@ -From adecc0a88655710360130ba8e2c7f61d855e9d8b Mon Sep 17 00:00:00 2001 +From 28df8b2cf6f5a038f3449f78e8809ae0cf10d345 Mon Sep 17 00:00:00 2001 From: Qian Hong Date: Fri, 17 Apr 2015 18:39:59 +0800 -Subject: server: Do not allow to set disposition on file which has a file - mapping. +Subject: [PATCH] server: Do not allow to set disposition on file which has a + file mapping. --- dlls/ntdll/tests/file.c | 2 -- @@ -10,10 +10,10 @@ Subject: server: Do not allow to set disposition on file which has a file 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index 740e44a..99aaa37 100644 +index cafafa1..5dbf6d5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c -@@ -2279,7 +2279,6 @@ static void test_file_disposition_information(void) +@@ -3059,7 +3059,6 @@ todo_wine ok( mapping != NULL, "failed to create file mapping\n"); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); @@ -21,7 +21,7 @@ index 740e44a..99aaa37 100644 ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; -@@ -2313,7 +2312,6 @@ static void test_file_disposition_information(void) +@@ -3093,7 +3092,6 @@ todo_wine CloseHandle( mapping ); fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); @@ -30,10 +30,10 @@ index 740e44a..99aaa37 100644 CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/server/fd.c b/server/fd.c -index 5130b44..04891e7 100644 +index 6118f52..25bb24d 100644 --- a/server/fd.c +++ b/server/fd.c -@@ -2218,6 +2218,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl +@@ -2221,6 +2221,7 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl static void set_fd_disposition( struct fd *fd, int unlink ) { struct stat st; @@ -41,7 +41,7 @@ index 5130b44..04891e7 100644 if (!fd->inode) { -@@ -2251,6 +2252,17 @@ static void set_fd_disposition( struct fd *fd, int unlink ) +@@ -2254,6 +2255,17 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } @@ -60,5 +60,5 @@ index 5130b44..04891e7 100644 } -- -2.5.0 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 77e1fbbf..f6394005 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "d8249c638c9e5bac2869c850d1449bddad01f404" + echo "c96eba60e347e9ce79f8b60e0fac9bf69c165ced" } # Show version information