Remove various patches (accepted upstream), rebase some patches.

This commit is contained in:
Sebastian Lackner
2014-12-02 21:24:57 +01:00
parent f317ba0b0c
commit fb6a771a44
18 changed files with 53 additions and 392 deletions

View File

@ -1,4 +1,4 @@
From 10a86e0d87850cc77ee13b9e814dc8a9a558721b Mon Sep 17 00:00:00 2001
From 071454e8a76f0b26cc097434d780c12e472d5c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Aug 2014 20:25:18 +0200
Subject: kernel32/tests: Add tests for GetFinalPathNameByHandle
@ -8,7 +8,7 @@ Subject: kernel32/tests: Add tests for GetFinalPathNameByHandle
1 file changed, 204 insertions(+)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index ddfa019..55e9045 100644
index 8849eb3..bd92162 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -34,6 +34,7 @@
@ -26,9 +26,9 @@ index ddfa019..55e9045 100644
+static DWORD (WINAPI* pGetFinalPathNameByHandleA)(HANDLE, LPSTR, DWORD, DWORD);
+static DWORD (WINAPI* pGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD);
/* keep filename and filenameW the same */
static const char filename[] = "testfile.xxx";
@@ -85,6 +88,8 @@ static void InitFunctionPointers(void)
static const char sillytext[] =
@@ -83,6 +86,8 @@ static void InitFunctionPointers(void)
pSetFileValidData = (void *) GetProcAddress(hkernel32, "SetFileValidData");
pCopyFile2 = (void *) GetProcAddress(hkernel32, "CopyFile2");
pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2");
@ -37,7 +37,7 @@ index ddfa019..55e9045 100644
}
static void test__hread( void )
@@ -4145,6 +4150,203 @@ todo_wine
@@ -4182,6 +4187,203 @@ todo_wine
}
}
@ -241,7 +241,7 @@ index ddfa019..55e9045 100644
START_TEST(file)
{
InitFunctionPointers();
@@ -4191,4 +4393,6 @@ START_TEST(file)
@@ -4234,4 +4436,6 @@ START_TEST(file)
test_SetFileValidData();
test_WriteFileGather();
test_file_access();
@ -249,5 +249,5 @@ index ddfa019..55e9045 100644
+ test_GetFinalPathNameByHandleW();
}
--
2.1.0
2.1.3