wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a786dca935c3e9b3d85853db4b61700e590a1c8b.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-11-13 18:00:14 +01:00
parent 75dc81b7d3
commit 2c3f70b42b
10 changed files with 87 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch
View File

@@ -1,4 +1,4 @@
From 5733c4ddb3e5a2ff310fed2a585da13538345b97 Mon Sep 17 00:00:00 2001
From 94f9145a8c4e06efe46330c75819eb18486965f3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 18 Jan 2015 05:42:10 +0100
Subject: ntoskrnl.exe/tests: Add initial driver testing framework and
@@ -24,10 +24,10 @@ Subject: ntoskrnl.exe/tests: Add initial driver testing framework and
create mode 100644 dlls/ntoskrnl.exe/tests/ntoskrnl.c
diff --git a/aclocal.m4 b/aclocal.m4
index 774377d..bf91b70 100644
index d5a3532..f33846f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -629,6 +629,28 @@ $ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy
@@ -617,6 +617,28 @@ $ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy
fi
}
@@ -56,7 +56,7 @@ index 774377d..bf91b70 100644
wine_fn_config_tool ()
{
ac_dir=$[1]
@@ -734,6 +756,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
@@ -722,6 +744,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
m4_popdef([ac_suffix])dnl
m4_popdef([ac_name])])
@@ -73,10 +73,10 @@ index 774377d..bf91b70 100644
dnl
dnl Usage: WINE_CONFIG_LIB(name,flags)
diff --git a/configure.ac b/configure.ac
index 48268b0..782d1d7 100644
index 7d2449f..dd5ee1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3142,6 +3142,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
@@ -3097,6 +3097,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
WINE_CONFIG_DLL(ntdsapi,,[implib])
WINE_CONFIG_TEST(dlls/ntdsapi/tests)
WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
@@ -530,13 +530,13 @@ index 0000000..9b8a6a7
+ unload_driver(service, filename);
+}
diff --git a/tools/make_makefiles b/tools/make_makefiles
index b7f8b63..8143c4f 100755
index 78b6dea..cb77784 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -200,7 +200,7 @@ sub parse_makefile($)
while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines
next if (/^\s*$/);
@@ -204,7 +204,7 @@ sub parse_makefile($)
{
die "Configure substitution is not allowed in $file";
}
- if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/)
+ if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/)
{
@@ -557,7 +557,7 @@ index b7f8b63..8143c4f 100755
{
die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//;
diff --git a/tools/makedep.c b/tools/makedep.c
index 023c0ec..a4884cf 100644
index 14a26ef..ad61e99 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -171,4 +171,5 @@ struct makefile
@@ -566,7 +566,7 @@ index 023c0ec..a4884cf 100644
+ const char *resource;
const char *sharedlib;
const char *staticlib;
@@ -474,6 +475,30 @@ static char *get_extension( char *filename )
@@ -472,6 +473,30 @@ static char *get_extension( char *filename )
/*******************************************************************
@@ -597,7 +597,7 @@ index 023c0ec..a4884cf 100644
* replace_extension
*/
static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
@@ -2025,6 +2050,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2044,6 +2069,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
struct strarray subdirs = empty_strarray;
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = empty_strarray;
@@ -605,7 +605,7 @@ index 023c0ec..a4884cf 100644
struct strarray install_rules[NB_INSTALL_RULES];
char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" );
char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" );
@@ -2297,7 +2323,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2319,7 +2345,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
}
else
{
@@ -614,7 +614,7 @@ index 023c0ec..a4884cf 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2311,7 +2337,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2333,7 +2359,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
output_filenames( includes );
output_filenames( make->define_args );
output_filenames( extradefs );
@@ -623,7 +623,7 @@ index 023c0ec..a4884cf 100644
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2390,6 +2416,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2412,6 +2438,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
output( "\n" );
}
@@ -696,7 +696,7 @@ index 023c0ec..a4884cf 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2780,6 +2872,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2806,6 +2898,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i],
strmake( "S$(bindir)/%s", make->scripts.str[i] ));
@@ -780,7 +780,7 @@ index 023c0ec..a4884cf 100644
if (all_targets.count)
{
output( "all:" );
@@ -3075,4 +3244,5 @@ static void update_makefile( const char *path )
@@ -3101,4 +3270,5 @@ static void update_makefile( const char *path )
make->module = get_expanded_make_variable( make, "MODULE" );
make->testdll = get_expanded_make_variable( make, "TESTDLL" );
+ make->resource = get_expanded_make_variable( make, "RESOURCE" );