January 2022 - Wine-devel - list.winehq.org

[PATCH] shlwapi: Fix some spec file entries (resend)
by André Zwing 31 Jan '22

31 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 68d0e7f8122..6926fd13835 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -257,7 +257,7 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(long long long long long str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) @@ -288,8 +288,8 @@ 288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) 290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) +291 stdcall -noname SHMessageBoxCheckExA(ptr ptr str ptr ptr long str) +292 stdcall -noname SHMessageBoxCheckExW(ptr ptr wstr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) @@ -488,7 +488,7 @@ 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.25.1

2 4

[PATCH] explorer: Only try to destroy the IShellWindows object if it exists
by Alex Henrie 31 Jan '22

31 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52494 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/explorer/explorer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index cb0d63fb688..8fa732d6c1a 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -671,8 +671,11 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: - IShellWindows_Revoke(info->sw, info->sw_cookie); - IShellWindows_Release(info->sw); + if(info->sw) + { + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + } IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser); -- 2.35.1

1 0

[PATCH] WIP/krnl386: When freeing task, also reset internal variable
by Fabian Maurer 30 Jan '22

30 Jan '22

This is a WIP patch fixing crashes in the win16 program Nota Bene. The crash is caused by alloc_win16_thunk calling GlobalAlloc16, GlobalLock16 and keeping the pinned address as "thunk_array". Later we have the following chain: TASK_DeleteTask -> GlobalFreeAll16 -> GlobalFree16 This deletes the buffer behind "thunk_array", but since it's not NULL wine will continue to use it, causing funny heap corruption issues. This patch fixes the issue and seems logically correct to me, though it's very ugly architecturally. Any hints on how we should handle this case properly? Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12732 --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 ++ dlls/krnl386.exe16/task.c | 9 +++++++++ dlls/user.exe16/message.c | 6 ++++++ include/wine/winbase16.h | 3 +++ 4 files changed, 20 insertions(+) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index d98e136c77e..a1e7db46c0f 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -751,3 +751,5 @@ # Snoop support 2001 pascal -register __wine_snoop_entry() 2002 pascal -register __wine_snoop_return() + +@ cdecl -arch=win32 __wine_set_taskkill_func(ptr) diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 30a40328c86..140b9190666 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -351,6 +351,12 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT return pTask; } +static wine_taskkill_func taskkill; + +void __wine_set_taskkill_func(wine_taskkill_func func) +{ + taskkill = func; +} /*********************************************************************** * TASK_DeleteTask @@ -382,6 +388,9 @@ static void TASK_DeleteTask( HTASK16 hTask ) /* the environment block and the thunk segments). */ GlobalFreeAll16( hPDB ); + + if (taskkill) + taskkill(); } diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b79b0cb7751..f5cadc5e387 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -144,6 +144,11 @@ static int winproc_to_index( WNDPROC16 handle ) return index; } +static void taskkill(void) +{ + thunk_array = 0; +} + /* allocate a 16-bit thunk for an existing window proc */ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { @@ -156,6 +161,7 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!thunk_array) /* allocate the array and its selector */ { + __wine_set_taskkill_func(taskkill); assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1d052130e33..338a2af4e9e 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -567,4 +567,7 @@ BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); #define CURRENT_SP (((WORD *)NtCurrentTeb()->SystemReserved1)[0]) #define CURRENT_SS (((WORD *)NtCurrentTeb()->SystemReserved1)[1]) +typedef void (*wine_taskkill_func)(void); +extern void __wine_set_taskkill_func(wine_taskkill_func func); + #endif /* __WINE_WINE_WINBASE16_H */ -- 2.34.1

2 3

[PATCH v2 1/3] ntdll: Implement wcsnlen().
by Zebediah Figura 30 Jan '22

30 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..afb945d4665 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1609,6 +1609,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a727e4defac..9422e4f676c 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -251,6 +251,17 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsnlen (NTDLL.@) + */ +size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) +{ + const WCHAR *s = str; + for (s = str; len && *s; s++, len--) ; + return s - str; +} + + /********************************************************************* * wcspbrk (NTDLL.@) */ -- 2.34.1

1 2

[PATCH 1/4] ntdll: Use str instead of ptr for the strnlen spec file entry.
by Zebediah Figura 30 Jan '22

