February 2022 - Wine-commits

Eric Pouech : pstorec: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 5e4fb4b5e6bcc75706efc481b951a5bc1ffd710e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4fb4b5e6bcc75706efc481… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:13 2022 +0100 pstorec: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 1 - dlls/pstorec/pstorec.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index bc92381f7bf..62d06a759b4 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pstorec.dll IMPORTS = uuid diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 8d0293d7e44..44b417db9d2 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -78,7 +78,7 @@ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); return InterlockedIncrement( &This->ref ); } @@ -91,7 +91,7 @@ static ULONG WINAPI PStore_fnRelease(IPStore* iface) PStore_impl *This = impl_from_IPStore(iface); LONG ref; - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); ref = InterlockedDecrement( &This->ref ); if( !ref ) @@ -135,7 +135,7 @@ static HRESULT WINAPI PStore_fnSetProvParam( IPStore* This, static HRESULT WINAPI PStore_fnCreateType( IPStore* This, PST_KEY Key, const GUID* pType, PPST_TYPEINFO pInfo, DWORD dwFlags) { - FIXME("%p %08x %s %p(%d,%s) %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %p(%ld,%s) %08lx\n", This, Key, debugstr_guid(pType), pInfo, pInfo->cbSize, debugstr_w(pInfo->szDisplayName), dwFlags); return E_NOTIMPL; @@ -157,7 +157,7 @@ static HRESULT WINAPI PStore_fnGetTypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteType( IPStore* This, PST_KEY Key, const GUID* pType, DWORD dwFlags) { - FIXME("%p %d %s %08x\n", This, Key, debugstr_guid(pType), dwFlags); + FIXME("%p %ld %s %08lx\n", This, Key, debugstr_guid(pType), dwFlags); return E_NOTIMPL; } @@ -168,7 +168,7 @@ static HRESULT WINAPI PStore_fnCreateSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, PPST_TYPEINFO pInfo, PPST_ACCESSRULESET pRules, DWORD dwFlags) { - FIXME("%p %08x %s %s %p %p %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %s %p %p %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), pInfo, pRules, dwFlags); return E_NOTIMPL; } @@ -190,7 +190,7 @@ static HRESULT WINAPI PStore_fnGetSubtypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, DWORD dwFlags) { - FIXME("%p %u %s %s %08x\n", This, Key, + FIXME("%p %lu %s %s %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), dwFlags); return E_NOTIMPL; } @@ -255,7 +255,7 @@ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, DWORD *cbData, BYTE** pbData, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %p %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, pbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -269,7 +269,7 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, DWORD cbData, BYTE* ppbData, PPST_PROMPTINFO pPromptInfo, DWORD dwDefaultConfirmationStyle, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %ld %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, ppbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -282,7 +282,7 @@ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags ) { - FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + FIXME("(%p,%08lx,%s,%s,%s,%08lx,%p,%08lx) stub\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags); return E_NOTIMPL; } @@ -341,7 +341,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, { PStore_impl *ips; - TRACE("%p %s %p %08x\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); + TRACE("%p %s %p %08lx\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); ips = HeapAlloc( GetProcessHeap(), 0, sizeof (PStore_impl) ); if( !ips )

1 0

Eric Pouech : qmgr: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 13de3b2ea6357ef64840fa184e9ad9d3dd0dc4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13de3b2ea6357ef64840fa18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:19 2022 +0100 qmgr: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/Makefile.in | 1 - dlls/qmgr/enum_files.c | 8 ++++---- dlls/qmgr/enum_jobs.c | 8 ++++---- dlls/qmgr/file.c | 14 +++++++------- dlls/qmgr/job.c | 34 +++++++++++++++++----------------- dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/service.c | 6 +++--- 7 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13de3b2ea6357ef64840…

1 0

Eric Pouech : query: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 5a30d6791826ce4f3d1490cf3e745e561df94b3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a30d6791826ce4f3d1490cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:25 2022 +0100 query: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 1 - dlls/query/query_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 71352a5ff0f..8cdeb9c9765 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = query.dll IMPORTS = uuid diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index cc1eac596c7..9e27986e022 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -57,7 +57,7 @@ HRESULT WINAPI LocateCatalogsA(CHAR const *pwszScope, ULONG iBm, CHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_a(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } @@ -67,7 +67,7 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, WCHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_w(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; }

1 0

Eric Pouech : qwave: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 67d35e0342e4b5e93292f23f8b80c958de1c8b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d35e0342e4b5e93292f23f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:31 2022 +0100 qwave: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/Makefile.in | 1 - dlls/qwave/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index b75cbb05423..fee5602d7ba 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qwave.dll IMPORTLIB = qwave diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index fceb5c79503..a8755d993d1 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -39,7 +39,7 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) { - FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + FIXME("%p, %Ix, %p, %d, 0x%08lx, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; }

1 0

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

17 Feb '22

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

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

17 Feb '22

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/LibvirtTool: Remove the Windows desktop wallpaper.
by Alexandre Julliard 17 Feb '22

17 Feb '22

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

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

17 Feb '22

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

Francisco Casas : vkd3d-shader/hlsl: Move fold_constants() to a separate file.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: vkd3d Branch: master Commit: 812123ffbf30093c0ecdb62bac75fba9688a38e0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=812123ffbf30093c0ecdb62… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 10 21:48:19 2022 -0600 vkd3d-shader/hlsl: Move fold_constants() to a separate file. Also rename it to hlsl_fold_constants(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 133 +---------------------------- libs/vkd3d-shader/hlsl_constant_ops.c | 152 ++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=812123ffbf30093c0ec…

1 0

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

17 Feb '22

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