February 2022 - Wine-commits

Zebediah Figura : kernelbase: Allow usernames and passwords to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 932daf59c38b83a6baa12ad06bc1258ce52fc1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=932daf59c38b83a6baa12ad0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:09 2022 -0600 kernelbase: Allow usernames and passwords to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 52 +++++++----------------------------------------- dlls/shlwapi/tests/url.c | 27 +++++++++++-------------- 2 files changed, 19 insertions(+), 60 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfb37006da8..823fb51a68e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - USERPASS, }; static WCHAR *heap_strdupAtoW(const char *str) @@ -4175,42 +4174,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ *size = 0; break; - case USERPASS: - for (;;) - { - if (isalnum(*start) || - /* user/password only characters */ - (*start == ';') || - (*start == '?') || - (*start == '&') || - (*start == '=') || - /* *extra* characters */ - (*start == '!') || - (*start == '*') || - (*start == '\'') || - (*start == '(') || - (*start == ')') || - (*start == ',') || - /* *safe* characters */ - (*start == '$') || - (*start == '_') || - (*start == '+') || - (*start == '-') || - (*start == '.') || - (*start == ' ')) - { - start++; - (*size)++; - } - else if (*start == '%' && isxdigit(start[1]) && isxdigit(start[2])) - { - start += 3; - *size += 3; - } - else break; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4240,13 +4203,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; pl->username = work + 2; - work = scan_url(pl->username, &pl->username_len, USERPASS); - if (*work == ':' ) + work = parse_url_element( pl->username, L":@/\\?#" ); + pl->username_len = work - pl->username; + if (*work == ':') { - /* parse password */ - work++; - pl->password = work; - work = scan_url(pl->password, &pl->password_len, USERPASS); + pl->password = work + 1; + work = parse_url_element( pl->password, L"@/\\?#" ); + pl->password_len = work - pl->password; if (*work != '@') { /* what we just parsed must be the hostname and port @@ -4262,14 +4225,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) pl->password_len = 0; pl->password = 0; } - else if (!*work || *work == '/' || *work == '.') + else { /* what was parsed was hostname, so reset pointers and let it parse */ pl->username_len = pl->password_len = 0; work = pl->username - 1; pl->username = pl->password = 0; } - else goto ErrorExit; pl->hostname = work + 1; work = parse_url_element( pl->hostname, L":/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c4afb1375e9..18ff5021986 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -652,32 +652,32 @@ static void test_UrlGetPart(void) {"http://host:port:q", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q"}, - {"http://user:pass:q(a)host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, - {"http://user:pass:q(a)host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, + {"http://user:pass:q(a)host", URL_PART_USERNAME, 0, S_OK, "user"}, + {"http://user:pass:q(a)host", URL_PART_PASSWORD, 0, S_OK, "pass:q"}, {"http://user(a)host@q", URL_PART_USERNAME, 0, S_OK, "user"}, {"http://user(a)host@q", URL_PART_HOSTNAME, 0, S_OK, "host(a)q"}, {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host", .todo_result = TRUE}, + {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d", .todo_hr = TRUE}, - {"http://host#a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host", .todo_hr = TRUE}, + {"http://host#a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b(a)c:d", URL_PART_QUERY, 0, S_FALSE, ""}, /* All characters, other than those with special meaning, are allowed. */ {"http://foo:bar(a)google.*.com:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "google.*.com"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass(a)host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff(a)host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass(a)host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff(a)host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, @@ -837,7 +837,7 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if ((tests[i].todo_hr || tests[i].hr == S_FALSE) && !(strchr(url, '"') && part == URL_PART_USERNAME)) + todo_wine_if (tests[i].todo_hr || tests[i].hr == S_FALSE) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -880,11 +880,8 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (strchr(url, '"') && part == URL_PART_USERNAME) - { - ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); - ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); - } + ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); + ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); } winetest_pop_context();

1 0

Francois Gouget : testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: tools Branch: master Commit: d5be151028e0dab3e1d323e4e6a0fc9be2061118 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5be151028e0dab3e1d323e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:17 2022 +0100 testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM. Also rename ShutDown() to the more descriptive ShutDownIfOffSnapshot() and document it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a4ae7df..fad0727 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -279,7 +279,20 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } -sub ShutDown() +=pod +=over 12 + +=item C<ShutDownIfOffSnapshot()> + +Attempt a clean shutdown of the VM if it is running a snapshot that requests +them (snapshot name containing '-off'). + +Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was +already powered off or a shutdown was not needed. +=back +=cut + +sub ShutDownIfOffSnapshot() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); @@ -310,7 +323,7 @@ sub ShutDown() { Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); LogMsg "Successfully shut down $VMKey\n"; - return 1; + return 2; } sleep(1); } @@ -364,7 +377,7 @@ sub Monitor() if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) @@ -390,7 +403,7 @@ sub Monitor() sub PowerOff() { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; @@ -430,7 +443,7 @@ sub CheckOff() if ($SnapshotName eq $VM->IdleSnapshot) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); @@ -611,8 +624,10 @@ sub Revert() $VM->Save(); } - # Before reverting, try to perform a clean shutdown if requested - ShutDown(); + # Before reverting, try to perform a clean shutdown if requested. + # After a shutdown a small wait is also sometimes required, at least when + # switching from a PCI-passthrough configuration to a regular one. + sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n");

