June 2020 - Wine-commits - list.winehq.org

Paul Gofman : ntoskrnl/tests: Add test for WskAccept().
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 7f34362d85c58652bc7537580172abaf629bbc6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f34362d85c58652bc753758… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 17 20:22:00 2020 +0300 ntoskrnl/tests: Add test for WskAccept(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/driver4.c | 116 ++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 37 +++++++++++- 3 files changed, 148 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f34362d85c58652bc75…

1 0

Louis Lenders : ws2_32: Add FreeAddrInfoEx.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 6d1fea9711d5062fdcfe5043091451c8aec56023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d1fea9711d5062fdcfe5043… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jun 17 00:43:22 2020 +0200 ws2_32: Add FreeAddrInfoEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48256 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8744602564..402ee86d96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7268,6 +7268,24 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoEx (WS2_32.@) + */ +void WINAPI FreeAddrInfoEx(ADDRINFOEXA *ai) +{ + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXA *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } +} + /*********************************************************************** * FreeAddrInfoExW (WS2_32.@) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index d3c1e6214a..87e0bdfa2f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoEx(ptr) @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExCancel(ptr) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 43c277fa0c..5a444dcb5f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -177,7 +177,11 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoEx(ADDRINFOEXA*); void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); +#ifdef UNICODE +#define FreeAddrInfoEx FreeAddrInfoExW +#endif int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);

1 0

Alexandre Julliard : ntdll: Move the remaining process functions to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 44a230937b6dc320aad8b18828060e3e916eee03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a230937b6dc320aad8b188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 09:05:30 2020 +0200 ntdll: Move the remaining process functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 3 - dlls/ntdll/process.c | 234 ++--------------------------------------- dlls/ntdll/unix/loader.c | 5 + dlls/ntdll/unix/process.c | 95 +++++++++++++++-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 35 ++++++ dlls/ntdll/unixlib.h | 10 +- include/winternl.h | 3 + 8 files changed, 145 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44a230937b6dc320aad8…

1 0

Alexandre Julliard : ntdll: Move the thread get/set information functions to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: e84ec36a620a4922ddcb9cdce9ddabc2573ee1da URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84ec36a620a4922ddcb9cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 12:37:50 2020 +0200 ntdll: Move the thread get/set information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/process.c | 7 - dlls/ntdll/thread.c | 436 +-------------------------------------- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- dlls/ntdll/unix/thread.c | 440 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 73 +++++-- dlls/ntdll/unixlib.h | 8 +- 13 files changed, 514 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e84ec36a620a4922ddcb…

1 0

Alexandre Julliard : ntdll: Move the WoW64 thread context functions to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 2e6a2cf9c65e92db51edfdec6fbace8e49e90c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6a2cf9c65e92db51edfdec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 13:27:10 2020 +0200 ntdll: Move the WoW64 thread context functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/signal_x86_64.c | 168 +-------------------------------------- dlls/ntdll/thread.c | 60 -------------- dlls/ntdll/unix/thread.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e6a2cf9c65e92db51ed…

1 0

Alexandre Julliard : ntdll: Move the image address initialization to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: a0b7fb9bb2a6f446a0018a89bd8b50f756a0fe1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b7fb9bb2a6f446a0018a89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 14:14:19 2020 +0200 ntdll: Move the image address initialization to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 76 ------------------------------------------ dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 3 +- dlls/ntdll/unix/virtual.c | 1 + 4 files changed, 43 insertions(+), 77 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e60018fb47..7329aa177b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -25,15 +25,6 @@ #include <stdarg.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -#ifdef HAVE_SYS_TIMES_H -#include <sys/times.h> -#endif -#ifdef HAVE_SYS_SYSCALL_H -#include <sys/syscall.h> -#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -67,72 +58,6 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; -#ifdef __linux__ - -#ifdef HAVE_ELF_H -# include <elf.h> -#endif -#ifdef HAVE_LINK_H -# include <link.h> -#endif -#ifdef HAVE_SYS_AUXV_H -# include <sys/auxv.h> -#endif -#ifndef HAVE_GETAUXVAL -static unsigned long getauxval( unsigned long id ) -{ - extern char **__wine_main_environ; - char **ptr = __wine_main_environ; - ElfW(auxv_t) *auxv; - - while (*ptr) ptr++; - while (!*ptr) ptr++; - for (auxv = (ElfW(auxv_t) *)ptr; auxv->a_type; auxv++) - if (auxv->a_type == id) return auxv->a_un.a_val; - return 0; -} -#endif - -static ULONG_PTR get_image_addr(void) -{ - ULONG_PTR size, num, phdr_addr = getauxval( AT_PHDR ); - ElfW(Phdr) *phdr; - - if (!phdr_addr) return 0; - phdr = (ElfW(Phdr) *)phdr_addr; - size = getauxval( AT_PHENT ); - num = getauxval( AT_PHNUM ); - while (num--) - { - if (phdr->p_type == PT_PHDR) return phdr_addr - phdr->p_offset; - phdr = (ElfW(Phdr) *)((char *)phdr + size); - } - return 0; -} - -#elif defined(__APPLE__) -#include <mach/mach.h> -#include <mach/mach_error.h> - -static ULONG_PTR get_image_addr(void) -{ - ULONG_PTR ret = 0; -#ifdef TASK_DYLD_INFO - struct task_dyld_info dyld_info; - mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; - if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) - ret = dyld_info.all_image_info_addr; -#endif - return ret; -} - -#else -static ULONG_PTR get_image_addr(void) -{ - return 0; -} -#endif - /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) @@ -204,7 +129,6 @@ TEB *thread_init( SIZE_T *info_size, BOOL *suspend ) InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); - *(ULONG_PTR *)peb->Reserved = get_image_addr(); /* * Starting with Vista, the first user to log on has session id 1. diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 091951163d..4ae51cb2f4 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -33,6 +33,15 @@ #ifdef HAVE_PWD_H # include <pwd.h> #endif +#ifdef HAVE_ELF_H +# include <elf.h> +#endif +#ifdef HAVE_LINK_H +# include <link.h> +#endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif @@ -53,6 +62,8 @@ # undef LoadResource # undef GetCurrentThread # include <pthread.h> +# include <mach/mach.h> +# include <mach/mach_error.h> # include <mach-o/getsect.h> # include <crt_externs.h> # include <spawn.h> @@ -829,6 +840,35 @@ static HMODULE load_ntdll(void) } +/*********************************************************************** + * get_image_address + */ +ULONG_PTR get_image_address(void) +{ +#ifdef HAVE_GETAUXVAL + ULONG_PTR size, num, phdr_addr = getauxval( AT_PHDR ); + ElfW(Phdr) *phdr; + + if (!phdr_addr) return 0; + phdr = (ElfW(Phdr) *)phdr_addr; + size = getauxval( AT_PHENT ); + num = getauxval( AT_PHNUM ); + while (num--) + { + if (phdr->p_type == PT_PHDR) return phdr_addr - phdr->p_offset; + phdr = (ElfW(Phdr) *)((char *)phdr + size); + } +#elif defined(__APPLE__) && defined(TASK_DYLD_INFO) + struct task_dyld_info dyld_info; + mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; + + if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) + return dyld_info.all_image_info_addr; +#endif + return 0; +} + + /*********************************************************************** * unix_funcs */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index dbd8ce3152..9904ef7bfd 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -142,11 +142,12 @@ extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dst extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, int is_child_64bit, ULONGLONG res_start, ULONGLONG res_end ) DECLSPEC_HIDDEN; +extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; +extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; -extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, user_apc_t *user_apc ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a32059f019..6166507871 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2587,6 +2587,7 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb, 0, &teb_size, MEM_COMMIT, PAGE_READWRITE ); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); init_teb( teb, peb ); + *(ULONG_PTR *)peb->Reserved = get_image_address(); use_locks = TRUE; return teb; }

1 0

Alexandre Julliard : ntdll: Move the volume information functions to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 7e3d265469996efc7e720685be9b2c524eb7434b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e3d265469996efc7e720685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 14:45:32 2020 +0200 ntdll: Move the volume information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 610 +---------------------------------------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/file.c | 442 +++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unixlib.h | 7 +- 5 files changed, 453 insertions(+), 609 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3d265469996efc7e72…

1 0

Alexandre Julliard : ntdll: Move the directory change functions to the Unix library.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: wine Branch: master Commit: 78532a0c09c33a24715ae5ff7f446f1de488a24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78532a0c09c33a24715ae5ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 15:08:02 2020 +0200 ntdll: Move the directory change functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 283 +---------------------------------------------- dlls/ntdll/unix/file.c | 135 ++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unixlib.h | 6 +- 4 files changed, 144 insertions(+), 281 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78532a0c09c33a24715a…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_shader_compile_arguments structure to vkd3d_shader_spirv_target_info.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: vkd3d Branch: master Commit: 5ee018afe917dbaae07a522aeece883c4880d104 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ee018afe917dbaae07a522… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 19:10:47 2020 +0430 vkd3d-shader: Rename the vkd3d_shader_compile_arguments structure to vkd3d_shader_spirv_target_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 10 +++---- libs/vkd3d-shader/spirv.c | 48 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_main.c | 22 +++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 38 ++++++++++++------------- 5 files changed, 60 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5ee018afe917dbaae07…

1 0

Henri Verbeet : vkd3d-shader: Rename VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO.
by Alexandre Julliard 18 Jun '20

18 Jun '20

Module: vkd3d Branch: master Commit: 2ee8429c03dbd36b55b1be62d7d971d486785446 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ee8429c03dbd36b55b1be6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 19:10:49 2020 +0430 vkd3d-shader: Rename VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO. To VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, consistent with the structure name. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/state.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1f58ebd..09b77b2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,7 +30,7 @@ extern "C" { enum vkd3d_shader_structure_type { /* 1.2 */ - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 38cb2ee..0badd74 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -141,7 +141,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info); - if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) + if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) { WARN("Invalid structure type %#x.\n", shader_interface_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3f158d0..16bce6b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1521,7 +1521,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2229,7 +2229,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2926,7 +2926,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d } } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = &binding; shader_interface.binding_count = 1;

1 0