wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Sebastian Lackner : ntoskrnl.exe/tests: Add test driver.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 417e542e7adda01fe8c8fe7b369b6eb0f36c7321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417e542e7adda01fe8c8fe7b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 30 13:59:58 2018 -0500 ntoskrnl.exe/tests: Add test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntoskrnl.exe/tests/Makefile.in | 10 +++ dlls/ntoskrnl.exe/tests/driver.c | 126 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 27 ++++++ dlls/ntoskrnl.exe/tests/driver.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 159 ++++++++++++++++++++++++++++++++++++ 7 files changed, 325 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417e542e7adda01fe8c8…

1 0

Alexandre Julliard : winegcc: Add support for building native subsystem libraries.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 470bd0c2fa988721ba1cb17bb12e164cb6f9bee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470bd0c2fa988721ba1cb17b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 12:57:54 2018 +0200 winegcc: Add support for building native subsystem libraries. Based on a patch by Zebediah Figura. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4be35d5..5d604d2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -210,6 +210,7 @@ struct options const char* image_base; const char* section_align; const char* lib_suffix; + const char* subsystem; strarray* prefix; strarray* lib_dirs; strarray* linker_args; @@ -913,7 +914,19 @@ static void build(struct options* opts) else { strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); - if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); + } + + if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); + if (opts->nostartfiles) strarray_add(link_args, "-nostartfiles" ); + + if (opts->subsystem) + { + strarray_add(link_args, strmake("-Wl,--subsystem,%s", opts->subsystem)); + if (!strcmp( opts->subsystem, "native" )) + { + const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry@8" : "DriverEntry"; + strarray_add(link_args, strmake( "-Wl,--entry,%s", entry )); + } } for ( j = 0 ; j < opts->linker_args->size ; j++ ) @@ -1070,6 +1083,12 @@ static void build(struct options* opts) if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } + if (opts->subsystem) + { + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->subsystem); + } + for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); @@ -1211,19 +1230,11 @@ static void forward(int argc, char **argv, struct options* opts) strarray_free (args); } -/* - * Linker Options - * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol - * -framework name - */ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostartfiles", "-nostdlib", "-s", - "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", + "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" }; unsigned int j; @@ -1600,6 +1611,11 @@ int main(int argc, char **argv) opts.large_address_aware = 1; continue; } + if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1) + { + opts.subsystem = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Zebediah Figura : makedep: Also pass EXTRADLLFLAGS to the cross-compiled test DLL.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 0b90dc78a47b1cfd79d4a6685f12f7e42dd660e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b90dc78a47b1cfd79d4a668… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:59:57 2018 -0500 makedep: Also pass EXTRADLLFLAGS to the cross-compiled test DLL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c5b40a..207c41e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2823,9 +2823,11 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); + struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); struct strarray all_libs, dep_libs = empty_strarray; if (!imports.count) imports = make->imports; + if (!dll_flags.count) dll_flags = make->extradllflags; all_libs = add_import_libs( make, &dep_libs, imports, 0 ); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); @@ -2848,7 +2850,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); output_filenames( target_flags ); output_filenames( unwind_flags ); - output_filenames( make->extradllflags ); + output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); @@ -2880,6 +2882,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); output_filename( "--lib-suffix=.cross.a" ); + output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj )));

1 0

Zebediah Figura : services: Fall back to the current architecture if GetBinaryType fails.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 085c577a25e76161d0660f92eac194263c2375c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085c577a25e76161d0660f92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:59:54 2018 -0500 services: Fall back to the current architecture if GetBinaryType fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index eba98d6..1973d27 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -723,7 +723,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, return ERROR_SUCCESS; } -static DWORD get_winedevice_binary_path(WCHAR **path, BOOL *is_wow64) +static DWORD get_winedevice_binary_path(struct service_entry *service_entry, WCHAR **path, BOOL *is_wow64) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',0}; WCHAR system_dir[MAX_PATH]; @@ -734,7 +734,7 @@ static DWORD get_winedevice_binary_path(WCHAR **path, BOOL *is_wow64) else if (GetBinaryTypeW(*path, &type)) *is_wow64 = (type == SCS_32BIT_BINARY); else - return GetLastError(); + *is_wow64 = service_entry->is_wow64; GetSystemDirectoryW(system_dir, MAX_PATH); HeapFree(GetProcessHeap(), 0, *path); @@ -857,7 +857,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p struct service_entry *winedevice_entry; WCHAR *group; - if ((err = get_winedevice_binary_path(&path, &is_wow64))) + if ((err = get_winedevice_binary_path(service_entry, &path, &is_wow64))) { service_unlock(service_entry); HeapFree(GetProcessHeap(), 0, path);