1 0

Francois Gouget : testbot/LibvirtTool: Skip creating the intermediate -live snapshot.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: tools Branch: master Commit: 93052eced61615df6d9acf5b4d4ef455c284b119 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93052eced61615df6d9acf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:19 2022 +0100 testbot/LibvirtTool: Skip creating the intermediate -live snapshot. Basing the localized snapshots on the plain -live snapshot is not very useful and skipping this intermediate step makes the code simpler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fad0727..3b2794f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -603,6 +603,7 @@ sub Revert() # Add some extra time to set up the VM locale and reboot it $ExtraTimeout += $VMToolTimeout; $SetLocale = "$1-$2"; + $CreateSnapshot = 1; Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); } if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) @@ -655,7 +656,7 @@ sub Revert() # 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 and !$SetLocale) + if (!$CreateSnapshot) { return 1 if (ChangeStatus("reverting", "sleeping")); } @@ -664,10 +665,22 @@ sub Revert() # reboot so reset start.count in that case. SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + # Set up the VM locale + if ($SetLocale) + { + Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); + push @Cmd, "--debug" if ($Debug); + if (system(@Cmd)) + { + FatalError("Could not set the $VMKey locale to $SetLocale\n"); + } + $Booting = 1; + } + if ($CreateSnapshot) { - $DomainSnapshot .= "-live"; - CreateSnapshot($Domain, $DomainSnapshot); + CreateSnapshot($Domain, $VM->IdleSnapshot); if ($VM->Type eq "build" or $VM->Type eq "wine") { @@ -686,23 +699,11 @@ sub Revert() Debug(Elapsed($Start), " Added a job to update and rebuild Wine on $VMKey\n"); } } - } - # Set up the VM locale - if ($SetLocale) - { - Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); - push @Cmd, "--debug" if ($Debug); - if (system(@Cmd)) - { - FatalError("Could not set the $VMKey locale to $SetLocale\n"); - } - - $DomainSnapshot .= "-$SetLocale"; - CreateSnapshot($Domain, $DomainSnapshot); + # The activity monitor does not like it when VMs skip the sleeping step + return 1 if (ChangeStatus("reverting", "sleeping")); } - elsif (!$CreateSnapshot) + else { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; @@ -711,12 +712,6 @@ sub Revert() sleep($Sleep); } - if ($CreateSnapshot or $SetLocale) - { - # The activity monitor does not like it when VMs skip the sleeping step - return 1 if (ChangeStatus("reverting", "sleeping")); - } - return ChangeStatus($CurrentStatus, "idle", "done"); }

