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 846155f1531207a763c099defa90fc2c41135164.

Browse Source 
[advapi32-RegCopyTree]
Removed patches to implement RegCopyTreeA/W (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-03-02 04:27:31 +01:00
parent caaedcff2b
commit ab74d819f0
15 changed files with 348 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 1f4a1a1c60ec3e6ee9a381c9b10915ed6ecc0025 Mon Sep 17 00:00:00 2001
From 0dccfbcec9818047c7fec959005453d022905835 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
@@ -14,8 +14,8 @@ Subject: ntoskrnl.exe/tests: Add initial driver testing framework and
dlls/ntoskrnl.exe/tests/driver.sys/driver.sys.spec | 1 +
dlls/ntoskrnl.exe/tests/ntoskrnl.c | 226 +++++++++++++++++++++
tools/make_makefiles | 9 +-
tools/makedep.c | 174 +++++++++++++++-
10 files changed, 621 insertions(+), 3 deletions(-)
tools/makedep.c | 165 ++++++++++++++-
10 files changed, 612 insertions(+), 3 deletions(-)
create mode 100644 dlls/ntoskrnl.exe/tests/Makefile.in
create mode 100644 dlls/ntoskrnl.exe/tests/driver.sys/Makefile.in
create mode 100644 dlls/ntoskrnl.exe/tests/driver.sys/driver.c
@@ -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 4171f47..4ad7d27 100644
index f4d7424..9d8296a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -578,6 +578,28 @@ $ac_dir/crosstest: __builddeps__ dummy
@@ -547,6 +547,28 @@ $ac_dir/crosstest: __builddeps__ dummy
fi
}
@@ -49,14 +49,14 @@ index 4171f47..4ad7d27 100644
+
+ AS_VAR_IF([enable_tests],[no],[wine_fn_disabled_rules $ac_clean; return])
+
+ wine_fn_depend_rules
+ wine_fn_append_file SUBDIRS $ac_dir
+ wine_fn_clean_rules $ac_clean
+}
+
wine_fn_config_tool ()
{
ac_dir=$[1]
@@ -683,6 +705,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
@@ -650,6 +672,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl
m4_popdef([ac_suffix])dnl
m4_popdef([ac_name])])
@@ -557,16 +557,16 @@ index ce38c53..d60a3fd 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 3b7b2b8..aa6a94b 100644
index 12f5395..a7723a0 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -174,4 +174,5 @@ struct makefile
@@ -175,4 +175,5 @@ struct makefile
const char *module;
const char *testdll;
+ const char *resource;
const char *sharedlib;
const char *staticlib;
@@ -478,6 +479,30 @@ static char *get_extension( char *filename )
@@ -480,6 +481,30 @@ static char *get_extension( char *filename )
/*******************************************************************
@@ -597,7 +597,7 @@ index 3b7b2b8..aa6a94b 100644
* replace_extension
*/
static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
@@ -2239,6 +2264,7 @@ static struct strarray output_sources( const struct makefile *make )
@@ -2277,6 +2302,7 @@ static struct strarray output_sources( const struct makefile *make )
struct strarray includes = empty_strarray;
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = empty_strarray;
@@ -605,7 +605,7 @@ index 3b7b2b8..aa6a94b 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" );
@@ -2521,7 +2547,7 @@ static struct strarray output_sources( const struct makefile *make )
@@ -2559,7 +2585,7 @@ static struct strarray output_sources( const struct makefile *make )
}
else
{
@@ -614,7 +614,7 @@ index 3b7b2b8..aa6a94b 100644
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib);
@@ -2535,7 +2561,7 @@ static struct strarray output_sources( const struct makefile *make )
@@ -2573,7 +2599,7 @@ static struct strarray output_sources( const struct makefile *make )
output_filenames( includes );
output_filenames( make->define_args );
output_filenames( extradefs );
@@ -623,7 +623,7 @@ index 3b7b2b8..aa6a94b 100644
{
output_filenames( dll_flags );
if (make->use_msvcrt) output_filenames( msvcrt_flags );
@@ -2587,6 +2613,72 @@ static struct strarray output_sources( const struct makefile *make )
@@ -2625,6 +2651,65 @@ static struct strarray output_sources( const struct makefile *make )
output( "\n" );
}
@@ -633,13 +633,6 @@ index 3b7b2b8..aa6a94b 100644
+ {
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/Makefile:\n", resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s/Makefile\n", make->top_obj_dir,
+ base_dir_path( make, resource_dlls.str[i] ) );
+ }
+
+ for (i = 0; i < resource_dlls.count; i++)
+ {
+ output( "%s/%s%s: %s/Makefile\n", resource_dlls.str[i],
+ resource_dlls.str[i], dll_ext, resource_dlls.str[i] );
+ output( "\t@cd %s && $(MAKE) %s%s\n", resource_dlls.str[i],
@@ -696,7 +689,7 @@ index 3b7b2b8..aa6a94b 100644
if (make->module && !make->staticlib)
{
struct strarray all_libs = empty_strarray;
@@ -2984,6 +3076,83 @@ static struct strarray output_sources( const struct makefile *make )
@@ -3024,6 +3109,81 @@ 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] ));
@@ -772,15 +765,13 @@ index 3b7b2b8..aa6a94b 100644
+ output_filenames( all_libs );
+ output_filename( "$(LDFLAGS)" );
+ output( "\n" );
+ strarray_add( &phony_targets, obj_dir_path( make, "crosstest" ));
+ if (make->obj_dir) output( "crosstest: %s\n", obj_dir_path( make, "crosstest" ));
+ }
+ }
+
if (all_targets.count)
if (!make->disabled)
{
output( "all:" );
@@ -3331,4 +3500,5 @@ static void load_sources( struct makefile *make )
if (all_targets.count)
@@ -3381,4 +3541,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" );