1 0

Francois Gouget : testbot/web: Add a WineTestBot::Users import.
by Alexandre Julliard 01 May '18

01 May '18

Module: tools Branch: master Commit: 4183255c15a3b6f4d1cf20b8eb384c63332b0267 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4183255c15a3b6f4d1cf20b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 30 23:46:29 2018 +0200 testbot/web: Add a WineTestBot::Users import. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 72bd307..3e5a481 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,7 +25,10 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; + use WineTestBot::Branches; +use WineTestBot::Users; + sub SortKeys($$) @@ -70,7 +73,7 @@ sub GetDisplayValue($$$) if ($PropertyDescriptor->GetName() eq "User" && defined($Item->Patch) && - $Item->User->GetKey() eq WineTestBot::Users->GetBatchUser()->GetKey() && + $Item->User->GetKey() eq GetBatchUser()->GetKey() && defined($Item->Patch->FromName)) { return $Item->Patch->FromName;

1 0

Francois Gouget : testbot: Remove unneeded WineTestBot::Config imports.
by Alexandre Julliard 01 May '18

01 May '18

Module: tools Branch: master Commit: e357126ab41ad6e4b7998c420ce008b1876823b5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e357126ab41ad6e4b7998c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 30 23:46:15 2018 +0200 testbot: Remove unneeded WineTestBot::Config imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Branches.pm | 2 -- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - testbot/lib/WineTestBot/PendingPatchSets.pm | 1 - testbot/lib/WineTestBot/Records.pm | 2 -- testbot/lib/WineTestBot/WineTestBotObjects.pm | 2 -- testbot/web/GetFile.pl | 1 - testbot/web/admin/BranchesList.pl | 1 - testbot/web/admin/Log.pl | 1 - testbot/web/admin/SendLog.pl | 3 +-- 9 files changed, 1 insertion(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 96cf26e..f202c22 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -29,8 +29,6 @@ WineTestBot::Branch - Describes a Wine branch use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Config; - sub InitializeNew($$) { diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index af30fbb..380d4b8 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -59,7 +59,6 @@ our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 7a54499..c0dc56f 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -160,7 +160,6 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Utils; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index a3302af..00364f2 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -41,8 +41,6 @@ only limited by the amount of data dumped into the Records table. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Config; - sub InitializeNew($$) { diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index d559a76..de748ff 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -29,7 +29,6 @@ use ObjectModel::Item; our @ISA = qw(ObjectModel::Item); use ObjectModel::BackEnd; -use WineTestBot::Config; sub GetBackEnd($) @@ -51,7 +50,6 @@ use ObjectModel::Collection; our @ISA = qw(ObjectModel::Collection); use ObjectModel::BackEnd; -use WineTestBot::Config; sub GetBackEnd($) { diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 7e6c615..a178cca 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -22,7 +22,6 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use Fcntl; # For O_XXX -use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 7a496cd..a325818 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -24,7 +24,6 @@ package BranchesListPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); -use WineTestBot::Config; use WineTestBot::Branches; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d6e526..934bf25 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -25,7 +25,6 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; use WineTestBot::Log; diff --git a/testbot/web/admin/SendLog.pl b/testbot/web/admin/SendLog.pl index 7044c33..3581c5c 100644 --- a/testbot/web/admin/SendLog.pl +++ b/testbot/web/admin/SendLog.pl @@ -20,12 +20,11 @@ use strict; use HTTP::Date; - use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; use URI::Escape; -use WineTestBot::Config; + use WineTestBot::CGI::Sessions; use WineTestBot::Log;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018