30 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..7fc46231ae9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1581,7 +1581,7 @@ @ cdecl strncat(str str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) -@ cdecl strnlen(ptr long) +@ cdecl strnlen(str long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @ cdecl strspn(str str) -- 2.33.0

2 5

[PATCH] tiff: Explictly link to zlib.
by Zebediah Figura 30 Jan '22

30 Jan '22

This normally works because the only module linking to tiff (windowscodecs) also pulls in static zlib via PNG_PE_LIBS. However, if using shared libpng, windowscodecs will currently fail to link. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 425d267ec50..8578764ed5e 100755 --- a/configure +++ b/configure @@ -13359,7 +13359,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 if ${TIFF_PE_LIBS:+false} : then : - TIFF_PE_LIBS=tiff + TIFF_PE_LIBS="tiff \$(ZLIB_PE_LIBS)" if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" diff --git a/configure.ac b/configure.ac index fed12f61036..54ef47f767c 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,7 +1102,7 @@ WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") -WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") +WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") -- 2.33.0

1 0

[PATCH 1/5] include: Add ISymUnmanagedWriter definition.
by Esme Povirk 29 Jan '22

29 Jan '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- include/Makefile.in | 1 + include/corsym.idl | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 include/corsym.idl diff --git a/include/Makefile.in b/include/Makefile.in index 7fcf5f0ba7b..2f1e4767848 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -89,6 +89,7 @@ SOURCES = \ cordebug.idl \ corerror.h \ corhdr.h \ + corsym.idl \ cpl.h \ crtrow.idl \ cryptdlg.h \ diff --git a/include/corsym.idl b/include/corsym.idl new file mode 100644 index 00000000000..5faf32c0ddd --- /dev/null +++ b/include/corsym.idl @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +cpp_quote("#if 0") +/* defined in corhdr.h */ +typedef UINT32 mdToken; +typedef mdToken mdMethodDef; +typedef mdToken mdTypeDef; +/* defined in winnt.h */ +typedef SIZE_T IMAGE_DEBUG_DIRECTORY; +cpp_quote("#endif") + +[ + object, + uuid(b01fafeb-c450-3a4d-beec-b4ceec01e006), + pointer_default(unique) +] +interface ISymUnmanagedDocumentWriter : IUnknown +{ + HRESULT SetSource([in] ULONG32 sourceSize, [in, size_is(sourceSize)] BYTE source[]); + HRESULT SetCheckSum([in] GUID algorithmId, + [in] ULONG32 checkSumSize, [in, size_is(checkSumSize)] BYTE checkSum[]); +} + +[ + object, + uuid(ed14aa72-78e2-4884-84e2-334293ae5214), + pointer_default(unique) +] +interface ISymUnmanagedWriter : IUnknown +{ + HRESULT DefineDocument([in] const WCHAR *url, [in] const GUID *language, [in] const GUID *languageVendor, + [in] const GUID *documentType, [out, retval] ISymUnmanagedDocumentWriter** pRetVal); + HRESULT SetUserEntryPoint([in] mdMethodDef entryMethod); + HRESULT OpenMethod([in] mdMethodDef method); + HRESULT CloseMethod(); + HRESULT OpenScope([in] ULONG32 startOffset, [out, retval] ULONG32 *pRetVal); + HRESULT CloseScope([in] ULONG32 endOffset); + HRESULT SetScopeRange([in] ULONG32 scopeID, [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineLocalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3, + [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineParameter([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 sequence, + [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineField([in] mdTypeDef parent, [in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineGlobalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT Close(); + HRESULT SetSymAttributes([in] mdToken parent, [in] const WCHAR *name, + [in] ULONG32 cData, [in, size_is(cData)] unsigned char data[]); + HRESULT OpenNamespace([in] const WCHAR *name); + HRESULT CloseNamespace(); + HRESULT UsingNamespace([in] const WCHAR *fullName); + HRESULT SetMethodSourceRange([in] ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, + [in] ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn); + HRESULT Initialize([in] IUnknown *emitter, [in] const WCHAR *filename, [in] IStream *pIStream, + [in] BOOL fFullBuild); + HRESULT GetDebugInfo([in, out] IMAGE_DEBUG_DIRECTORY *pIDD, [in] DWORD cData, [out] DWORD *pcData, + [out, size_is(cData), length_is(*pcData)] BYTE data[]); + HRESULT DefineSequencePoints([in] ISymUnmanagedDocumentWriter *document, [in] ULONG32 spCount, + [in, size_is(spCount)] ULONG32 offsets[], [in, size_is(spCount)] ULONG32 lines[], + [in, size_is(spCount)] ULONG32 columns[], [in, size_is(spCount)] ULONG32 endLines[], + [in, size_is(spCount)] ULONG32 endColumns[]); + HRESULT RemapToken([in] mdToken oldToken, [in] mdToken newToken); + HRESULT Initialize2([in] IUnknown *emitter, [in] const WCHAR *tempFilename, [in] IStream *pIStream, + [in] BOOL fFullBuild, [in] const WCHAR *finalFilename); + HRESULT DefineConstant([in] const WCHAR *name, [in] VARIANT value, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[]); + HRESULT Abort(); +} + +cpp_quote("DEFINE_GUID(CLSID_CorSymWriter_SxS, 0x0ae2deb0,0xf901,0x478b,0xbb,0x9f,0x88,0x1e,0xe8,0x06,0x67,0x88);") + -- 2.30.2