1 0

Francois Gouget : testbot/LibvirtTool: Clean up the snapshot name parsing.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: tools Branch: master Commit: c960a95f6025538a9979b56cca652dc7a612615f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c960a95f6025538a9979b56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 15 05:03:22 2022 +0100 testbot/LibvirtTool: Clean up the snapshot name parsing. This also makes it easier to extend it and pass all the configuration around. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 95 +++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 3b2794f..d51699f 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-2019 Francois Gouget +# Copyright 2012-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -564,6 +564,27 @@ sub SetupTestAgentd($$$) $TA->Disconnect(); } +sub GetSnapshotConfig($) +{ + my ($Config) = @_; + + while (1) + { + if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) + { + $Config->{locale} = $1; + } + elsif ($Config->{base} =~ s/-(live)$//) + { + $Config->{$1} = 1; + } + else + { + last; + } + } +} + sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; @@ -591,35 +612,32 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; - my $DomainSnapshot = $VM->IdleSnapshot; - my $ExtraTimeout = 0; - my ($SetLocale, $CreateSnapshot); + my $Config = { base => $VM->IdleSnapshot }; my $Domain = $VM->GetDomain(); - if (($VM->Type eq "win32" or $VM->Type eq "win64") and - !$Domain->HasSnapshot($DomainSnapshot) and - $DomainSnapshot =~ s/-([a-z]{2})-([A-Z]{2})$//) - { - # Add some extra time to set up the VM locale and reboot it - $ExtraTimeout += $VMToolTimeout; - $SetLocale = "$1-$2"; - $CreateSnapshot = 1; - Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); - } - 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) + if (!$Domain->HasSnapshot($Config->{base})) { + $Config->{create} = 1; + GetSnapshotConfig($Config); + if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) + { + FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); + } + if (!$Config->{live}) + { + FatalError("Only live snapshots can be created ($VMKey)\n"); + } + if (!$Domain->HasSnapshot($Config->{base})) + { + FatalError("Could not find $VMKey\'s $Config->{base} snapshot\n"); + } + + # Extend the deadline to have time to set up the VM and (re)boot it. + # Add $WaitForBoot even if no reboot is needed in the end. + my $ExtraTimeout = $WaitForBoot + $VMToolTimeout; Debug(Elapsed($Start), " Extending the $VMKey revert deadline by ${ExtraTimeout}s\n"); + # ChildDeadline is undefined if the VM (or another sharing the same + # hypervisor domain) is in maintenance mode. my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout); $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save(); @@ -631,8 +649,8 @@ sub Revert() sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) - Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); - my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); + Debug(Elapsed($Start), " Reverting $VMKey to $Config->{base}\n"); + my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{base}); if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware @@ -645,40 +663,39 @@ sub Revert() FatalError("Could not power off $VMKey: $ErrMessage\n"); } - Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot... again\n"); - ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); + Debug(Elapsed($Start), " Reverting $VMKey to $Config->{base}... again\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($Config->{base}); } if (defined $ErrMessage) { - FatalError("Could not revert $VMKey to $DomainSnapshot: $ErrMessage\n"); + FatalError("Could not revert $VMKey to $Config->{base}: $ErrMessage\n"); } # 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) + if (!$Config->{create}) { return 1 if (ChangeStatus("reverting", "sleeping")); } # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + SetupTestAgentd($Booting, $Config->{create}, $Config->{locale}); # Set up the VM locale - if ($SetLocale) + if ($Config->{locale}) { - Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); + Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); push @Cmd, "--debug" if ($Debug); if (system(@Cmd)) { - FatalError("Could not set the $VMKey locale to $SetLocale\n"); + FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); } - $Booting = 1; } - if ($CreateSnapshot) + if ($Config->{create}) { CreateSnapshot($Domain, $VM->IdleSnapshot);

1 0

