June 2024 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp140: Use _get_stream_buffer_pointers() to access FILE internal buffers.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 98e74c7842d124aa475c8cb9e5b47a34b96e0f63 URL: https://gitlab.winehq.org/wine/wine/-/commit/98e74c7842d124aa475c8cb9e5b47a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 11 19:18:53 2024 +0200 msvcp140: Use _get_stream_buffer_pointers() to access FILE internal buffers. --- dlls/msvcp90/ios.c | 16 +++++++++++++--- dlls/msvcp90/locale.c | 1 - dlls/msvcp90/msvcp90.h | 5 +++++ dlls/msvcp90/string.c | 1 - 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d81e6367878..1bf1a41cca4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include <limits.h> #include <share.h> @@ -3028,8 +3027,19 @@ void __thiscall basic_filebuf_char__Init(basic_filebuf_char *this, FILE *file, b basic_streambuf_char__Init_empty(&this->base); if(file) - basic_streambuf_char__Init(&this->base, &file->_base, &file->_ptr, - &file->_cnt, &file->_base, &file->_ptr, &file->_cnt); + { + char **base, **ptr; + int *cnt; + +#if _MSVCP_VER >= 140 + _get_stream_buffer_pointers(file, &base, &ptr, &cnt); +#else + base = &file->_base; + ptr = &file->_ptr; + cnt = &file->_cnt; +#endif + basic_streambuf_char__Init(&this->base, base, ptr, cnt, base, ptr, cnt); + } } /* ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAV?$codecvt(a)DDH@2@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 4eaf679139c..28a0db9d3bd 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -24,7 +24,6 @@ #include "limits.h" #include "math.h" #include "mbctype.h" -#include "stdio.h" #include "wchar.h" #include "wctype.h" #include "uchar.h" diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 54c66952a60..23ce63947e5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -17,6 +17,7 @@ */ #include "stdbool.h" +#include <stdio.h> #include "stdlib.h" #include "windef.h" #include "winbase.h" @@ -736,3 +737,7 @@ void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); void DECLSPEC_NORETURN throw_exception(const char*); void DECLSPEC_NORETURN throw_failure(const char*); void DECLSPEC_NORETURN throw_range_error(const char*); + +#if _MSVCP_VER >= 140 +int CDECL _get_stream_buffer_pointers(FILE*,char***,char***,int**); +#endif diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3384069bd03..10fae252380 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -19,7 +19,6 @@ #include <stdarg.h> #include "msvcp90.h" -#include "stdio.h" #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : tests: Use ARM64 as architecture in manifests on ARM64EC.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: bf84534793e601c8e9b397c469c5ebd447bdbd1d URL: https://gitlab.winehq.org/wine/wine/-/commit/bf84534793e601c8e9b397c469c5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:55:08 2024 +0200 tests: Use ARM64 as architecture in manifests on ARM64EC. --- dlls/comctl32/tests/v6util.h | 4 ++-- dlls/kernel32/tests/actctx.c | 4 ++-- dlls/kernel32/tests/path.c | 4 ++-- dlls/oleaut32/tests/typelib.c | 4 ++-- dlls/user32/tests/class.c | 4 ++-- dlls/user32/tests/msg.c | 4 ++-- dlls/uxtheme/tests/v6util.h | 4 ++-- dlls/vcomp/tests/vcomp.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index fc32616d777..a4e928f51bf 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -22,12 +22,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 20e5e42b620..b6f43b12f1a 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -37,12 +37,12 @@ static VOID (NTAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7e122780602..46eef74bce3 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -47,12 +47,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index eb5407f034f..153964e17d5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -64,12 +64,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 686fced55ee..03f6b0c549b 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -37,12 +37,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 60067b7ab02..edfd8e5eb3f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -63,12 +63,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/uxtheme/tests/v6util.h b/dlls/uxtheme/tests/v6util.h index fc32616d777..a4e928f51bf 100644 --- a/dlls/uxtheme/tests/v6util.h +++ b/dlls/uxtheme/tests/v6util.h @@ -22,12 +22,12 @@ #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined __x86_64__ #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 43a9cc7ce16..3542581a565 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -153,12 +153,12 @@ static void (CDECL *pomp_unset_nest_lock)(omp_nest_lock_t *lock); #ifdef __i386__ #define ARCH "x86" +#elif defined __aarch64__ || defined__arm64ec__ +#define ARCH "arm64" #elif defined(__x86_64__) #define ARCH "amd64" #elif defined __arm__ #define ARCH "arm" -#elif defined __aarch64__ -#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

