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 54633e3956e6b3c4d8ebbd5d721efa294e9602fb.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-10-29 20:12:02 +01:00
parent d014e899bc
commit 5acbd17da2
18 changed files with 564 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From cefae7f0bda6322ac47ce7cf3bc1ee595f94394f Mon Sep 17 00:00:00 2001
From 0a6a4d1aa5009c1e29508c34a32155cc5174984c 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
@@ -530,7 +530,7 @@ index 0000000..9b8a6a7
+ unload_driver(service, filename);
+}
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 069d0ae..b1d77ab 100755
index 4b539cd..2bea0a4 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -258,7 +258,7 @@ sub parse_makefile($)
@@ -542,7 +542,7 @@ index 069d0ae..b1d77ab 100755
{
my $var = $1;
$make{$var} = $2;
@@ -481,6 +481,13 @@ sub update_makefiles(@)
@@ -486,6 +486,13 @@ sub update_makefiles(@)
(my $dir = $file) =~ s/^(.*)\/Makefile/$1/;
push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n";
}
@@ -557,16 +557,16 @@ index 069d0ae..b1d77ab 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 295e5e8..89af38d 100644
index 30bbc3e..de5ca59 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -165,4 +165,5 @@ struct makefile
@@ -170,4 +170,5 @@ struct makefile
const char *module;
const char *testdll;
+ const char *resource;
const char *staticlib;
const char *importlib;
@@ -467,6 +468,30 @@ static char *get_extension( char *filename )
@@ -472,6 +473,30 @@ static char *get_extension( char *filename )
/*******************************************************************
@@ -597,7 +597,7 @@ index 295e5e8..89af38d 100644
* replace_extension
*/
static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
@@ -1778,6 +1803,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -1872,6 +1897,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
struct strarray subdirs = empty_strarray;
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = empty_strarray;
@@ -605,7 +605,7 @@ index 295e5e8..89af38d 100644
char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" );
char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" );
@@ -2014,7 +2040,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2097,7 +2123,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
}
else
{
@@ -614,7 +614,7 @@ index 295e5e8..89af38d 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2028,7 +2054,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2111,7 +2137,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
output_filenames( includes );
output_filenames( make->define_args );
output_filenames( extradefs );
@@ -623,7 +623,7 @@ index 295e5e8..89af38d 100644
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2108,6 +2134,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2191,6 +2217,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
output( "\n" );
}
@@ -696,9 +696,9 @@ index 295e5e8..89af38d 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2411,6 +2503,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
strarray_add( &all_targets, program );
}
@@ -2514,6 +2606,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
add_install_rule( make, make->scripts.str[i], make->scripts.str[i],
strmake( "S$(bindir)/%s", make->scripts.str[i] ));
+ if (make->resource)
+ {
@@ -780,7 +780,7 @@ index 295e5e8..89af38d 100644
if (all_targets.count)
{
output( "all:" );
@@ -2692,4 +2861,5 @@ static void update_makefile( const char *path )
@@ -2798,4 +2967,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" );