Paul Gofman : wined3d: Clear GL backbuffer in wined3d_context_gl_init().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: b36e4cfe2d7ceef6f6b672811d9481d6c23c0ac9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36e4cfe2d7ceef6f6b67281… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 11 18:42:28 2022 +0300 wined3d: Clear GL backbuffer in wined3d_context_gl_init(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9153b7fd95f..f8a96c8a10a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1897,7 +1897,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain_gl *swapchain_gl) + struct wined3d_swapchain_gl *swapchain_gl, BOOL *new_drawable) { enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; @@ -1920,6 +1920,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + *new_drawable = !GetPixelFormat(context_gl->dc); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -2018,7 +2020,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context } context_gl->dc_is_private = TRUE; - return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, new_drawable); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; @@ -2064,6 +2066,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; struct wined3d_device *device; + BOOL new_drawable; unsigned int i; TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); @@ -2142,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi sizeof(*context_gl->texture_type)))) goto fail; - if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) + if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, &new_drawable)) goto fail; /* Set up the context defaults. */ @@ -2299,6 +2302,14 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); checkGLcall("glScissor"); + if (new_drawable) + { + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(1.0f); + gl_info->gl_ops.gl.p_glClearStencil(0); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + checkGLcall("glClear"); + } return WINED3D_OK; fail:

1 0

