Rebase against d8249c638c9e5bac2869c850d1449bddad01f404

This commit is contained in:
Alistair Leslie-Hughes
2018-10-02 13:53:52 +10:00
parent dc83f04f04
commit 9146bbc3d4
9 changed files with 47 additions and 250 deletions

View File

@@ -1,18 +1,18 @@
From 3b075f8bd5e11c89d3c5c86350a492b21a8f2437 Mon Sep 17 00:00:00 2001
From c23cf737de05828c95cdd70c8455cb1e6c28fd62 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
to memory
Subject: [PATCH] ntdll/tests: Added tests to set disposition on file which is
mapped to memory
---
dlls/ntdll/tests/file.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 42eece5..34ece75 100644
index 5ac69b2..a734a1e 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -2618,12 +2618,13 @@ static void test_file_disposition_information(void)
@@ -2695,12 +2695,13 @@ static void test_file_disposition_information(void)
{
char tmp_path[MAX_PATH], buffer[MAX_PATH + 16];
DWORD dirpos;
@@ -27,7 +27,7 @@ index 42eece5..34ece75 100644
GetTempPathA( MAX_PATH, tmp_path );
@@ -2946,6 +2947,74 @@ todo_wine
@@ -3023,6 +3024,74 @@ todo_wine
todo_wine
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
RemoveDirectoryA( buffer );
@@ -101,7 +101,7 @@ index 42eece5..34ece75 100644
+ DeleteFileA( buffer );
}
static void test_iocompletion(void)
static void test_file_name_information(void)
--
2.7.4
1.9.1