Rebase against b548f8c4a7b5bb82d6e1206939f638153aedce36.

This commit is contained in:
Sebastian Lackner
2016-02-10 02:46:36 +01:00
parent 09612a2923
commit 106d3d5461
3 changed files with 20 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
From 56879d100853d341a322ab082dbbd91e50ec72cd Mon Sep 17 00:00:00 2001
From f928d6182289fb703fff3bd549b9df9b6a6558c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 20 Jan 2015 18:39:36 +0100
Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
@@ -19,7 +19,7 @@ Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
create mode 100644 dlls/ntoskrnl.exe/tests/driver.sys/util.h
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index b824250..c104002 100644
index 1319ada..06794ba 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1423,7 +1423,7 @@
@@ -43,7 +43,7 @@ index bc040e4..b3a6839 100644
+ driver.c \
+ test.c
diff --git a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
index 5756090..3da7ba1 100644
index 35f78d1..f39aa37 100644
--- a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
@@ -30,6 +30,9 @@
@@ -90,7 +90,7 @@ index 5756090..3da7ba1 100644
return STATUS_SUCCESS;
}
@@ -70,16 +66,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
@@ -72,16 +68,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
NTSTATUS status = STATUS_NOT_SUPPORTED;
ULONG_PTR information = 0;
@@ -672,11 +672,11 @@ index 9b8a6a7..64e9d97 100644
unload_driver(service, filename);
}
diff --git a/include/wine/test.h b/include/wine/test.h
index f8b608f..b7ef81a 100644
index 0d81a24..63e2cfa 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -61,7 +61,13 @@ extern int winetest_loop_todo(void);
extern void winetest_end_todo( const char* platform );
extern void winetest_end_todo(void);
extern int winetest_get_mainargs( char*** pargv );
extern LONG winetest_get_failures(void);
+extern int winetest_get_report_success(void);
@@ -689,7 +689,7 @@ index f8b608f..b7ef81a 100644
extern void winetest_wait_child_process( HANDLE process );
extern const char *wine_dbgstr_wn( const WCHAR *str, int n );
@@ -436,10 +442,39 @@ LONG winetest_get_failures(void)
@@ -428,10 +434,39 @@ LONG winetest_get_failures(void)
return failures;
}
@@ -732,5 +732,5 @@ index f8b608f..b7ef81a 100644
void winetest_wait_child_process( HANDLE process )
--
2.2.1
2.7.0