November 2023 - Wine-commits

Alexandre Julliard : wusa: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 5148911b818e385bc437ac7b256b7cef826f8065 URL: https://gitlab.winehq.org/wine/wine/-/commit/5148911b818e385bc437ac7b256b7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 17:55:39 2023 +0100 wusa: Remove DECLSPEC_HIDDEN usage. --- programs/wusa/wusa.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index e61fc025e09..dcc4850f10e 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -73,10 +73,10 @@ struct assembly_entry struct list registryops; }; -void free_assembly(struct assembly_entry *entry) DECLSPEC_HIDDEN; -void free_dependency(struct dependency_entry *entry) DECLSPEC_HIDDEN; -struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; -BOOL load_update(const WCHAR *filename, struct list *update_list) DECLSPEC_HIDDEN; +void free_assembly(struct assembly_entry *entry); +void free_dependency(struct dependency_entry *entry); +struct assembly_entry *load_manifest(const WCHAR *filename); +BOOL load_update(const WCHAR *filename, struct list *update_list); static inline char *strdupWtoA(const WCHAR *str) {

1 0

Alexandre Julliard : ntdll: Generate syscall entry points from the C code with asm macros.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 48a54598279c638070c890bd6a8be305b4bfda7d URL: https://gitlab.winehq.org/wine/wine/-/commit/48a54598279c638070c890bd6a8be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:06:33 2023 +0100 ntdll: Generate syscall entry points from the C code with asm macros. --- dlls/ntdll/signal_arm.c | 11 ++++- dlls/ntdll/signal_arm64.c | 10 ++++- dlls/ntdll/signal_i386.c | 11 +++++ dlls/ntdll/signal_x86_64.c | 10 +++++ include/wine/asm.h | 107 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 2 + 6 files changed, 149 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 9a9fc6483f1..475fd6afc34 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -31,7 +31,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -93,6 +93,15 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cb796141871..9ceb3540a38 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -33,7 +33,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -100,6 +100,14 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c4d0f0e6898..27a65f24076 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -33,6 +33,7 @@ #include "ntdll_misc.h" #include "wine/exception.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -71,6 +72,16 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher, PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler ); + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /******************************************************************* * is_valid_frame */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7f09ec0abea..f578d082b69 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -31,6 +31,7 @@ #include "wine/list.h" #include "ntdll_misc.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -79,6 +80,15 @@ struct MSVCRT_JUMP_BUFFER M128A Xmm15; }; + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/include/wine/asm.h b/include/wine/asm.h index 2a21bceb55e..a1a61532f44 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -192,4 +192,111 @@ #endif /* __i386__ */ +/* syscall support */ + +#ifdef __i386__ +# ifdef __PIC__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "call 1f\n" \ + "1:\tpopl %eax\n\t" \ + "movl " __ASM_NAME("__wine_syscall_dispatcher") "-1b(%eax),%edx\n\t" \ + "movl $(" #id "),%eax\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() +# else +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "movl $(" #id "),%eax\n\t" \ + "movl $" __ASM_NAME("__wine_syscall") ",%edx\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, "jmp *(" __ASM_NAME("__wine_syscall_dispatcher") ")" ) +# endif +#elif defined __aarch64__ +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + "mov x8, #(" #id ")\n\t" \ + "mov x9, x30\n\t" \ + "ldr x16, 1f\n\t" \ + "ldr x16, [x16]\n\t" \ + "blr x16\n\t" \ + "ret\n" \ + "1:\t.quad " __ASM_NAME("__wine_syscall_dispatcher") ) +#elif defined __x86_64__ +/* Chromium depends on syscall thunks having the same form as on + * Windows. For 64-bit systems the only viable form we can emulate is + * having an int $0x2e fallback. Since actually using an interrupt is + * expensive, and since for some reason Chromium doesn't actually + * validate that instruction, we can just put a jmp there instead. */ +# ifdef __WINE_PE_BUILD +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \ + ".long 0x7ffe1000\n\t" \ + "ret" ) +# else +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "nop\n" \ + "1:\tcallq *" __ASM_NAME("__wine_syscall_dispatcher") "(%rip)\n\t" \ + "ret" ) +# endif +#elif defined __arm__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r0-r3}\n\t" \ + "movw ip, #(" #id ")\n\t" \ + "mov r3, lr\n\t" \ + "bl " __ASM_NAME("__wine_syscall") "\n\t" \ + "bx lr" ) +# ifndef __PIC__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "movw r0, :lower16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "movt r0, :upper16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0" ) +# elif defined __thumb__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-4" ) +# else +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-8" ) +# endif +#endif + #endif /* __WINE_WINE_ASM_H */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e3bb8b7f3db..4a1146c8c9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1399,6 +1399,8 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; + if (!spec->syscall_table) return; + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i];

1 0

