September 2019 - Wine-commits

Francois Gouget : testbot/LibvirtTool: Create live snapshots as needed.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 6c6525ed9cae006e82196c35d0ac29e583356c84 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6c6525ed9cae006e82196c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:10:05 2019 +0200 testbot/LibvirtTool: Create live snapshots as needed. Live snapshots have to save the content of the VM's memory which takes space in the disk image. They may also be specific to the host they are running on (e.g. AMD vs. Intel CPU). And they may need to be recreated after QEmu upgrades. So VMs always have a powered off snapshot as reference and backups made from the powered off state. With VMs that are configured for autologin and autostart of TestAgentd this patch removes the need for the administrator to manually recreate the live snapshots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 85 +++++++++++++++++++++++++++----- testbot/lib/WineTestBot/Config.pm | 7 ++- testbot/lib/WineTestBot/LibvirtDomain.pm | 5 +- 3 files changed, 79 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index dd330a5..72075ae 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -6,7 +6,7 @@ # network trouble, and thus are best performed in a separate process. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2017 Francois Gouget +# Copyright 2012-2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -382,6 +382,25 @@ sub SetupTestAgentd($$) $TA->Disconnect(); } +sub CreateSnapshot($$) +{ + my ($Domain, $SnapshotName) = @_; + + if ($SleepAfterBoot != 0) + { + Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n"); + LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; + sleep($SleepAfterBoot); + } + + Debug(Elapsed($Start), " Creating the $SnapshotName snapshot\n"); + my $ErrMessage = $Domain->CreateSnapshot($SnapshotName); + if (defined $ErrMessage) + { + FatalError("Could not recreate the $SnapshotName snapshot on $VMKey: $ErrMessage\n"); + } +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -391,11 +410,34 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; + my $DomainSnapshot = $VM->IdleSnapshot; + my $ExtraTimeout = 0; + my $CreateSnapshot; - # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); + if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) + { + # Add some extra time to boot the VM and create the live snapshot + $ExtraTimeout += $WaitForBoot + $VMToolTimeout / 2; + $CreateSnapshot = 1; + Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-live snapshot\n"); + } + if (!$Domain->HasSnapshot($DomainSnapshot)) + { + FatalError("Could not find $VMKey\'s $DomainSnapshot snapshot\n"); + } + if ($ExtraTimeout) + { + Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n"); + my $Deadline = $VM->Status eq "maintenance" ? (time() + $VMToolTimeout) : + $VM->ChildDeadline; + $VM->ChildDeadline($Deadline + $ExtraTimeout); + $VM->Save(); + } + + # Revert the VM (and power it on if necessary) + Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); + my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware @@ -408,28 +450,45 @@ sub Revert() FatalError("Could not power off $VMKey: $ErrMessage\n"); } - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); - ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); + Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot... again\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); } if (defined $ErrMessage) { - FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n"); + FatalError("Could not revert $VMKey to $DomainSnapshot: $ErrMessage\n"); } - # The VM is now sleeping which may allow some tasks to run - return 1 if (ChangeStatus("reverting", "sleeping")); + # Mark the VM as sleeping which allows the scheduler to abort the revert in + # favor of higher priority tasks. But don't allow interruptions in the + # middle of snapshot creation! + if (!$CreateSnapshot) + { + return 1 if (ChangeStatus("reverting", "sleeping")); + } # Set up the TestAgent server SetupTestAgentd($VM, $Booting); - if ($SleepAfterRevert != 0) + if ($CreateSnapshot) { + CreateSnapshot($Domain, $VM->IdleSnapshot); + } + else + { + my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? + $SleepAfterBoot : $SleepAfterRevert; Debug(Elapsed($Start), " Sleeping\n"); - LogMsg "Letting ". $VM->Name ." settle down for ${SleepAfterRevert}s\n"; - sleep($SleepAfterRevert); + LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; + sleep($Sleep); + } + + if ($CreateSnapshot) + { + # The activity monitor does not like it when VMs skip the sleeping step + return 1 if (ChangeStatus("reverting", "sleeping")); } - return ChangeStatus("sleeping", "idle", "done"); + return ChangeStatus($CurrentStatus, "idle", "done"); } diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 27e863c..56971b7 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -28,7 +28,7 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot + $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -44,7 +44,8 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot + $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot + $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -92,6 +93,8 @@ $MaxVMsWhenIdle = undef; # How long to attempt to connect to the TestAgent while the VM is booting. $WaitForBoot = 90; +# How long to let the VM settle down after booting it before taking a snapshot. +$SleepAfterBoot = 30; # How long to let the VM settle down after a revert before starting a task on # it (in seconds). $SleepAfterRevert = 0; diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 1f70c97..14bf71d 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -307,11 +307,10 @@ sub GetSnapshotName($) return (undef, $SnapshotName); } -sub RevertToSnapshot($) +sub RevertToSnapshot($$) { - my ($self) = @_; + my ($self, $SnapshotName) = @_; - my $SnapshotName = $self->{VM}->IdleSnapshot; my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); return ($ErrMessage, undef) if (defined $ErrMessage);

