wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7276d5fac1417dd81344db45b3af904f8f2c7d77.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-23 20:36:03 +01:00
parent 1a216277ee
commit e88eba680b
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 94f9145a8c4e06efe46330c75819eb18486965f3 Mon Sep 17 00:00:00 2001
From 53e679dcc9880ff814feb7776ecf66111da24b18 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 d5a3532..f33846f 100644
index 99faf92..f880723 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -617,6 +617,28 @@ $ac_dir/crosstest: $ac_dir/Makefile __builddeps__ dummy
@@ -609,6 +609,28 @@ $ac_dir/crosstest: __builddeps__ dummy
fi
}
@@ -56,7 +56,7 @@ index d5a3532..f33846f 100644
wine_fn_config_tool ()
{
ac_dir=$[1]
@@ -722,6 +744,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
@@ -714,6 +736,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
m4_popdef([ac_suffix])dnl
m4_popdef([ac_name])])
@@ -530,7 +530,7 @@ index 0000000..9b8a6a7
+ unload_driver(service, filename);
+}
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 78b6dea..cb77784 100755
index e65429f..18b33c3 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -204,7 +204,7 @@ sub parse_makefile($)
@@ -557,16 +557,16 @@ index 78b6dea..cb77784 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 14a26ef..ad61e99 100644
index e1897bc..ce33ed3 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -171,4 +171,5 @@ struct makefile
@@ -172,4 +172,5 @@ struct makefile
const char *module;
const char *testdll;
+ const char *resource;
const char *sharedlib;
const char *staticlib;
@@ -472,6 +473,30 @@ static char *get_extension( char *filename )
@@ -475,6 +476,30 @@ static char *get_extension( char *filename )
/*******************************************************************
@@ -597,7 +597,7 @@ index 14a26ef..ad61e99 100644
* replace_extension
*/
static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
@@ -2044,6 +2069,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2165,6 +2190,7 @@ static struct strarray output_sources( const struct makefile *make )
struct strarray subdirs = empty_strarray;
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = empty_strarray;
@@ -605,7 +605,7 @@ index 14a26ef..ad61e99 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" );
@@ -2319,7 +2345,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2440,7 +2466,7 @@ static struct strarray output_sources( const struct makefile *make )
}
else
{
@@ -614,16 +614,16 @@ index 14a26ef..ad61e99 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2333,7 +2359,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2454,7 +2480,7 @@ static struct strarray output_sources( const struct makefile *make )
output_filenames( includes );
output_filenames( make->define_args );
output_filenames( extradefs );
- if (make->module || make->staticlib || make->testdll)
+ if (make->module || make->staticlib || make->testdll || make->resource)
- if (make->module || make->staticlib || make->sharedlib || make->testdll)
+ if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource)
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2412,6 +2438,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2533,6 +2559,72 @@ static struct strarray output_sources( const struct makefile *make )
output( "\n" );
}
@@ -696,7 +696,7 @@ index 14a26ef..ad61e99 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2806,6 +2898,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2925,6 +3017,83 @@ static struct strarray output_sources( const struct makefile *make )
add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i],
strmake( "S$(bindir)/%s", make->scripts.str[i] ));
@@ -780,12 +780,12 @@ index 14a26ef..ad61e99 100644
if (all_targets.count)
{
output( "all:" );
@@ -3101,4 +3270,5 @@ static void update_makefile( const char *path )
@@ -3255,4 +3424,5 @@ static void load_sources( struct makefile *make )
make->module = get_expanded_make_variable( make, "MODULE" );
make->testdll = get_expanded_make_variable( make, "TESTDLL" );
+ make->resource = get_expanded_make_variable( make, "RESOURCE" );
make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" );
make->staticlib = get_expanded_make_variable( make, "STATICLIB" );
--
2.6.2
2.7.1