Alexandre Julliard : win32u: Generate syscall entry points from the C code with asm macros.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 2dda6a28946879947189cac272891336a3565264 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dda6a28946879947189cac2728913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:09:13 2023 +0100 win32u: Generate syscall entry points from the C code with asm macros. --- dlls/win32u/Makefile.in | 2 +- dlls/win32u/main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index a4730737db6..e3ba0db82be 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -6,7 +6,7 @@ IMPORTS = ntdll winecrt0 UNIX_CFLAGS = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) UNIX_LIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) -lm -EXTRADLLFLAGS = -nodefaultlibs -Wb,--syscall-table,1 +EXTRADLLFLAGS = -nodefaultlibs SOURCES = \ bitblt.c \ diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index d650483fb99..0489a95f1df 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -26,11 +26,27 @@ #include "winbase.h" #include "ntgdi.h" #include "wine/unixlib.h" +#include "wine/asm.h" +#include "win32syscalls.h" void *__wine_syscall_dispatcher = NULL; static unixlib_handle_t win32u_handle; +/******************************************************************* + * syscalls + */ +#ifdef _WIN64 +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id + 0x1000, name ) +ALL_SYSCALLS64 +#else +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id + 0x1000, name, args ) +DEFINE_SYSCALL_HELPER32() +ALL_SYSCALLS32 +#endif +#undef SYSCALL_ENTRY + + void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) { EXCEPTION_RECORD record;

1 0

Alexandre Julliard : winebuild: Stop generating syscall entry points.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: a255dd1f3c7179870b446c41cb195b60a80dfe43 URL: https://gitlab.winehq.org/wine/wine/-/commit/a255dd1f3c7179870b446c41cb195b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:27:48 2023 +0100 winebuild: Stop generating syscall entry points. --- tools/winebuild/build.h | 2 - tools/winebuild/import.c | 143 ----------------------------------------------- tools/winebuild/main.c | 15 ----- tools/winebuild/spec32.c | 1 - tools/winebuild/utils.c | 1 - 5 files changed, 162 deletions(-)

1 0

Daniel Lehman : msxml6/tests: Add tests for default namespace.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 6a7c53130f71d9c72a382b2da092304b6260ea60 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a7c53130f71d9c72a382b2da09230… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml6/tests: Add tests for default namespace. --- dlls/msxml6/tests/domdoc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 3aad799523d..0c156023b6b 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -67,6 +67,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; + BOOL todo; }; static const struct test tests[] = { @@ -99,6 +100,17 @@ static void test_namespaces_as_attributes(void) { L"nshref" }, /* text */ { L"xmlns:ns=\"nshref\"" }, /* xml */ }, + /* default namespace */ + { + L"<a xmlns=\"nshref\" />", 1, + { L"xmlns" }, /* nodeName */ + { NULL }, /* prefix */ + { L"xmlns" }, /* baseName */ + { L"http://www.w3.org/2000/xmlns/" }, /* namespaceURI */ + { L"nshref" }, /* text */ + { L"xmlns=\"nshref\"" }, /* xml */ + TRUE, /* todo */ + }, /* no properties or namespaces */ { L"<a />", 0, @@ -125,7 +137,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); + hr = IXMLDOMDocument2_get_firstChild(doc, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -145,7 +157,9 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str);

1 0

