February 2022 - Wine-Commits

Zebediah Figura : kernelbase: Get rid of the "size" and "type" arguments to scan_url().
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 6cb12645851108e2488675501f4ab90b8a35570e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb12645851108e248867550… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:41 2022 -0600 kernelbase: Get rid of the "size" and "type" arguments to scan_url(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index befdf237c5e..3fdc752938c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -74,11 +74,6 @@ struct parsed_url DWORD query_len; /* [out] size of Query (until eos) */ }; -enum url_scan_type -{ - SCHEME, -}; - static WCHAR *heap_strdupAtoW(const char *str) { WCHAR *ret = NULL; @@ -4158,28 +4153,11 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } -static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_type type) +static const WCHAR *parse_scheme( const WCHAR *p ) { - *size = 0; - - switch (type) - { - case SCHEME: - while ((isalnum( *start ) && !isupper( *start )) || *start == '+' || *start == '-' || *start == '.') - { - start++; - (*size)++; - } - if (*start != ':') - *size = 0; - break; - - default: - FIXME("unknown type %d\n", type); - return L""; - } - - return start; + while ((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '+' || *p == '-' || *p == '.') + ++p; + return p; } static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators ) @@ -4202,8 +4180,9 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) memset(pl, 0, sizeof(*pl)); pl->scheme = url; - work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); - if (!*work || (*work != ':')) return; + work = parse_scheme( pl->scheme ); + if (*work != ':') return; + pl->scheme_len = work - pl->scheme; work++; if (!is_slash( work[0] ) || !is_slash( work[1] )) return;

1 0

Rémi Bernon : winegstreamer: Introduce new WG_MAJOR_TYPE_WMA major type.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 76e2883c4ace29279dce8ea58787871046227b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e2883c4ace29279dce8ea5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:07 2022 +0100 winegstreamer: Introduce new WG_MAJOR_TYPE_WMA major type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 109 ++++++++++++++++++++++++++++++------- dlls/winegstreamer/quartz_parser.c | 8 +++ dlls/winegstreamer/unixlib.h | 12 ++++ dlls/winegstreamer/wg_format.c | 7 +++ dlls/winegstreamer/wm_reader.c | 8 +++ dlls/winegstreamer/wma_decoder.c | 18 ++++++ 6 files changed, 141 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76e2883c4ace29279dce…

1 0

Zebediah Figura : kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: b72f7afc8bd603179b1eb66ae67423e4fee8f6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72f7afc8bd603179b1eb66a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:40 2022 -0600 kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .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}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"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}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"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"},

1 0

Zebediah Figura : kernelbase: Allow schemes to contain uppercase characters in UrlGetPart().
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 91ae5ffe08fcb4166b422ad0404b7cf680d77eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ae5ffe08fcb4166b422ad0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:42 2022 -0600 kernelbase: Allow schemes to contain uppercase 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 | 15 +++++++++++++-- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3fdc752938c..0dba2098391 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4155,7 +4155,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par static const WCHAR *parse_scheme( const WCHAR *p ) { - while ((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '+' || *p == '-' || *p == '.') + while (isalnum( *p ) || *p == '+' || *p == '-' || *p == '.') ++p; return p; } @@ -4384,7 +4384,18 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p *out_len = size + 1; return E_POINTER; } - memcpy(out, addr, size*sizeof(WCHAR)); + + if (part == URL_PART_SCHEME) + { + unsigned int i; + + for (i = 0; i < size; ++i) + out[i] = tolower( addr[i] ); + } + else + { + memcpy( out, addr, size * sizeof(WCHAR) ); + } out[size] = 0; *out_len = size; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ae0d0738195..5c28142bc42 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -709,7 +709,7 @@ static void test_UrlGetPart(void) {"file://c:\\index.htm", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_FALSE, ""}, {"file:some text", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"index.htm", URL_PART_HOSTNAME, 0, E_FAIL}, - {"sChEmE-.+:", URL_PART_SCHEME, 0, S_OK, "scheme-.+", .todo_hr = TRUE}, + {"sChEmE-.+:", URL_PART_SCHEME, 0, S_OK, "scheme-.+"}, {"scheme_:", URL_PART_SCHEME, 0, S_FALSE, ""}, {"scheme :", URL_PART_SCHEME, 0, S_FALSE, ""}, {"sch eme:", URL_PART_SCHEME, 0, S_FALSE, ""},

1 0