2 6

Wine staging 7.1 release
by Alistair Leslie-Hughes 28 Jan '22

28 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.1 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [49412] ws2_32: Support WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY * [49678] xactengine: Implement callback notifications. * [44514] wined3d: Use bindless textures for GLSL shaders. Updated: * nvcuda-CUDA_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH vkd3d v2 1/3] vkd3d-shader/hlsl: Handle branches in copy propagation.
by Giovanni Mascellani 28 Jan '22

28 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- v2 (well, I don't remember which version number we were, but it was over a month ago, so I'll restart over): * differentiate between a value that was not written in a scope and a value that was dynamically written (i.e., we don't know statically which node the written value came from); Maybe "statically" and "dynamically" are not as understandable as possible, I'm open to suggestions. --- libs/vkd3d-shader/hlsl_codegen.c | 176 +++++++++++++++++++++++++++---- 1 file changed, 154 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..1c334f88 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -274,8 +274,16 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; } +enum copy_propagation_value_state +{ + VALUE_STATE_NOT_WRITTEN = 0, + VALUE_STATE_STATICALLY_WRITTEN, + VALUE_STATE_DYNAMICALLY_WRITTEN, +}; + struct copy_propagation_value { + enum copy_propagation_value_state state; struct hlsl_ir_node *node; unsigned int component; }; @@ -290,6 +298,7 @@ struct copy_propagation_var_def struct copy_propagation_state { struct rb_tree var_defs; + struct copy_propagation_state *parent; }; static int copy_propagation_var_def_compare(const void *key, const struct rb_entry *entry) @@ -307,15 +316,23 @@ static void copy_propagation_var_def_destroy(struct rb_entry *entry, void *conte vkd3d_free(var_def); } -static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy_propagation_state *state, - struct hlsl_ir_var *var) +static struct copy_propagation_value *copy_propagation_get_value(struct copy_propagation_state *state, + struct hlsl_ir_var *var, unsigned component) { - struct rb_entry *entry = rb_get(&state->var_defs, var); + for (; state; state = state->parent) + { + struct rb_entry *entry = rb_get(&state->var_defs, var); + if (entry) + { + struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + assert(component < var_def->var->data_type->reg_size); - if (entry) - return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); - else - return NULL; + if (var_def->values[component].state != VALUE_STATE_NOT_WRITTEN) + return &var_def->values[component]; + } + } + + return NULL; } static struct copy_propagation_var_def *copy_propagation_create_var_def(struct hlsl_ctx *ctx, @@ -339,10 +356,35 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h return var_def; } +static void copy_propagation_invalidate_variable(struct copy_propagation_var_def *var_def, + unsigned offset, unsigned char writemask) +{ + unsigned i; + + TRACE("Invalidate variable %s[%u]%s.\n", var_def->var->name, offset, debug_hlsl_writemask(writemask)); + + for (i = 0; i < 4; ++i) + { + if (writemask & (1u << i)) + { + memset(&var_def->values[offset + i], 0, sizeof(var_def->values[offset + i])); + var_def->values[offset + i].state = VALUE_STATE_DYNAMICALLY_WRITTEN; + } + } +} + static void copy_propagation_invalidate_whole_variable(struct copy_propagation_var_def *var_def) { + unsigned i; + TRACE("Invalidate variable %s.\n", var_def->var->name); + memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); + + for (i = 0; i < var_def->var->data_type->reg_size; ++i) + { + var_def->values[i].state = VALUE_STATE_DYNAMICALLY_WRITTEN; + } } static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, unsigned int offset, @@ -356,29 +398,35 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, { TRACE("Variable %s[%u] is written by instruction %p%s.\n", var_def->var->name, offset + i, node, debug_hlsl_writemask(1u << i)); + var_def->values[offset + i].state = VALUE_STATE_STATICALLY_WRITTEN; var_def->values[offset + i].node = node; var_def->values[offset + i].component = j++; } } } -static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *var_def, - unsigned int offset, unsigned int count, unsigned int *swizzle) +static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_state *state, + struct hlsl_ir_var *var, unsigned int offset, unsigned int count, unsigned int *swizzle) { struct hlsl_ir_node *node = NULL; unsigned int i; - assert(offset + count <= var_def->var->data_type->reg_size); + assert(offset + count <= var->data_type->reg_size); *swizzle = 0; for (i = 0; i < count; ++i) { + struct copy_propagation_value *value = copy_propagation_get_value(state, var, offset + i); + + if (!value || value->state != VALUE_STATE_STATICALLY_WRITTEN) + return NULL; + if (!node) - node = var_def->values[offset + i].node; - else if (node != var_def->values[offset + i].node) + node = value->node; + else if (node != value->node) return NULL; - *swizzle |= var_def->values[offset + i].component << i * 2; + *swizzle |= value->component << i * 2; } return node; @@ -388,7 +436,6 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l struct copy_propagation_state *state) { struct hlsl_ir_node *node = &load->node, *new_node; - struct copy_propagation_var_def *var_def; struct hlsl_type *type = node->data_type; struct hlsl_ir_swizzle *swizzle_node; struct hlsl_deref *src = &load->src; @@ -401,10 +448,7 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l if (!hlsl_offset_from_deref(src, &offset)) return false; - if (!(var_def = copy_propagation_get_var_def(state, var))) - return false; - - if (!(new_node = copy_propagation_compute_replacement(var_def, offset, type->dimx, &swizzle))) + if (!(new_node = copy_propagation_compute_replacement(state, var, offset, type->dimx, &swizzle))) { TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + type->dimx); return false; @@ -436,6 +480,94 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s copy_propagation_invalidate_whole_variable(var_def); } +static void copy_propagation_state_init(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct copy_propagation_state *parent) +{ + rb_init(&state->var_defs, copy_propagation_var_def_compare); + state->parent = parent; +} + +static void copy_propagation_state_destroy(struct copy_propagation_state *state) +{ + rb_destroy(&state->var_defs, copy_propagation_var_def_destroy, NULL); +} + +static void copy_propagation_invalidate_from_block(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct hlsl_block *block) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_STORE: + { + struct hlsl_ir_store *store = hlsl_ir_store(instr); + struct copy_propagation_var_def *var_def; + struct hlsl_deref *lhs = &store->lhs; + struct hlsl_ir_var *var = lhs->var; + unsigned int offset; + + if (!(var_def = copy_propagation_create_var_def(ctx, state, var))) + continue; + + if (hlsl_offset_from_deref(lhs, &offset)) + copy_propagation_invalidate_variable(var_def, offset, store->writemask); + else + copy_propagation_invalidate_whole_variable(var_def); + + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + + copy_propagation_invalidate_from_block(ctx, state, &loop->body); + + break; + } + + default: + break; + } + } +} + +static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct copy_propagation_state *state); + +static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if *iff, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + bool progress = false; + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->then_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->else_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + return progress; +} + static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct copy_propagation_state *state) { @@ -455,8 +587,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b break; case HLSL_IR_IF: - FIXME("Copy propagation doesn't support conditionals yet, leaving.\n"); - return progress; + progress |= copy_propagation_process_if(ctx, hlsl_ir_if(instr), state); + break; case HLSL_IR_LOOP: FIXME("Copy propagation doesn't support loops yet, leaving.\n"); @@ -475,11 +607,11 @@ static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *bl struct copy_propagation_state state; bool progress; - rb_init(&state.var_defs, copy_propagation_var_def_compare); + copy_propagation_state_init(ctx, &state, NULL); progress = copy_propagation_transform_block(ctx, block, &state); - rb_destroy(&state.var_defs, copy_propagation_var_def_destroy, NULL); + copy_propagation_state_destroy(&state); return progress; } -- 2.34.1

3 6

[PATCH] widl: Fix finding standalone tlb files for PE importlib.
by Jacek Caban 28 Jan '22

28 Jan '22

From: Tom Ritter <tom(a)ritter.vg> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1