Alexandre Julliard : ntdll: Also load arm64 manifests for amd64 architecture on ARM64EC.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 6e6450fd96f2ab3ab1535a2c0a9b0efd8e84802d URL: https://gitlab.winehq.org/wine/wine/-/commit/6e6450fd96f2ab3ab1535a2c0a9b0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:55:52 2024 +0200 ntdll: Also load arm64 manifests for amd64 architecture on ARM64EC. --- dlls/ntdll/actctx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 06d5b2f7937..a4581d05b91 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -596,12 +596,12 @@ static const xmlstr_t empty_xmlstr; #ifdef __i386__ static const WCHAR current_archW[] = L"x86"; +#elif defined __aarch64__ || defined __arm64ec__ +static const WCHAR current_archW[] = L"arm64"; #elif defined __x86_64__ static const WCHAR current_archW[] = L"amd64"; #elif defined __arm__ static const WCHAR current_archW[] = L"arm"; -#elif defined __aarch64__ -static const WCHAR current_archW[] = L"arm64"; #else static const WCHAR current_archW[] = L"none"; #endif @@ -3176,6 +3176,10 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); +#ifdef __arm64ec__ + if (!wcsncmp( lookup, L"amd64_", 6 )) memcpy( lookup, L"a??", 3 * sizeof(WCHAR) ); +#endif + if (!NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), FileBothDirectoryInformation, FALSE, &lookup_us, TRUE )) {

1 0