Francois Gouget : testbot/LibvirtTool: Remove the Windows desktop wallpaper.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: tools Branch: master Commit: 423bbbb1797bed3ce92ae46e34422167422b17e8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=423bbbb1797bed3ce92ae46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 18:52:24 2022 +0100 testbot/LibvirtTool: Remove the Windows desktop wallpaper. Removing the Windows desktop wallpaper when preparing a live snapshot greatly reduces the size of the screenshots. This requires rebooting Windows independently from SetWinLocale. Note that the old WaitForBoot() code expected TestAgentd to initially be unreachable which is no longer the case since it may now be called when the TestAgentd is already running (before the reboot). The new code expects start.count to be reset to 0 before a reboot instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 61 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 62008b5..47839b6 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -279,18 +279,30 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } -sub Halt() +sub RunAndWait($$) { + my ($TA, $Cmd) = @_; + Debug(Elapsed($Start), " Running: @$Cmd\n"); + my $Ret = $TA->RunAndWait($Cmd, 0, 30); + Debug(Elapsed($Start), " $Cmd->[0] returned $Ret\n") if ($Ret); + return $Ret; +} + +sub Halt($$) +{ + my ($TA, $Reboot) = @_; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : - ["/sbin/shutdown", "--poweroff", "now"]; + ["shutdown.exe", ($Reboot ? "/r" : "/s"), "/d", "00:00", "/t", "0"] : + ["/sbin/shutdown", ($Reboot ? "--reboot" : "--poweroff"), "now"]; Debug(Elapsed($Start), " Running: @$Cmd\n"); - my $PTA = GetPrivilegedTA($VM->GetAgent()); + my $PTA = GetPrivilegedTA($TA); if (!$PTA->Run($Cmd, 0)) { Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; return 0; } + $TA->Disconnect(); return 1; } @@ -319,7 +331,7 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - return 0 if (!Halt()); + return 0 if (!Halt($VM->GetAgent(), 0)); Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); my $Deadline = time() + $WaitForShutdown; @@ -465,13 +477,18 @@ sub WaitForBoot($) Debug(Elapsed($Start), " Waiting for the VM to boot\n"); LogMsg "Waiting for $VMKey to boot\n"; - my $MinTimeout = $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$TA->GetVersion()) + + # Use small timeouts to avoid undue connection delays + my ($OneTimeout, $MinAttempts, $MinTimeout) = $TA->SetConnectTimeout(5, 1, 5); + my $Deadline = time() + $WaitForBoot; + while (time() <= $Deadline) { - my $ErrMessage = $TA->GetLastError(); - FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + my $Count = $TA->GetProperties("start.count"); + next if (!defined $Count); # Rebooting (TestAgentd is not running) + last if ($Count != 0); # start.count == 1 after the reboot + sleep(10); # Not rebooting yet } - $TA->SetConnectTimeout(undef, undef, $MinTimeout); + $TA->SetConnectTimeout($OneTimeout, $MinAttempts, $MinTimeout); } sub WaitForSession($) @@ -581,6 +598,7 @@ sub CreateSnapshot($$$$) { my ($Domain, $TA, $Config, $Booting) = @_; + my $Reboot; if ($VM->Type =~ /^win(?:32|64)$/) { my $Version = $TA->GetVersion(); @@ -618,6 +636,18 @@ sub CreateSnapshot($$$$) # --set-time-only which means it cannot be upgraded since the restart RPC # is blacklisted. But that also means it's unlikely to need upgrading. # A side effect is that it will force TestAgentd.exe.old to stay around. + + # Remove the Windows desktop wallpaper so we get smaller screenshots. + # On Vista+ these require a logout+login to take effect. + if (RunAndWait($TA, ["reg.exe", "delete", "HKEY_CURRENT_USER\\Control Panel\\Desktop", "/v", "Wallpaper", "/f"])) + { + FatalError("Could not reset the $VMKey Windows desktop wallpaper\n"); + } + if (RunAndWait($TA, ["reg.exe", "add", "HKEY_CURRENT_USER\\Control Panel\\Colors", "/v", "Background", "/t", "REG_SZ", "/d", "140 20 20", "/f"])) + { + FatalError("Could not reset the $VMKey Windows desktop background color\n"); + } + $Reboot = 1; } my @Locale; @@ -630,8 +660,9 @@ sub CreateSnapshot($$$$) if ($Config->{locale}) { push @Cmd, "--default", $Config->{locale}; - # SetWinLocale --default performs a reboot and WaitForBoot() + # SetWinLocale --default already performs a reboot and WaitForBoot() ResetBootCount($TA); + $Reboot = undef; $Booting = 1; } push @Cmd, "--utf8" if ($Config->{u8}); @@ -645,6 +676,14 @@ sub CreateSnapshot($$$$) } } + if ($Reboot) + { + # A reboot is still required for some changes to take effect + ResetBootCount($TA); + Halt($TA, "reboot"); + WaitForBoot($TA); + $Booting = 1; + } if ($Booting) { WaitForSession($TA);

