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 79c59085b1b1f487e91c2695028dd3d1d257a468.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-10-28 20:21:10 +01:00
parent 2c0e907a4a
commit 2668c19b7f
7 changed files with 22 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From e707326e017a60d1178b1f07d2c0178f64b01e30 Mon Sep 17 00:00:00 2001
From c7174bf7d94ae8d6cd82a6ea02d7161bb2f936f8 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
@@ -553,7 +553,7 @@ 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 8c5abde..62bd284 100644
index 295e5e8..89af38d 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -165,4 +165,5 @@ struct makefile
@@ -598,10 +598,10 @@ index 8c5abde..62bd284 100644
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = empty_strarray;
+ struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" );
char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" );
char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" );
for (i = 0; i < linguas.count; i++)
strarray_add( &mo_files, strmake( "%s/%s.mo", top_obj_dir_path( make, "po" ), linguas.str[i] ));
@@ -2012,7 +2038,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2014,7 +2040,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
}
else
{
@@ -610,7 +610,7 @@ index 8c5abde..62bd284 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2026,7 +2052,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2028,7 +2054,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
output_filenames( includes );
output_filenames( make->define_args );
output_filenames( extradefs );
@@ -619,7 +619,7 @@ index 8c5abde..62bd284 100644
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2106,6 +2132,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2108,6 +2134,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
output( "\n" );
}
@@ -692,7 +692,7 @@ index 8c5abde..62bd284 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2387,6 +2479,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
@@ -2411,6 +2503,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
strarray_add( &all_targets, program );
}
@@ -776,7 +776,7 @@ index 8c5abde..62bd284 100644
if (all_targets.count)
{
output( "all:" );
@@ -2668,4 +2837,5 @@ static void update_makefile( const char *path )
@@ -2692,4 +2861,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" );