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 370254cbe93beae6a9ff693d98c638db5bfb1134.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-11-12 18:17:43 +01:00
parent 3faa0f1212
commit 75dc81b7d3
8 changed files with 94 additions and 166 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 ff63d064b47c582a0b31a0120d9555af5f041b7d Mon Sep 17 00:00:00 2001
From 5733c4ddb3e5a2ff310fed2a585da13538345b97 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
@@ -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 84420a9..fe4b94e 100644
index 48268b0..782d1d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3203,6 +3203,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
@@ -3142,6 +3142,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
WINE_CONFIG_DLL(ntdsapi,,[implib])
WINE_CONFIG_TEST(dlls/ntdsapi/tests)
WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
@@ -557,16 +557,16 @@ 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 d8cf2f5..6094148 100644
index 023c0ec..a4884cf 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -170,4 +170,5 @@ struct makefile
@@ -171,4 +171,5 @@ struct makefile
const char *module;
const char *testdll;
+ const char *resource;
const char *sharedlib;
const char *staticlib;
const char *importlib;
@@ -472,6 +473,30 @@ static char *get_extension( char *filename )
@@ -474,6 +475,30 @@ static char *get_extension( char *filename )
/*******************************************************************
@@ -597,7 +597,7 @@ index d8cf2f5..6094148 100644
* replace_extension
*/
static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
@@ -1958,6 +1983,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2025,6 +2050,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 d8cf2f5..6094148 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" );
@@ -2229,7 +2255,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2297,7 +2323,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
}
else
{
@@ -614,7 +614,7 @@ index d8cf2f5..6094148 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2243,7 +2269,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2311,7 +2337,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 d8cf2f5..6094148 100644
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2322,6 +2348,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2390,6 +2416,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
output( "\n" );
}
@@ -696,7 +696,7 @@ index d8cf2f5..6094148 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2666,6 +2758,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
@@ -2780,6 +2872,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,12 +780,12 @@ index d8cf2f5..6094148 100644
if (all_targets.count)
{
output( "all:" );
@@ -2951,4 +3120,5 @@ static void update_makefile( const char *path )
@@ -3075,4 +3244,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" );
make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" );
make->staticlib = get_expanded_make_variable( make, "STATICLIB" );
make->importlib = get_expanded_make_variable( make, "IMPORTLIB" );
--
2.6.2