Alexandre Julliard : ntdll: Reimplement __os_arm64x_check_call in assembly.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 93f11ad21eb1f9465122ab55e8e54e25c3c595a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/93f11ad21eb1f9465122ab55e8e54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 10:21:07 2024 +0200 ntdll: Reimplement __os_arm64x_check_call in assembly. To avoid saving a bunch of registers on every function call. --- dlls/ntdll/signal_arm64ec.c | 183 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 91 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index fd1c235c546..fa73a0f512c 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -60,6 +60,7 @@ enum syscall_ids #define SYSCALL_ENTRY(id,name,args) __id_##name = id, ALL_SYSCALLS64 #undef SYSCALL_ENTRY + __nb_syscalls }; #define SYSCALL_API __attribute__((naked)) @@ -1463,7 +1464,7 @@ NTSTATUS SYSCALL_API wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SYSCALL_FUNC( wine_unix_to_nt_file_name ); } -static void * const arm64ec_syscalls[] = +void * const arm64ec_syscalls[] = { #define SYSCALL_ENTRY(id,name,args) name, ALL_SYSCALLS64 @@ -2246,98 +2247,98 @@ NTSTATUS __attribute__((naked)) __wine_unix_call_arm64ec( unixlib_handle_t handl NTSTATUS (WINAPI *__wine_unix_call_dispatcher_arm64ec)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call_arm64ec; -static int code_match( BYTE *code, const BYTE *seq, size_t len ) -{ - for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; - return 1; -} - -void *check_call( void **target, void *exit_thunk, void *dest ) -{ - static const BYTE jmp_sequence[] = - { - 0xff, 0x25 /* jmp *xxx(%rip) */ - }; - static const BYTE fast_forward_sequence[] = - { - 0x48, 0x8b, 0xc4, /* mov %rsp,%rax */ - 0x48, 0x89, 0x58, 0x20, /* mov %rbx,0x20(%rax) */ - 0x55, /* push %rbp */ - 0x5d, /* pop %rbp */ - 0xe9 /* jmp arm_code */ - }; - static const BYTE syscall_sequence[] = - { - 0x4c, 0x8b, 0xd1, /* mov %rcx,%r10 */ - 0xb8, 0, 0, 0, 0, /* mov $xxx,%eax */ - 0xf6, 0x04, 0x25, 0x08, /* testb $0x1,0x7ffe0308 */ - 0x03, 0xfe, 0x7f, 0x01, - 0x75, 0x03, /* jne 1f */ - 0x0f, 0x05, /* syscall */ - 0xc3, /* ret */ - 0xcd, 0x2e, /* 1: int $0x2e */ - 0xc3 /* ret */ - }; - - for (;;) - { - if (RtlIsEcCode( (ULONG_PTR)dest )) return dest; - if (code_match( dest, jmp_sequence, sizeof(jmp_sequence) )) - { - int *off_ptr = (int *)((char *)dest + sizeof(jmp_sequence)); - void **addr_ptr = (void **)((char *)(off_ptr + 1) + *off_ptr); - dest = *addr_ptr; - continue; - } - if (!((ULONG_PTR)dest & 15)) /* fast-forward and syscall thunks are always aligned */ - { - if (code_match( dest, fast_forward_sequence, sizeof(fast_forward_sequence) )) - { - int *off_ptr = (int *)((char *)dest + sizeof(fast_forward_sequence)); - return (char *)(off_ptr + 1) + *off_ptr; - } - if (code_match( dest, syscall_sequence, sizeof(syscall_sequence) )) - { - ULONG id = ((ULONG *)dest)[1]; - if (id < ARRAY_SIZE(arm64ec_syscalls)) return arm64ec_syscalls[id]; - } - } - *target = dest; - return exit_thunk; - } -} - +/************************************************************************** + * arm64x_check_call + * + * Implementation of __os_arm64x_check_call. + */ static void __attribute__((naked)) arm64x_check_call(void) { - asm( "stp x29, x30, [sp,#-0xb0]!\n\t" - "mov x29, sp\n\t" - "stp x0, x1, [sp, #0x10]\n\t" - "stp x2, x3, [sp, #0x20]\n\t" - "stp x4, x5, [sp, #0x30]\n\t" - "stp x6, x7, [sp, #0x40]\n\t" - "stp x8, x9, [sp, #0x50]\n\t" - "stp x10, x15, [sp, #0x60]\n\t" - "stp d0, d1, [sp, #0x70]\n\t" - "stp d2, d3, [sp, #0x80]\n\t" - "stp d4, d5, [sp, #0x90]\n\t" - "stp d6, d7, [sp, #0xa0]\n\t" - "add x0, sp, #0x58\n\t" /* x9 = &target */ - "mov x1, x10\n\t" /* x10 = exit_thunk */ - "mov x2, x11\n\t" /* x11 = dest */ - "bl \"#check_call\"\n\t" - "mov x11, x0\n\t" - "ldp x0, x1, [sp, #0x10]\n\t" - "ldp x2, x3, [sp, #0x20]\n\t" - "ldp x4, x5, [sp, #0x30]\n\t" - "ldp x6, x7, [sp, #0x40]\n\t" - "ldp x8, x9, [sp, #0x50]\n\t" - "ldp x10, x15, [sp, #0x60]\n\t" - "ldp d0, d1, [sp, #0x70]\n\t" - "ldp d2, d3, [sp, #0x80]\n\t" - "ldp d4, d5, [sp, #0x90]\n\t" - "ldp d6, d7, [sp, #0xa0]\n\t" - "ldp x29, x30, [sp], #0xb0\n\t" - "ret" ); + asm( ".seh_proc \"#arm64x_check_call\"\n\t" + ".seh_endprologue\n\t" + /* check for EC code */ + "ldr x16, [x18, #0x60]\n\t" /* peb */ + "lsr x17, x11, #18\n\t" /* dest / page_size / 64 */ + "ldr x16, [x16, #0x368]\n\t" /* peb->EcCodeBitMap */ + "lsr x9, x11, #12\n\t" /* dest / page_size */ + "ldr x16, [x16, x17, lsl #3]\n\t" + "lsr x16, x16, x9\n\t" + "tbnz x16, #0, .Ldone\n\t" + /* check if dest is aligned */ + "tst x11, #15\n\t" /* dest & 15 */ + "b.ne .Ljmp\n\t" + "ldr x16, [x11]\n\t" /* dest code */ + /* check for fast-forward sequence */ + "ldr x17, .Lffwd_seq\n\t" + "cmp x16, x17\n\t" + "b.ne .Lsyscall\n\t" + "ldr x16, [x11, #8]\n\t" + "ldr x17, .Lffwd_seq + 8\n\t" + "eor x17, x16, x17\n\t" /* compare only first two bytes */ + "tst x17, #0xffff\n\t" + "b.ne .Lexit\n\t" + "add x11, x11, #14\n\t" /* address after jump */ + "lsr x9, x16, #16\n\t" + "add x11, x11, w9, sxtw\n\t" /* add offset */ + "ret\n" + /* check for syscall sequence */ + ".Lsyscall:\n\t" + "ldr w17, .Lsyscall_seq\n\t" + "cmp w16, w17\n\t" + "b.ne .Ljmp\n\t" + "ubfx x9, x16, #32, #12\n\t" /* syscall number */ + "ldr x16, [x11, #8]\n\t" + "ldr x17, .Lsyscall_seq + 8\n\t" + "cmp x16, x17\n\t" + "b.ne .Lexit\n\t" + "ldr x16, [x11, #16]\n\t" + "ldr x17, .Lsyscall_seq + 16\n\t" + "cmp x16, x17\n\t" + "b.ne .Lexit\n\t" + "cmp x9, #%0\n\t" + "b.hs .Lexit\n\t" + "adr x11, arm64ec_syscalls\n\t" + "ldr x11, [x11, x9, lsl #3]\n\t" + "ret\n" + /* check for jmp sequence */ + ".Ljmp:\n\t" + "ldrb w16, [x11]\n\t" + "cmp w16, #0xff\n\t" + "b.ne .Lexit\n\t" + "ldrb w16, [x11, #1]\n\t" + "cmp w16, #0x25\n\t" /* ff 25 jmp *xxx(%rip) */ + "b.ne .Lexit\n\t" + "ldr w9, [x11, #2]\n\t" + "add x16, x11, #6\n\t" /* address after jump */ + "ldr x11, [x16, w9, sxtw]\n\t" + "b \"#arm64x_check_call\"\n" /* restart checks with jump destination */ + /* not a special sequence, call the exit thunk */ + ".Lexit:\n\t" + "mov x9, x11\n\t" + "mov x11, x10\n\t" + ".Ldone:\n\t" + "ret\n" + ".seh_endproc\n\t" + + ".Lffwd_seq:\n\t" + ".byte 0x48, 0x8b, 0xc4\n\t" /* mov %rsp,%rax */ + ".byte 0x48, 0x89, 0x58, 0x20\n\t" /* mov %rbx,0x20(%rax) */ + ".byte 0x55\n" /* push %rbp */ + ".byte 0x5d\n\t" /* pop %rbp */ + ".byte 0xe9\n\t" /* jmp arm_code */ + ".byte 0, 0, 0, 0, 0, 0\n" + + ".Lsyscall_seq:\n\t" + ".byte 0x4c, 0x8b, 0xd1\n\t" /* mov %rcx,%r10 */ + ".byte 0xb8, 0, 0, 0, 0\n\t" /* mov $xxx,%eax */ + ".byte 0xf6, 0x04, 0x25, 0x08\n\t" /* testb $0x1,0x7ffe0308 */ + ".byte 0x03, 0xfe, 0x7f, 0x01\n\t" + ".byte 0x75, 0x03\n\t" /* jne 1f */ + ".byte 0x0f, 0x05\n\t" /* syscall */ + ".byte 0xc3\n\t" /* ret */ + ".byte 0xcd, 0x2e\n\t" /* 1: int $0x2e */ + ".byte 0xc3" /* ret */ + :: "i" (__nb_syscalls) ); }

