Rebase against f11563c65fa50e2f8b7e39cade34bb7a998b26f7.

This commit is contained in:
Zebediah Figura
2018-09-28 16:57:12 -05:00
parent 732d40058d
commit 761ca063a0
6 changed files with 74 additions and 110 deletions

View File

@@ -1,4 +1,4 @@
From c04c1737fad3efc975d9cedcd2f12547cc482f68 Mon Sep 17 00:00:00 2001
From 3b075f8bd5e11c89d3c5c86350a492b21a8f2437 Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Fri, 17 Apr 2015 00:59:02 +0800
Subject: ntdll/tests: Added tests to set disposition on file which is mapped
@@ -9,15 +9,15 @@ Subject: ntdll/tests: Added tests to set disposition on file which is mapped
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 2e630e3..740e44a 100644
index 42eece5..34ece75 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -2099,12 +2099,13 @@ static void test_file_disposition_information(void)
@@ -2618,12 +2618,13 @@ static void test_file_disposition_information(void)
{
char tmp_path[MAX_PATH], buffer[MAX_PATH + 16];
DWORD dirpos;
- HANDLE handle, handle2;
+ HANDLE handle, handle2, mapping;
- HANDLE handle, handle2, handle3;
+ HANDLE handle, handle2, handle3, mapping;
NTSTATUS res;
IO_STATUS_BLOCK io;
FILE_DISPOSITION_INFORMATION fdi;
@@ -27,7 +27,7 @@ index 2e630e3..740e44a 100644
GetTempPathA( MAX_PATH, tmp_path );
@@ -2269,6 +2270,74 @@ static void test_file_disposition_information(void)
@@ -2946,6 +2947,74 @@ todo_wine
todo_wine
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
RemoveDirectoryA( buffer );
@@ -103,5 +103,5 @@ index 2e630e3..740e44a 100644
static void test_iocompletion(void)
--
2.5.0
2.7.4