September 2019 - Wine-Commits

Francois Gouget : testbot/LibvirtTool: Create live snapshots as needed.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

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: Move the TestAgentd check to a separate function.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

Module: tools Branch: master Commit: 51f44f2c29d396162aa175f12394ba28e9236dc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51f44f2c29d396162aa175f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:09:49 2019 +0200 testbot/LibvirtTool: Move the TestAgentd check to a separate function. GetVersion() is equivalent to Ping() but can be used to perform version checks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4635443..dd330a5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,6 +365,23 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub SetupTestAgentd($$) +{ + my ($VM, $Booting) = @_; + + Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); + LogMsg "Setting up the $VMKey TestAgent server\n"; + my $TA = $VM->GetAgent(); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->Disconnect(); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -402,18 +419,8 @@ sub Revert() # The VM is now sleeping which may allow some tasks to run return 1 if (ChangeStatus("reverting", "sleeping")); - # Verify that the TestAgent server accepts connections - Debug(Elapsed($Start), " Verifying the TestAgent server\n"); - LogMsg "Verifying the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); - my $Success = $TA->Ping(); - $TA->Disconnect(); - if (!$Success) - { - $ErrMessage = $TA->GetLastError(); - FatalError("Cannot connect to the $VMKey TestAgent: $ErrMessage\n"); - } + # Set up the TestAgent server + SetupTestAgentd($VM, $Booting); if ($SleepAfterRevert != 0) {

1 0

Conor McCarthy : vkd3d: Make all descriptor reads and writes atomic.
by Alexandre Julliard Sept. 24, 2019

Sept. 24, 2019

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

Jacek Caban : scrobj: Create script hosts for scriptlet instance.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 03f89b60facaa59ad4532b902b304743140c0597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f89b60facaa59ad4532b90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:13 2019 +0200 scrobj: Create script hosts for scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 20 -------------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6b3b3ea6e8..251507ecf5 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -102,6 +102,7 @@ struct scriptlet_instance { IDispatchEx IDispatchEx_iface; LONG ref; + struct list hosts; }; struct script_host @@ -674,7 +675,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) + { + detach_script_hosts(&This->hosts); heap_free(This); + } return ref; } @@ -798,14 +802,29 @@ static IDispatchExVtbl DispatchExVtbl = { scriptlet_GetNameSpaceParent }; -static HRESULT create_scriptlet_instance(IDispatchEx **disp) +static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDispatchEx **disp) { + struct script_host *factory_host; struct scriptlet_instance *obj; + HRESULT hres; if (!(obj = heap_alloc(sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; + list_init(&obj->hosts); + + LIST_FOR_EACH_ENTRY(factory_host, &factory->hosts, struct script_host, entry) + { + hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts); + if (FAILED(hres)) break; + } + + if (FAILED(hres)) + { + IDispatchEx_Release(&obj->IDispatchEx_iface); + return hres; + } *disp = &obj->IDispatchEx_iface; return S_OK; @@ -1295,7 +1314,20 @@ static HRESULT WINAPI scriptlet_factory_CreateInstance(IClassFactory *iface, IUn if (outer) FIXME("outer not supported\n"); - hres = create_scriptlet_instance(&disp); + if (list_empty(&This->hosts)) + { + hres = create_scriptlet_hosts(This, &This->hosts); + if (FAILED(hres)) return hres; + + hres = parse_scripts(This, &This->hosts, FALSE); + if (FAILED(hres)) + { + detach_script_hosts(&This->hosts); + return hres; + } + } + + hres = create_scriptlet_instance(This, &disp); if (FAILED(hres)) return hres; hres = IDispatchEx_QueryInterface(disp, riid, ppv); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index f968fe21ce..ef80dfb7d4 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -778,15 +778,10 @@ static void test_create_object(void) SET_EXPECT(Clone); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -926,9 +921,7 @@ static void test_create_object(void) todo_wine SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); parse_flags = SCRIPTTEXT_ISVISIBLE; @@ -947,15 +940,10 @@ static void test_create_object(void) SET_EXPECT(ParseScriptText); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -975,9 +963,7 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); support_clone = TRUE; @@ -992,11 +978,8 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_STARTED); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -1014,14 +997,11 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); SET_EXPECT(Close); IClassFactory_Release(cf); - todo_wine CHECK_CALLED(Close); }

1 0

Alexandre Julliard : winegcc: Always search the standard include dirs.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

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: Add ARRAY_SIZE macro.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

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

Jacek Caban : winegcc: Use -print-libgcc-file-name to find libgcc.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

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: Support XRandR display device handler.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: be54adcffc249a44cb52c24320a7ad3db758ba54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be54adcffc249a44cb52c243… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:55:22 2019 +0800 winex11.drv: Support XRandR display device handler. XRandR supports multiple GPUs and runtime device change compared to Xinerama. 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> --- configure | 20 ++ configure.ac | 7 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 488 ++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 6 files changed, 519 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be54adcffc249a44cb52…

1 0

Zhiyi Zhang : winex11.drv: Handle XRandR display device changes.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 22795243b2d21e1a667215f54c3a15634735749c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22795243b2d21e1a667215f5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 20 16:55:40 2019 +0800 winex11.drv: Handle XRandR display device changes. 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/xrandr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index ad8438252f..2a1c7ce594 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; #endif #ifdef HAVE_XRRGETPROVIDERRESOURCES +MAKE_FUNCPTR(XRRSelectInput) MAKE_FUNCPTR(XRRGetOutputPrimary) MAKE_FUNCPTR(XRRGetProviderResources) MAKE_FUNCPTR(XRRFreeProviderResources) @@ -119,6 +120,7 @@ static int load_xrandr(void) #endif #ifdef HAVE_XRRGETPROVIDERRESOURCES + LOAD_FUNCPTR(XRRSelectInput) LOAD_FUNCPTR(XRRGetOutputPrimary) LOAD_FUNCPTR(XRRGetProviderResources) LOAD_FUNCPTR(XRRFreeProviderResources) @@ -1030,6 +1032,12 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } +static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +{ + X11DRV_DisplayDevices_Init( TRUE ); + return TRUE; +} + #endif void X11DRV_XRandR_Init(void) @@ -1077,6 +1085,15 @@ void X11DRV_XRandR_Init(void) handler.pGetMonitors = xrandr14_get_monitors; handler.pFreeMonitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); + + pXRRSelectInput( thread_init_display(), root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, + "XRandR ProviderChange" ); } #endif }

1 0

Zebediah Figura : wined3d: Fully clean up the device state in wined3d_device_uninit_3d().
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 90a03e79264c575ca743f2876ebb434490906e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a03e79264c575ca743f287… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 22 21:19:30 2019 -0500 wined3d: Fully clean up the device state in wined3d_device_uninit_3d(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92259e3ea5..c8fae1275c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -537,8 +537,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) ERR("Something's still holding the recording stateblock.\n"); device->recording = NULL; - state_cleanup(&device->state); - for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { heap_free(device->multistate_funcs[i]); @@ -1142,7 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - state_unbind_resources(&device->state); + state_cleanup(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);

1 0