1 0

Yuxuan Shui : tests: Pass the correct buffer size to vsnprintf() in vkd3d_test_push_context().
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: vkd3d Branch: master Commit: 8a459f59039d68c1181acf5fde86e588b6dc4242 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8a459f59039d68c1181acf5fde86e… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed May 29 17:10:45 2024 +0100 tests: Pass the correct buffer size to vsnprintf() in vkd3d_test_push_context(). --- include/private/vkd3d_test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index bd6bafa9..e1b9b969 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -412,7 +412,7 @@ static inline void vkd3d_test_push_context(const char *fmt, ...) { va_start(args, fmt); vsnprintf(vkd3d_test_state.context[vkd3d_test_state.context_count], - sizeof(vkd3d_test_state.context), fmt, args); + sizeof(*vkd3d_test_state.context), fmt, args); va_end(args); vkd3d_test_state.context[vkd3d_test_state.context_count][sizeof(vkd3d_test_state.context[0]) - 1] = '\0'; }

1 0

Nikolay Sivov : vkd3d-shader/fx: Fix variable buffer offset value.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: vkd3d Branch: master Commit: 222c52380bac026fca1db57c2a4c524e613f28b6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/222c52380bac026fca1db57c2a4c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 2 00:23:12 2024 +0200 vkd3d-shader/fx: Fix variable buffer offset value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 54cf1020..3ba0a9ba 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1000,7 +1000,7 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, st put_u32(buffer, type_offset); semantic_offset = put_u32(buffer, semantic_offset); /* Semantic */ - put_u32(buffer, var->buffer_offset); /* Offset in the constant buffer */ + put_u32(buffer, var->buffer_offset * 4); /* Offset in the constant buffer, in bytes. */ value_offset = put_u32(buffer, 0); /* Default value offset */ put_u32(buffer, flags); /* Flags */