1 0

Francois Gouget : testbot/LibvirtTool: Wait for the X session for live Wine snapshots.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 6a5e1e87900c85bd0fc60841170c8d520af0ab48 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a5e1e87900c85bd0fc6084… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:10:08 2019 +0200 testbot/LibvirtTool: Wait for the X session for live Wine snapshots. The TestAgentd server may start before the X session. But we need the latter to run the Wine tests so make sure the X session has started before creating the live snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 72075ae..d1402bc 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -386,6 +386,29 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; + if ($VM->Type eq "wine") + { + # Make sure an X session has started before taking the snapshot + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $TA = $VM->GetAgent(); + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + if (!$Pid) + { + FatalError("Could not check for the X session on the $VMKey VM\n"); + } + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + $TA->Disconnect(); + } + if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Conor McCarthy : vkd3d: Make all descriptor reads and writes atomic.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: vkd3d Branch: master Commit: 8e6f5ddd24158c7402b5fe28426083539eb7f617 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e6f5ddd24158c7402b5fe2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Sep 24 22:13:34 2019 +1000 vkd3d: Make all descriptor reads and writes atomic. Shadow of the Tomb Raider overwrites descriptors while they are being copied in another thread. This patch makes reads and writes atomic for CBV, SRV, UAV, and sampler descriptors, but not RTV and DSV, for which copying is not implemented. Benchmark total frames vs mutex count (the single mutex was locked only once for copying): 1 mutex: 6480 6489 6503 8 mutexes: 6691 6693 6661 16 mutexes: 6665 6682 6703 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 35 +++++++++++++++++------ libs/vkd3d/resource.c | 70 +++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 16 +++++++++++ 3 files changed, 88 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8e6f5ddd24158c7402b…

1 0

Alexandre Julliard : winegcc: Add ARRAY_SIZE macro.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: cb010cd6ec17d5310753bc1a02e5d6a407beff3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb010cd6ec17d5310753bc1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 18:53:19 2019 +0200 winegcc: Add ARRAY_SIZE macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 2 ++ tools/winegcc/winegcc.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 6056ee7258..3d6b8f3665 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -35,6 +35,8 @@ # endif #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + enum target_cpu { CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 06771262eb..506096795e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -579,7 +579,7 @@ static char *get_lib_dir( struct options *opts ) build_len = strlen( build_multiarch ); target_len = strlen( target_multiarch ); - for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) + for (i = 0; i < ARRAY_SIZE(stdlibpath); i++) { char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); @@ -1260,7 +1260,7 @@ static int is_linker_arg(const char* arg) break; } - for (j = 0; j < sizeof(link_switches)/sizeof(link_switches[0]); j++) + for (j = 0; j < ARRAY_SIZE(link_switches); j++) if (strcmp(link_switches[j], arg) == 0) return 1; return 0; @@ -1297,7 +1297,7 @@ static int is_mingw_arg(const char* arg) }; unsigned int j; - for (j = 0; j < sizeof(mingw_switches)/sizeof(mingw_switches[0]); j++) + for (j = 0; j < ARRAY_SIZE(mingw_switches); j++) if (strcmp(mingw_switches[j], arg) == 0) return 1; return 0; @@ -1315,7 +1315,7 @@ static void parse_target_option( struct options *opts, const char *target ) if ((p = strchr( spec, '-' ))) { *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(cpu_names); i++) { if (!strcmp( cpu_names[i].name, spec )) { @@ -1323,7 +1323,7 @@ static void parse_target_option( struct options *opts, const char *target ) break; } } - if (i == sizeof(cpu_names)/sizeof(cpu_names[0])) + if (i == ARRAY_SIZE(cpu_names)) error( "Unrecognized CPU '%s'\n", spec ); platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; @@ -1339,7 +1339,7 @@ static void parse_target_option( struct options *opts, const char *target ) /* get the OS part */ opts->target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < sizeof(platform_names)/sizeof(platform_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) {

1 0

Alexandre Julliard : winegcc: Add --wine-objdir and --winebuild options for the Wine build.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 08956bc9bb0ac54c04f300c9b9a2911665fe6227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08956bc9bb0ac54c04f300c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 13:43:18 2019 +0200 winegcc: Add --wine-objdir and --winebuild options for the Wine build. This avoids overloading the meaning of the -B and --sysroot options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 ++++-- tools/winegcc/winegcc.c | 70 ++++++++++++++++++++++++++------------------ tools/winegcc/winegcc.man.in | 22 +++++++------- 3 files changed, 58 insertions(+), 43 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e37bd8d63a..67dfea43bb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2321,8 +2321,13 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi static void output_winegcc_command( struct makefile *make ) { output( "\t%s -o $@", tools_path( make, "winegcc" )); - 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( "--wine-objdir" ); + output_filename( top_obj_dir_path( make, "" )); + if (tools_dir) + { + output_filename( "--winebuild" ); + output_filename( tools_path( make, "winebuild" )); + } if (make->is_cross) { output_filename( "-b" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 506096795e..1af94ca63b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -210,6 +210,7 @@ struct options int strip; int pic; const char* wine_objdir; + const char* winebuild; const char* output_name; const char* image_base; const char* section_align; @@ -845,11 +846,17 @@ static const char* compile_to_object(struct options* opts, const char* file, con static strarray *get_winebuild_args(struct options *opts) { const char* winebuild = getenv("WINEBUILD"); + const char *binary = NULL; strarray *spec_args = strarray_alloc(); unsigned int i; - if (!winebuild) winebuild = "winebuild"; - strarray_add( spec_args, find_binary( opts->prefix, winebuild )); + if (opts->winebuild) + binary = opts->winebuild; + else if (opts->wine_objdir) + binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT ); + else + binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" ); + strarray_add( spec_args, binary ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" ); if (opts->target) @@ -860,10 +867,7 @@ static strarray *get_winebuild_args(struct options *opts) if (opts->prefix) { for (i = 0; i < opts->prefix->size; i++) - { - if (strendswith( opts->prefix->base[i], "/tools/winebuild" )) continue; strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); - } } if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); @@ -1352,6 +1356,22 @@ static void parse_target_option( struct options *opts, const char *target ) opts->target = xstrdup( target ); } +static int is_option( char **argv, int i, const char *option, const char **option_arg ) +{ + if (!strcmp( argv[i], option )) + { + if (!argv[i + 1]) error( "option %s requires an argument\n", argv[i] ); + *option_arg = argv[i + 1]; + return 1; + } + if (!strncmp( argv[i], option, strlen(option) ) && argv[i][strlen(option)] == '=') + { + *option_arg = argv[i] + strlen(option) + 1; + return 1; + } + return 0; +} + int main(int argc, char **argv) { int i, c, next_is_arg = 0, linking = 1; @@ -1438,6 +1458,8 @@ int main(int argc, char **argv) next_is_arg = (strcmp("--param", argv[i]) == 0 || strcmp("--sysroot", argv[i]) == 0 || strcmp("--target", argv[i]) == 0 || + strcmp("--wine-objdir", argv[i]) == 0 || + strcmp("--winebuild", argv[i]) == 0 || strcmp("--lib-suffix", argv[i]) == 0); break; } @@ -1474,19 +1496,6 @@ int main(int argc, char **argv) case 'B': str = strdup(option_arg); if (strendswith(str, "/")) str[strlen(str) - 1] = 0; - if (strendswith(str, "/tools/winebuild")) - { - char *objdir = strdup(str); - objdir[strlen(objdir) - sizeof("/tools/winebuild") + 1] = 0; - opts.wine_objdir = objdir; - /* don't pass it to the compiler, this generates warnings */ - raw_compiler_arg = raw_linker_arg = 0; - } - else if (!strcmp(str, "tools/winebuild")) - { - opts.wine_objdir = "."; - raw_compiler_arg = raw_linker_arg = 0; - } if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break; @@ -1659,22 +1668,26 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", argv[i]+1) == 0) linking = -1; - else if (!strncmp("--sysroot", argv[i], 9)) + else if (is_option( argv, i, "--sysroot", &option_arg )) + opts.sysroot = option_arg; + else if (is_option( argv, i, "--target", &option_arg )) { - if (argv[i][9] == '=') opts.sysroot = argv[i] + 10; - else opts.sysroot = argv[i + 1]; - if (opts.wine_objdir) raw_compiler_arg = raw_linker_arg = 0; + parse_target_option( &opts, option_arg ); + raw_compiler_arg = raw_linker_arg = 0; + } + else if (is_option( argv, i, "--wine-objdir", &option_arg )) + { + opts.wine_objdir = option_arg; + raw_compiler_arg = raw_linker_arg = 0; } - else if (!strncmp("--target", argv[i], 8)) + else if (is_option( argv, i, "--winebuild", &option_arg )) { - if (argv[i][8] == '=') parse_target_option( &opts, argv[i] + 9 ); - else parse_target_option( &opts, argv[i + 1] ); + opts.winebuild = option_arg; raw_compiler_arg = raw_linker_arg = 0; } - else if (!strncmp("--lib-suffix", argv[i], 12) && opts.wine_objdir) + else if (is_option( argv, i, "--lib-suffix", &option_arg )) { - if (argv[i][12] == '=') opts.lib_suffix = argv[i] + 13; - else opts.lib_suffix = argv[i + 1]; + opts.lib_suffix = option_arg; raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1703,7 +1716,6 @@ int main(int argc, char **argv) } } - if (opts.wine_objdir && opts.sysroot) opts.wine_objdir = opts.sysroot; if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n"); diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 3fcd6f95f3..5550767299 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -26,18 +26,17 @@ the gcc manual for more information on those options. .B gcc options: All gcc options are supported, and are passed along to the backend compiler. -.IP "\fB-B\fIprefix\fR" -This option specifies where to find the executables, libraries, -include files, and data files of the compiler itself. This is a -standard gcc option that has been extended to recognize a -\fIprefix\fR ending with '/tools/winebuild', in which case winegcc -enters a special mode for building Wine itself. Developers should -avoid prefixes ending with the magic suffix, or if that is not -possible, simply express it differently, such as '/tools/winebuild/', -to avoid the special behaviour. .IP "\fB-b,--target \fItarget\fR" Specify the target architecture triplet for cross-compiling. winegcc will then invoke \fItarget\fR-gcc instead of gcc. +.IP "\fB--wine-objdir \fIdir\fR" +Specify the Wine object directory. This is used when building Wine +itself, to use the includes and libraries from inside the build tree. +.IP "\fB--winebuild \fIname\fR" +Specifies the path and name of the \fBwinebuild\fR binary that will be +launched automatically by \fBwinegcc\fR. If not set, \fBwinegcc\fR +will look for a file named \fIwinebuild\fR in the path. This takes +precedence over the \fBWINEBUILD\fR environment variable. .IP \fB-fno-short-wchar\fR Override the underlying type for wchar_t to be the default for the target, instead of using short unsigned int, which is the default @@ -74,9 +73,8 @@ commas, it is split into multiple options at the commas. .TP .B WINEBUILD Specifies the path and name of the \fBwinebuild\fR binary that will be -launched automatically by \fBwinegcc\fR. -If not set, \fBwinegcc\fR will look for a file named \fIwinebuild\fR -in the path. +launched automatically by \fBwinegcc\fR. If not set, \fBwinegcc\fR +will look for a file named \fIwinebuild\fR in the path. .SH DEFINES winegcc defines __WINE__, for code that needs to know when it is being compiled under Wine. It also defines WIN32, _WIN32, __WIN32,