Rémi Bernon : mf: Handle MESourceSeeked and MEStreamSeeked state change events.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 899ae42b206a8c2e462a789249e2c2f143d4a582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=899ae42b206a8c2e462a7892… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 11 14:53:07 2022 +0100 mf: Handle MESourceSeeked and MEStreamSeeked state change events. If a session is paused then started again, or if a start position is provided we wait forever for the source to send a MESourceStarted event, when it sends a MESourceSeeked instead. This causes a deadlock in Bright Memory: Infinite as the game then waits for the Start command to complete, while the session is stuck in the SESSION_STATE_STARTING_SOURCES state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++++++ dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 05b7af81df7..6ee3c454c6e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2295,6 +2295,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event { switch (event) { + case MESourceSeeked: + case MEStreamSeeked: case MESourceStarted: case MEStreamStarted: case MEStreamSinkStarted: @@ -2471,6 +2473,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn switch (event_type) { + case MESourceSeeked: case MESourceStarted: case MESourcePaused: case MESourceStopped: @@ -2485,6 +2488,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn } } break; + case MEStreamSeeked: case MEStreamStarted: case MEStreamPaused: case MEStreamStopped: @@ -3172,6 +3176,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM switch (event_type) { + case MESourceSeeked: + case MEStreamSeeked: + FIXME("Source/stream seeking, semi-stub!\n"); + /* fallthrough */ case MESourceStarted: case MESourcePaused: case MESourceStopped: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c70d8a9ca81..cabcc1b06b0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -942,6 +942,44 @@ static void test_source_resolver(void) video_stream = (IMFMediaStream *)var.punkVal; } + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceSeeked, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + + hr = IMFMediaSource_Stop(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStopped, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + sample_count = 10; for (i = 0; i < sample_count; ++i)

1 0

Zebediah Figura : wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: eb90d5db4f9bf92059d379d4fe0ea4a516db5e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb90d5db4f9bf92059d379d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 11 19:42:01 2022 -0600 wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 24 ++++++++++++----- dlls/wined3d/context_gl.c | 61 +++++++++++++++++++++++++----------------- dlls/wined3d/context_vk.c | 20 ++++++++++---- dlls/wined3d/directx.c | 9 +++++++ dlls/wined3d/wined3d_private.h | 9 +++++++ 5 files changed, 87 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb90d5db4f9bf92059d3…

1 0

Henri Verbeet : wined3d: Use the chunk allocator for GL vertex buffers.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: a13fc3bb7e055562b8b9deae985c64c5c7861424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13fc3bb7e055562b8b9deae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 11 19:42:02 2022 -0600 wined3d: Use the chunk allocator for GL vertex buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2a37834b706..c6816d97c63 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3139,6 +3139,7 @@ static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info { switch (binding) { + case GL_ARRAY_BUFFER: case GL_ATOMIC_COUNTER_BUFFER: case GL_DRAW_INDIRECT_BUFFER: case GL_PIXEL_UNPACK_BUFFER:

1 0

Zebediah Figura : wined3d: Keep a client reference count for the BO map pointer.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 831ff102008e2ba93a403344646b5ed67258eaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=831ff102008e2ba93a403344… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 11 19:42:03 2022 -0600 wined3d: Keep a client reference count for the BO map pointer. Currently this has no effect. Depending on whether wined3d_map_persistent() returns true, either the client thread doesn't access the map pointer outside of d3d map requests, or the BO is never unmapped. However, we'd like to be able to let NOOVERWRITE maps be accelerated while still being able to unmap arbitrary BOs at arbitrary times from the CS thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 11 +++++++++++ dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/cs.c | 38 ++++++++++++++++++++++++++++++++------ dlls/wined3d/device.c | 4 ++++ dlls/wined3d/wined3d_private.h | 15 +++++++++++++++ 6 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 53591cdcaa6..239cd7cca8d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -831,7 +831,18 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context return; } + wined3d_device_bo_map_lock(context_vk->c.device); + /* The mapping is still in use by the client (viz. for an accelerated + * NOOVERWRITE map). The client will trigger another unmap request when the + * d3d application requests to unmap the BO. */ + if (bo->b.client_map_count) + { + wined3d_device_bo_map_unlock(context_vk->c.device); + TRACE("BO %p is still in use by a client thread; not unmapping.\n", bo); + return; + } bo->b.map_ptr = NULL; + wined3d_device_bo_map_unlock(context_vk->c.device); if ((slab = bo->slab)) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c6816d97c63..23bac4de133 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2953,7 +2953,18 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context return; } + wined3d_device_bo_map_lock(context_gl->c.device); + /* The mapping is still in use by the client (viz. for an accelerated + * NOOVERWRITE map). The client will trigger another unmap request when the + * d3d application requests to unmap the BO. */ + if (bo->b.client_map_count) + { + wined3d_device_bo_map_unlock(context_gl->c.device); + TRACE("BO %p is still in use by a client thread; not unmapping.\n", bo); + return; + } bo->b.map_ptr = NULL; + wined3d_device_bo_map_unlock(context_gl->c.device); wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); @@ -3220,6 +3231,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->b.buffer_offset = buffer_offset; bo->b.memory_offset = bo->b.buffer_offset; bo->b.map_ptr = NULL; + bo->b.client_map_count = 0; return true; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 98610d65c5d..61056a7f8cb 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -463,6 +463,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; + bo->b.client_map_count = 0; bo->b.map_ptr = NULL; bo->b.buffer_offset = idx * object_size; bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; @@ -541,6 +542,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->b.client_map_count = 0; bo->b.map_ptr = NULL; bo->b.buffer_offset = 0; bo->size = size; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 27a597d0b74..ed8a41c778b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -20,6 +20,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); WINE_DECLARE_DEBUG_CHANNEL(fps); @@ -3079,7 +3080,7 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str struct wined3d_client_resource *client = &resource->client; struct wined3d_device *device = context->device; struct wined3d_bo_address addr; - const struct wined3d_bo *bo; + struct wined3d_bo *bo; uint8_t *map_ptr; if (flags & WINED3D_MAP_DISCARD) @@ -3095,13 +3096,29 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str addr = client->addr; } - bo = addr.buffer_object; - map_ptr = bo ? bo->map_ptr : NULL; + map_ptr = NULL; + if ((bo = addr.buffer_object)) + { + wined3d_device_bo_map_lock(device); + if ((map_ptr = bo->map_ptr)) + ++bo->client_map_count; + wined3d_device_bo_map_unlock(device); + + if (!map_ptr) + { + /* adapter_alloc_bo() should have given us a mapped BO if we are + * discarding. */ + assert(flags & WINED3D_MAP_NOOVERWRITE); + WARN_(d3d_perf)("Not accelerating a NOOVERWRITE map because the BO is not mapped.\n"); + return false; + } + } map_ptr += (uintptr_t)addr.addr; if (!map_ptr) { - TRACE("Sub-resource is not mapped.\n"); + assert(flags & WINED3D_MAP_NOOVERWRITE); + WARN_(d3d_perf)("Not accelerating a NOOVERWRITE map because the sub-resource has no valid address.\n"); return false; } @@ -3140,14 +3157,23 @@ static bool wined3d_bo_address_is_null(struct wined3d_const_bo_address *addr) } static bool wined3d_cs_unmap_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *bo) + unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *upload_bo) { struct wined3d_client_resource *client = &resource->client; + struct wined3d_device *device = context->device; + struct wined3d_bo *bo; if (wined3d_bo_address_is_null(&client->mapped_upload.addr)) return false; - *bo = client->mapped_upload; + if ((bo = client->mapped_upload.addr.buffer_object)) + { + wined3d_device_bo_map_lock(device); + --bo->client_map_count; + wined3d_device_bo_map_unlock(device); + } + + *upload_bo = client->mapped_upload; *box = client->mapped_box; memset(&client->mapped_upload, 0, sizeof(client->mapped_upload)); memset(&client->mapped_box, 0, sizeof(client->mapped_box)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09be992dd2f..4dac9220f0f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -246,6 +246,8 @@ void wined3d_device_cleanup(struct wined3d_device *device) wine_rb_destroy(&device->depth_stencil_states, device_leftover_depth_stencil_state, NULL); wine_rb_destroy(&device->so_descs, device_free_so_desc, NULL); + wined3d_lock_cleanup(&device->bo_map_lock); + wined3d_decref(device->wined3d); device->wined3d = NULL; } @@ -5971,6 +5973,8 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined goto err; } + wined3d_lock_init(&device->bo_map_lock, "wined3d_device.bo_map_lock"); + return WINED3D_OK; err: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd0a49db3b5..d0e4f0cdfaf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1605,10 +1605,13 @@ do { \ struct wined3d_bo { + /* client_map_count and map_ptr are accessed from both the client and CS + * threads, and protected by wined3d_device.bo_map_lock. */ struct list users; void *map_ptr; size_t buffer_offset; size_t memory_offset; + unsigned int client_map_count; bool coherent; }; @@ -3946,6 +3949,8 @@ struct wined3d_device /* Context management */ struct wined3d_context **contexts; UINT context_count; + + CRITICAL_SECTION bo_map_lock; }; void wined3d_device_cleanup(struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -3967,6 +3972,16 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN; +static inline void wined3d_device_bo_map_lock(struct wined3d_device *device) +{ + EnterCriticalSection(&device->bo_map_lock); +} + +static inline void wined3d_device_bo_map_unlock(struct wined3d_device *device) +{ + LeaveCriticalSection(&device->bo_map_lock); +} + struct wined3d_device_no3d { struct wined3d_device d;

1 0

Zebediah Figura : wined3d: Allow NOOVERWRITE maps to be accelerated on 32-bit architectures.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 30d670a7b9cd937eba6cb4d07ef4118dba57d3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30d670a7b9cd937eba6cb4d0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 11 19:42:04 2022 -0600 wined3d: Allow NOOVERWRITE maps to be accelerated on 32-bit architectures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/cs.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 50e3e9fe2b4..902ab720396 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,8 +1002,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - if (wined3d_map_persistent()) - buffer->resource.client.addr = addr; + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ed8a41c778b..63d8628cea7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3088,8 +3088,7 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) return false; - if (wined3d_map_persistent()) - client->addr = addr; + client->addr = addr; } else {

1 0