Rémi Bernon : evr: Set last presented sample atomically.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: wine Branch: master Commit: 8ffebcf4ab869bf1067b23f3a67eead0213494c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ffebcf4ab869bf1067b23f3a67eea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 17 21:28:10 2023 +0100 evr: Set last presented sample atomically. Fixes a race condition and crashes in Secret of Mana. The queue critical section is held in video_presenter_sample_present while GetCurrentImage only locks the presenter CS. Double locking is tricky and atomic operation is appropriate to swap the sample pointer. --- dlls/evr/presenter.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 2dc01608caf..eed6a84c83d 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -530,12 +530,9 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&queue->cs); - if (queue->last_presented) - IMFSample_Release(queue->last_presented); - queue->last_presented = sample; - IMFSample_AddRef(queue->last_presented); - LeaveCriticalSection(&queue->cs); + IMFSample_AddRef(sample); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, sample))) + IMFSample_Release(sample); IDirect3DSurface9_Release(surface); } @@ -752,6 +749,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) { + struct sample_queue *queue = &presenter->thread.queue; + IMFSample *sample; + if (!presenter->thread.hthread) return S_OK; @@ -762,8 +762,9 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) + IMFSample_Release(sample); + video_presenter_sample_queue_free(presenter); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1488,6 +1489,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + struct sample_queue *queue = &presenter->thread.queue; IDirect3DSurface9 *readback = NULL, *surface; D3DSURFACE_DESC surface_desc; D3DLOCKED_RECT mapped_rect; @@ -1500,10 +1502,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon EnterCriticalSection(&presenter->cs); - sample = presenter->thread.queue.last_presented; - presenter->thread.queue.last_presented = NULL; - - if (!sample) + if (!(sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) { hr = MF_E_INVALIDREQUEST; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: e55b6a7fa1cc93e4e53bf758d231c477e9c766c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e55b6a7fa1cc93e4e53bf758d231c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 16 01:14:09 2023 +0100 vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. --- libs/vkd3d-shader/hlsl.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 242e8307..c25b101a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3171,6 +3171,7 @@ static bool intrinsic_log(struct hlsl_ctx *ctx, /* ln(2) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); } @@ -3189,6 +3190,7 @@ static bool intrinsic_log10(struct hlsl_ctx *ctx, /* 1 / log2(10) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); }

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode().
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: 73c563ffb7f07d43f8fd768768558c3b280ce3dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73c563ffb7f07d43f8fd768768558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 17:57:58 2023 +0100 vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode(). This was broken by commit e390bc35e2c9b0a2110370f916033eea2366317e; that commit fixed the source count for these instructions, but didn't adjust shader_sm1_skip_opcode(). Note that this only affects shader model 1; later versions have a token count embedded in the initial opcode token. --- libs/vkd3d-shader/d3dbc.c | 8 ++++++++ tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 7e0eac6c..3d139416 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -855,6 +855,14 @@ static void shader_sm1_skip_opcode(const struct vkd3d_shader_sm1_parser *sm1, co { *ptr += 2; } + /* Somewhat similarly, DEF and DEFI have a single source, but need to read + * four tokens for that source. See shader_sm1_read_immconst(). + * Technically shader model 1 doesn't have integer registers or DEFI; we + * handle it here anyway because it's easy. */ + else if (opcode_info->vkd3d_opcode == VKD3DSIH_DEF || opcode_info->vkd3d_opcode == VKD3DSIH_DEFI) + { + *ptr += 3; + } *ptr += (opcode_info->dst_count + opcode_info->src_count); } diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 9fe5eec8..61c412c5 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -238,6 +238,13 @@ static void test_d3dbc(void) 0xfffe0100, /* vs_1_0 */ 0x0000ffff, /* end */ }; + static const uint32_t vs_dcl_def[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x0000ffff, /* end */ + }; static const uint32_t invalid_type[] = { 0x00010100, /* <invalid>_1_0 */ @@ -255,6 +262,10 @@ static void test_d3dbc(void) 0x0000ffff, /* end */ }; static const char expected[] = "vs_1_0\n"; + static const char expected_dcl_def[] = + "vs_1_1\n" + "dcl_position0 v0\n" + "def c0 = 1.00000000e+00, 0.00000000e+00, 0.00000000e+00, 1.00000000e+00\n"; info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; @@ -291,6 +302,15 @@ static void test_d3dbc(void) rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + info.source.code = vs_dcl_def; + info.source.size = sizeof(vs_dcl_def); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + ok(d3d_asm.size == strlen(expected_dcl_def), "Got unexpected size %zu.\n", d3d_asm.size); + ok(!memcmp(d3d_asm.code, expected_dcl_def, d3d_asm.size), "Got unexpected code \"%.*s\"\n", + (int)d3d_asm.size, (char *)d3d_asm.code); + vkd3d_shader_free_shader_code(&d3d_asm); + info.source.code = invalid_type; info.source.size = sizeof(invalid_type); rc = vkd3d_shader_compile(&info, &d3d_asm, NULL);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Expect two sources for LOOP in SM1-3.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: 849a8f3addcdda4c9cf59e5898ad1e7ead321ad6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/849a8f3addcdda4c9cf59e5898ad1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:30:12 2023 +0100 vkd3d-shader/ir: Expect two sources for LOOP in SM1-3. --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2a334399..b8cb6a41 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1716,7 +1716,7 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_LOOP: vsir_validate_dst_count(ctx, instruction, 0); - vsir_validate_src_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, ctx->parser->shader_version.major <= 3 ? 2 : 0); if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) return; ctx->blocks[ctx->depth++] = instruction->handler_idx;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate IFC instructions.
by Alexandre Julliard 20 Nov '23

20 Nov '23

Module: vkd3d Branch: master Commit: 5cb17cfd1c957a46fbe1d1053d2bd3f5502eb130 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5cb17cfd1c957a46fbe1d1053d2bd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:32:13 2023 +0100 vkd3d-shader/ir: Validate IFC instructions. --- libs/vkd3d-shader/ir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b8cb6a41..5c88946b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1696,6 +1696,14 @@ static void vsir_validate_instruction(struct validation_context *ctx) ctx->blocks[ctx->depth++] = instruction->handler_idx; break; + case VKD3DSIH_IFC: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 2); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = VKD3DSIH_IF; + break; + case VKD3DSIH_ELSE: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0);

1 0