1 0

Alexandre Julliard : winegcc: Always search the standard include dirs.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 683e45549768145aeed80dca54b24b4e2484f543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683e45549768145aeed80dca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 15:53:28 2019 +0200 winegcc: Always search the standard include dirs. By analogy with the library dir search. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1af94ca63b..33dcad1e4c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -804,16 +804,26 @@ no_compat_defines: /* standard includes come last in the include search path */ if (!opts->wine_objdir && !opts->nostdinc) { + const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; + if (opts->use_msvcrt) { - strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", - gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); + for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) + { + if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", + gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + } strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, strmake( "-I%s%s", root, INCLUDEDIR )); - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", - gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); + for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) + { + if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; + strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", + gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + } } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );

1 0

Alexandre Julliard : winegcc: Pass all linker arguments also when testing link options.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: d63c51fd30ff9f782258da922c5965bc411ae6db URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63c51fd30ff9f782258da92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 19:27:09 2019 +0200 winegcc: Pass all linker arguments also when testing link options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 33dcad1e4c..b3a16ac001 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -322,10 +322,9 @@ static const char* build_tool_name(struct options *opts, const char* base, const return find_binary( opts->prefix, str ); } -static const strarray* get_translator(struct options *opts) +static strarray* get_translator(struct options *opts) { const char *str = NULL; - strarray *ret; switch(opts->processor) { @@ -342,10 +341,7 @@ static const strarray* get_translator(struct options *opts) default: assert(0); } - ret = strarray_fromstring( str, " " ); - if (opts->force_pointer_size) - strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); - return ret; + return strarray_fromstring( str, " " ); } static int try_link( const strarray *prefix, const strarray *link_tool, const char *cflags ) @@ -386,12 +382,10 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch static strarray *get_link_args( struct options *opts, const char *output_name ) { int use_wine_crt = opts->wine_builtin && opts->shared; - const strarray *link_tool = get_translator( opts ); + strarray *link_args = get_translator( opts ); strarray *flags = strarray_alloc(); - unsigned int i; - strarray_addall( flags, link_tool ); - for (i = 0; i < opts->linker_args->size; i++) strarray_add( flags, opts->linker_args->base[i] ); + strarray_addall( link_args, opts->linker_args ); if (verbose > 1) strarray_add( flags, "-v" ); @@ -412,7 +406,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); - return flags; + strarray_addall( link_args, flags ); + return link_args; case PLATFORM_SOLARIS: { @@ -463,45 +458,45 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) /* make sure we don't need a libgcc_s dll on Windows */ strarray_add( flags, "-static-libgcc" ); - return flags; + strarray_addall( link_args, flags ); + return link_args; default: if (opts->image_base) { - if (!try_link( opts->prefix, link_tool, strmake("-Wl,-Ttext-segment=%s", opts->image_base)) ) + if (!try_link( opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)) ) strarray_add( flags, strmake("-Wl,-Ttext-segment=%s", opts->image_base) ); else opts->prelink = PRELINK; } - if (!try_link( opts->prefix, link_tool, "-Wl,-z,max-page-size=0x1000")) + if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( flags, "-Wl,-z,max-page-size=0x1000"); break; } /* generic Unix shared library flags */ - strarray_add( flags, "-shared" ); - strarray_add( flags, "-Wl,-Bsymbolic" ); + strarray_add( link_args, "-shared" ); + strarray_add( link_args, "-Wl,-Bsymbolic" ); if (!opts->noshortwchar && opts->target_cpu == CPU_ARM) strarray_add( flags, "-Wl,--no-wchar-size-warning" ); /* Try all options first - this is likely to succeed on modern compilers */ - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " - "-Wl,-z,defs -Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) + if (!try_link( opts->prefix, link_args, "-Wl,-z,defs -Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) { strarray_add( flags, "-Wl,-z,defs" ); strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); } else /* otherwise figure out which ones are allowed */ { - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic -Wl,-z,defs" )) + if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) strarray_add( flags, "-Wl,-z,defs" ); - if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic " - "-Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) + if (!try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); } - return flags; + strarray_addall( link_args, flags ); + return link_args; } /* check that file is a library for the correct platform */ @@ -664,6 +659,8 @@ static void compile(struct options* opts, const char* lang) strarray* gpp; strarray_addall(comp_args, get_translator(opts)); + if (opts->force_pointer_size) + strarray_add( comp_args, strmake("-m%u", 8 * opts->force_pointer_size ) ); switch(opts->processor) { case proc_cpp: gcc_defs = 1; break;

1 0

Jacek Caban : winegcc: Use -print-libgcc-file-name to find libgcc.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 6cba24ef1f000ab2cc456a5d6f1d99ddd41d10bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cba24ef1f000ab2cc456a5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 13:57:57 2019 +0200 winegcc: Use -print-libgcc-file-name to find libgcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b3a16ac001..bdcbe45c4b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -96,6 +96,7 @@ #include <stdarg.h> #include <string.h> #include <errno.h> +#include <ctype.h> #include "utils.h" @@ -891,6 +892,49 @@ static char *find_static_lib( const char *dll ) return NULL; } +static const char *find_libgcc(const strarray *prefix, const strarray *link_tool) +{ + const char *out = get_temp_file( "find_libgcc", ".out" ); + const char *err = get_temp_file( "find_libgcc", ".err" ); + strarray *link = strarray_dup( link_tool ); + int sout = -1, serr = -1; + char *libgcc, *p; + struct stat st; + size_t cnt; + int ret; + + strarray_add( link, "-print-libgcc-file-name" ); + + sout = dup( fileno(stdout) ); + freopen( out, "w", stdout ); + serr = dup( fileno(stderr) ); + freopen( err, "w", stderr ); + ret = spawn( prefix, link, 1 ); + if (sout >= 0) + { + dup2( sout, fileno(stdout) ); + close( sout ); + } + if (serr >= 0) + { + dup2( serr, fileno(stderr) ); + close( serr ); + } + strarray_free( link ); + + if (ret || stat(out, &st) || !st.st_size) return NULL; + + libgcc = xmalloc(st.st_size + 1); + sout = open(out, O_RDONLY); + if (sout == -1) return NULL; + cnt = read(sout, libgcc, st.st_size); + close(sout); + libgcc[cnt] = 0; + if ((p = strchr(libgcc, '\n'))) *p = 0; + return libgcc; +} + + /* add specified library to the list of files */ static void add_library( struct options *opts, strarray *lib_dirs, strarray *files, const char *library ) { @@ -923,7 +967,7 @@ static void build(struct options* opts) strarray *lib_dirs, *files; strarray *spec_args, *link_args; char *output_file, *output_path; - const char *spec_o_name; + const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; const char* crt_lib = NULL; @@ -1147,6 +1191,12 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); + if ((opts->nodefaultlibs || opts->shared) && is_pe) + { + libgcc = find_libgcc(opts->prefix, link_args); + if (!libgcc) libgcc = "-lgcc"; + } + strarray_add(link_args, "-o"); strarray_add(link_args, output_path); @@ -1201,7 +1251,7 @@ static void build(struct options* opts) strarray_add(link_args, "-lc"); } - if ((opts->nodefaultlibs || opts->shared) && is_pe) strarray_add( link_args, "-lgcc" ); + if (libgcc) strarray_add(link_args, libgcc); spawn(opts->prefix, link_args, 0); strarray_free (link_args);

1 0

Zhiyi Zhang : winex11.drv: Initialize display devices before getting primary desktop rectangle.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: efbbe66669a060dd01b3ae399f5a9e7328312f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efbbe66669a060dd01b3ae39… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:54:31 2019 +0800 winex11.drv: Initialize display devices before getting primary desktop rectangle. Otherwise, the retrieved primary desktop might be from the last explorer instance if we launch new explorer instances before wine server fully shuts down. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ecbcd6b381..fed8dd32e9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -147,15 +147,18 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; + xinerama_init( width, height ); X11DRV_DisplayDevices_Init( TRUE ); + primary_rect = get_primary_monitor_rect(); + max_width = primary_rect.right - primary_rect.left; + max_height = primary_rect.bottom - primary_rect.top; + /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode,

1 0

Zhiyi Zhang : winex11.drv: Add virtual desktop display device handler.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: ec09dcf89594f459dd8d26f3ed2c312294b9911e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec09dcf89594f459dd8d26f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:54:50 2019 +0800 winex11.drv: Add virtual desktop display device handler. The virtual desktop display device handler is actually the Xinerama handler, but with a much higher priority. So that it will be preferred in virtual desktop mode when other display device handlers are introduced, e.g., the XRandR handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 370d34e9cd..8e08221343 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -304,6 +304,7 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; + BOOL desktop_mode = FALSE; int i; RECT rect; @@ -318,6 +319,7 @@ void xinerama_init( unsigned int width, unsigned int height ) query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; + desktop_mode = TRUE; } primary = get_primary(); @@ -334,8 +336,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - handler.name = "Xinerama"; - handler.priority = 100; + handler.name = desktop_mode ? "Desktop" : "Xinerama"; + handler.priority = desktop_mode ? 1000 : 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; handler.pGetMonitors = xinerama_get_monitors;

1 0