1 0

Nikolay Sivov : vkd3d-shader/fx: Set EXPLICIT_BIND_POINT flag for packoffset() reservations as well.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: vkd3d Branch: master Commit: 402dc942599f6aa05f780fa49dc98767e562a910 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/402dc942599f6aa05f780fa49dc98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 2 00:15:48 2024 +0200 vkd3d-shader/fx: Set EXPLICIT_BIND_POINT flag for packoffset() reservations as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 +-- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index bd3bba6a..54cf1020 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -989,8 +989,7 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, st }; struct hlsl_ctx *ctx = fx->ctx; - /* Explicit bind point. */ - if (var->reg_reservation.reg_type) + if (var->has_explicit_bind_point) flags |= HAS_EXPLICIT_BIND_POINT; type_offset = write_type(var->data_type, fx); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 669ab551..5f6ed34f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -492,6 +492,7 @@ struct hlsl_ir_var uint32_t is_param : 1; uint32_t is_separated_resource : 1; uint32_t is_synthetic : 1; + uint32_t has_explicit_bind_point : 1; }; /* This struct is used to represent assignments in state block entries: diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index fb108ad9..09066a61 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4791,6 +4791,7 @@ static void hlsl_calculate_buffer_offset(struct hlsl_ctx *ctx, struct hlsl_ir_va if (register_reservation) { var->buffer_offset = 4 * var->reg_reservation.reg_index; + var->has_explicit_bind_point = 1; } else { @@ -4823,6 +4824,7 @@ static void hlsl_calculate_buffer_offset(struct hlsl_ctx *ctx, struct hlsl_ir_va } } var->buffer_offset = var->reg_reservation.offset_index; + var->has_explicit_bind_point = 1; } else {

1 0

Rémi Bernon : winex11: Force thread DPI awareness when calling NtUserChildWindowFromPointEx.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 0bc571657e63b478fb5913b90343a8ec39443b82 URL: https://gitlab.winehq.org/wine/wine/-/commit/0bc571657e63b478fb5913b90343a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 11:36:12 2024 +0200 winex11: Force thread DPI awareness when calling NtUserChildWindowFromPointEx. --- dlls/winex11.drv/event.c | 3 +-- dlls/winex11.drv/x11drv.h | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0b46fe1fd9..c377bbc9984 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1423,8 +1423,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if (PtInRect( &tempRect, pt)) { - HWND ret = NtUserChildWindowFromPointEx( hQueryWnd, pt.x, pt.y, - CWP_SKIPINVISIBLE|CWP_SKIPDISABLED ); + HWND ret = child_window_from_point( hQueryWnd, pt.x, pt.y, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED ); if (ret && ret != hQueryWnd) { ret = find_drop_window( ret, lpPt ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3485d239fa2..6d257a2afbd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -903,6 +903,15 @@ static inline BOOL redraw_window( HWND hwnd, const RECT *rect, HRGN hrgn, UINT f return ret; } +/* per-monitor DPI aware NtUserChildWindowFromPointEx call */ +static inline HWND child_window_from_point( HWND parent, LONG x, LONG y, UINT flags ) +{ + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE_V2 ); + HWND ret = NtUserChildWindowFromPointEx( parent, x, y, flags ); + NtUserSetThreadDpiAwarenessContext( context ); + return ret; +} + static inline HWND get_focus(void) { GUITHREADINFO info;

1 0

Rémi Bernon : winex11: Force thread DPI awareness when calling NtUserRedrawWindow.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 949920810a173a650305cbe3183151416c03c717 URL: https://gitlab.winehq.org/wine/wine/-/commit/949920810a173a650305cbe3183151… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 11:19:15 2024 +0200 winex11: Force thread DPI awareness when calling NtUserRedrawWindow. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 5 ++--- dlls/winex11.drv/x11drv.h | 9 +++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7adb083134c..a0b46fe1fd9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -931,7 +931,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) release_win_data( data ); - if (flags) NtUserRedrawWindow( hwnd, &rect, surface_region, flags ); + if (flags) redraw_window( hwnd, &rect, surface_region, flags ); if (surface_region) NtGdiDeleteObjectApp( surface_region ); return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 39a8d2a4b5d..845cd896bb0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1551,10 +1551,9 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co /* map region to client rect since we are using DCX_WINDOW */ NtGdiOffsetRgn( rgn, new_window_rect->left - new_client_rect->left, new_window_rect->top - new_client_rect->top ); - NtUserRedrawWindow( hwnd, NULL, rgn, - RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN ); + redraw_window( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN ); } - else NtUserRedrawWindow( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + else redraw_window( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); NtGdiDeleteObjectApp( rgn ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 055b1a9be8b..3485d239fa2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -894,6 +894,15 @@ static inline BOOL set_window_pos( HWND hwnd, HWND after, INT x, INT y, INT cx, return ret; } +/* per-monitor DPI aware NtUserRedrawWindow call */ +static inline BOOL redraw_window( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) +{ + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE_V2 ); + BOOL ret = NtUserRedrawWindow( hwnd, rect, hrgn, flags ); + NtUserSetThreadDpiAwarenessContext( context ); + return ret; +} + static inline HWND get_focus(void) { GUITHREADINFO info;

1 0

Rémi Bernon : winewayland: Force thread DPI awareness when calling NtUserSetWindowPos.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: b914409514b108be60da4cc2668d5d8434ebff10 URL: https://gitlab.winehq.org/wine/wine/-/commit/b914409514b108be60da4cc2668d5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 10:30:29 2024 +0200 winewayland: Force thread DPI awareness when calling NtUserSetWindowPos. --- dlls/winewayland.drv/window.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 73bee46cc35..274ce24db4c 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -46,6 +46,16 @@ static UINT get_win_monitor_dpi(HWND hwnd) } +/* per-monitor DPI aware NtUserSetWindowPos call */ +static BOOL set_window_pos(HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags) +{ + UINT context = NtUserSetThreadDpiAwarenessContext(NTUSER_DPI_PER_MONITOR_AWARE_V2); + BOOL ret = NtUserSetWindowPos(hwnd, after, x, y, cx, cy, flags); + NtUserSetThreadDpiAwarenessContext(context); + return ret; +} + + /* private window data */ struct wayland_win_data { @@ -628,7 +638,7 @@ static void wayland_configure_window(HWND hwnd) flags |= SWP_NOSENDCHANGING; } - NtUserSetWindowPos(hwnd, 0, 0, 0, window_width, window_height, flags); + set_window_pos(hwnd, 0, 0, 0, window_width, window_height, flags); } /**********************************************************************

1 0