1 0

Francois Gouget : testbot/LibvirtTool: Split off Halt() from ShutDown().
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: tools Branch: master Commit: f0d3ccebd11985d7e9ad0d29943aab43822c0922 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f0d3ccebd11985d7e9ad0d2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 18:52:22 2022 +0100 testbot/LibvirtTool: Split off Halt() from ShutDown(). Halt() does not wait for the VM to be powered off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 10af2f8..62008b5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -279,6 +279,21 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } +sub Halt() +{ + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running: @$Cmd\n"); + my $PTA = GetPrivilegedTA($VM->GetAgent()); + if (!$PTA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; + return 0; + } + return 1; +} + =pod =over 12 @@ -304,16 +319,7 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - my $PTA = GetPrivilegedTA($VM->GetAgent()); - if (!$PTA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; - return 0; - } + return 0 if (!Halt()); Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); my $Deadline = time() + $WaitForShutdown;

1 0

Francois Gouget : testbot/SetWinLocale: Simplify sending the Powershell script.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: tools Branch: master Commit: c255804dc5e16ad2123d52f23b37811a24dc3f0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=c255804dc5e16ad2123d52f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 10:16:03 2022 +0100 testbot/SetWinLocale: Simplify sending the Powershell script. Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 73c774e..670de46 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -662,20 +662,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinProperties($)

1 0

Francisco Casas : vkd3d-shader/hlsl: Cover all numeric types in constant folding operations.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: vkd3d Branch: master Commit: 73e27ced372b0c292e904d3fbd0df5b7e688c8d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73e27ced372b0c292e904d3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 16 22:00:47 2022 +0100 vkd3d-shader/hlsl: Cover all numeric types in constant folding operations. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_constant_ops.c | 331 ++++++++++++++++++++++++---------- 2 files changed, 232 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=73e27ced372b0c292e9…

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Fix floating point literals matching.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: vkd3d Branch: master Commit: a4ca0918883f877f6ce48cedeb4e6050fbb2c74f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a4ca0918883f877f6ce48ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 8 09:52:15 2022 +0300 vkd3d-shader/hlsl: Fix floating point literals matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl-initializer-numeric.shader_test | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index c1edfe7..267c8c3 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -192,7 +192,7 @@ row_major {return KW_ROW_MAJOR; } yylval->floatval = atof(yytext); return C_FLOAT; } -[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+[eE][+-]?[0-9]+[h|H|f|F]? { yylval->floatval = atof(yytext); return C_FLOAT; } diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 2fce390..4057688 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -33,3 +33,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = { 1e1, 1e-1, 1., 2.f }; + float4 bb = { .1, .1e1, .2f, 1.e-1f }; + return aa + bb; +} + +[test] +draw quad +probe all rgba (10.1, 1.1, 1.2, 2.1) 4

1 0

Francisco Casas : vkd3d-shader/hlsl: Move replace_node() to hlsl.c.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: vkd3d Branch: master Commit: 7b687751ccf3f2fd016e0b02f16c67ef7aa4bb41 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7b687751ccf3f2fd016e0b0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 10 21:48:18 2022 -0600 vkd3d-shader/hlsl: Move replace_node() to hlsl.c. Also rename it to hlsl_replace_node(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 25 ++++++------------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a0f4b0..a9a4277 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1400,6 +1400,20 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_remove(&old->entry); + hlsl_free_instr(old); +} + + void hlsl_free_type(struct hlsl_type *type) { struct hlsl_struct_field *field, *next_field; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3a69165..67fe1a8 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -713,6 +713,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); + void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513..77ddd97 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -224,19 +224,6 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } -static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) -{ - struct hlsl_src *src, *next; - - LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) - { - hlsl_src_remove(src); - hlsl_src_from_node(src, new); - } - list_remove(&old->entry); - hlsl_free_instr(old); -} - /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -267,7 +254,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -437,7 +424,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, list_add_before(&node->entry, &swizzle_node->node.entry); new_node = &swizzle_node->node; } - replace_node(node, new_node); + hlsl_replace_node(node, new_node); return true; } @@ -566,7 +553,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { - replace_node(&expr->node, expr->operands[0].node); + hlsl_replace_node(&expr->node, expr->operands[0].node); return true; } } @@ -708,7 +695,7 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -842,7 +829,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi } list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); + hlsl_replace_node(&expr->node, &res->node); return true; } @@ -862,7 +849,7 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i if (((swizzle->swizzle >> (2 * i)) & 3) != i) return false; - replace_node(instr, swizzle->val.node); + hlsl_replace_node(instr, swizzle->val.node); return true; }

1 0