- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on i386.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 37ded7380e6e79f52ecb01c9f3d284bb51376a6e URL: https://gitlab.winehq.org/wine/wine/-/commit/37ded7380e6e79f52ecb01c9f3d284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:52:50 2024 +0100 ntdll: Implement RtlWalkFrameChain on i386. --- dlls/ntdll/signal_i386.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 178848cd7ca..cade0c973c2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -451,6 +451,29 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "ret $4" ) /* actually never returns */ +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + CONTEXT context; + ULONG *frame; + ULONG i, skip = flags >> 8, pos = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + if (!is_valid_frame( context.Ebp )) break; + if (i >= skip) buffer[pos++] = (void *)context.Eip; + frame = (ULONG *)context.Ebp; + context.Ebp = frame[0]; + context.Eip = frame[1]; + } + return pos; +} + + /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on ARM.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 3938478aab58d0ea4fa6e07c44fc5862ecd7a39f URL: https://gitlab.winehq.org/wine/wine/-/commit/3938478aab58d0ea4fa6e07c44fc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:05 2024 +0100 ntdll: Implement RtlWalkFrameChain on ARM. --- dlls/ntdll/signal_arm.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b59384c986c..2d75902b12f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -571,6 +571,38 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + pc = context.Pc; + if (context.ContextFlags & CONTEXT_UNWOUND_TO_CALL) pc -= 2; + func = RtlLookupFunctionEntry( pc, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Pc) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Sp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Pc; + } + return num_entries; +} + + extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile);

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on x86-64.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: f127448d00b9f4c4869c737c8c38038ed15fc4f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f127448d00b9f4c4869c737c8c3803… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:52:36 2024 +0100 ntdll: Implement RtlWalkFrameChain on x86-64. --- dlls/ntdll/signal_x86_64.c | 30 ++++++++++++++++++++++++++++++ include/rtlsupportapi.h | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8b1de07ccc9..1e928cad2c9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -958,6 +958,36 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "call " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + func = RtlLookupFunctionEntry( context.Rip, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, context.Rip, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Rip) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Rsp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + } + return num_entries; +} + + static inline ULONG hash_pointers( void **ptrs, ULONG count ) { /* Based on MurmurHash2, which is in the public domain */ diff --git a/include/rtlsupportapi.h b/include/rtlsupportapi.h index 32f0099c0b6..becb6179a56 100644 --- a/include/rtlsupportapi.h +++ b/include/rtlsupportapi.h @@ -28,6 +28,7 @@ NTSYSAPI void WINAPI RtlRaiseException(EXCEPTION_RECORD*); NTSYSAPI void CDECL RtlRestoreContext(CONTEXT*,EXCEPTION_RECORD*); NTSYSAPI void WINAPI RtlUnwind(void*,void*,EXCEPTION_RECORD*,void*); NTSYSAPI void* WINAPI RtlPcToFileHeader(void*,void**); +NTSYSAPI ULONG WINAPI RtlWalkFrameChain(void**,ULONG,ULONG); #ifndef __i386__

1 0

Alexandre Julliard : ntdll: Implement RtlRestoreContext on ARM64EC.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 6d8b4e661fee3c6a1d675de80e89c11c14fff53b URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8b4e661fee3c6a1d675de80e89c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 12:16:10 2024 +0100 ntdll: Implement RtlRestoreContext on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 6f73919c886..8acb5c767ed 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1893,12 +1893,95 @@ int __attribute__((naked)) NTDLL__setjmpex( _JUMP_BUFFER *buf, void *frame ) } +/********************************************************************** + * call_consolidate_callback + * + * Wrapper function to call a consolidate callback from a fake frame. + * If the callback executes RtlUnwindEx (like for example done in C++ handlers), + * we have to skip all frames which were already processed. To do that we + * trick the unwinding functions into thinking the call came from somewhere + * else. + */ +static void __attribute__((naked,noreturn)) consolidate_callback( CONTEXT *context, + void *(CALLBACK *callback)(EXCEPTION_RECORD *), + EXCEPTION_RECORD *rec ) +{ + asm( ".seh_proc consolidate_callback\n\t" + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + "sub sp, sp, #0x4d0\n\t" + ".seh_stackalloc 0x4d0\n\t" + ".seh_endprologue\n\t" + "mov x4, sp\n\t" + /* copy the context onto the stack */ + "mov x5, #0x4d0/16\n" /* sizeof(CONTEXT) */ + "1:\tldp x6, x7, [x0], #16\n\t" + "stp x6, x7, [x4], #16\n\t" + "subs x5, x5, #1\n\t" + "b.ne 1b\n\t" + "mov x0, x2\n\t" /* rec */ + "b invoke_callback\n\t" + ".seh_endproc\n\t" + ".seh_proc invoke_callback\n" + "invoke_callback:\n\t" + ".seh_ec_context\n\t" + ".seh_endprologue\n\t" + "mov x11, x1\n\t" /* callback */ + "adr x10, $iexit_thunk$cdecl$i8$i8\n\t" + "adrp x16, __os_arm64x_dispatch_icall\n\t" + "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" + "blr x16\n\t" + "blr x11\n\t" + "str x0, [sp, #0xf8]\n\t" /* context->Rip */ + "mov x0, sp\n\t" /* context */ + "mov w1, #0\n\t" + "bl \"#NtContinue\"\n\t" + ".seh_endproc" ); +} + + /******************************************************************* * RtlRestoreContext (NTDLL.@) */ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) { - FIXME( "not implemented\n" ); + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; + + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->Rip = jmp->Rip; + context->MxCsr = jmp->MxCsr; + context->FltSave.MxCsr = jmp->MxCsr; + context->FltSave.ControlWord = jmp->FpCsr; + memcpy( &context->Xmm6, &jmp->Xmm6, 10 * sizeof(M128A) ); + } + else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + void * (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + consolidate_callback( context, consolidate, rec ); + } + + /* hack: remove no longer accessible TEB frames */ + while ((ULONG64)teb_frame < context->Rsp) + { + TRACE( "removing TEB frame: %p\n", teb_frame ); + teb_frame = __wine_pop_frame( teb_frame ); + } + + TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); + NtContinue( context, FALSE ); }

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on ARM64EC.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 3418bf6ccd3edcc0e5614831e845dce7ce5746d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3418bf6ccd3edcc0e5614831e845dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:28 2024 +0100 ntdll: Implement RtlWalkFrameChain on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8acb5c767ed..02e6dc009bf 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1995,6 +1995,38 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + pc = context.Rip; + if ((context.ContextFlags & CONTEXT_UNWOUND_TO_CALL) && RtlIsEcCode( pc )) pc -= 4; + func = RtlLookupFunctionEntry( pc, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Rip) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Rsp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + } + return num_entries; +} + + /******************************************************************* * __C_specific_handler (NTDLL.@) */

1 0

Esme Povirk : gdiplus: Check bounding box in GdipIsVisibleRegionPoint.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 47e9980bb14df2ae8d8a196502843394f093255d URL: https://gitlab.winehq.org/wine/wine/-/commit/47e9980bb14df2ae8d8a1965028433… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 28 15:12:57 2023 -0500 gdiplus: Check bounding box in GdipIsVisibleRegionPoint. --- dlls/gdiplus/region.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9617f492a51..3034dedae76 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -1313,6 +1314,208 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionRectI(GpRegion* region, INT x, INT y, INT return GdipIsVisibleRegionRect(region, (REAL)x, (REAL)y, (REAL)w, (REAL)h, graphics, res); } +/* get_region_bounding_box + * + * Returns a box guaranteed to enclose the entire region, but not guaranteed to be minimal. + * Sets "empty" if bounding box is empty. + * Sets "infinite" if everything outside bounding box is inside the region. + * In the infinite case, the bounding box encloses all points not in the region. */ +static void get_region_bounding_box(struct region_element *element, + REAL *min_x, REAL *min_y, REAL *max_x, REAL *max_y, BOOL *empty, BOOL *infinite) +{ + REAL left_min_x, left_min_y, left_max_x, left_max_y; + BOOL left_empty, left_infinite; + REAL right_min_x, right_min_y, right_max_x, right_max_y; + BOOL right_empty, right_infinite; + /* For combine modes, we convert the mode to flags as follows to simplify the logic: + * 0x8 = point in combined region if it's in both + * 0x4 = point in combined region if it's in left and not right + * 0x2 = point in combined region if it's not in left and is in right + * 0x1 = point in combined region if it's in neither region */ + int flags; + const int combine_mode_flags[] = { + 0xa, /* CombineModeReplace - shouldn't be used */ + 0x8, /* CombineModeIntersect */ + 0xe, /* CombineModeUnion */ + 0x6, /* CombineModeXor */ + 0x4, /* CombineModeExclude */ + 0x2, /* CombineModeComplement */ + }; + + /* handle unit elements first */ + switch (element->type) + { + case RegionDataInfiniteRect: + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = TRUE; + return; + case RegionDataEmptyRect: + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = FALSE; + return; + case RegionDataPath: + { + GpPath *path = element->elementdata.path; + int i; + + if (path->pathdata.Count <= 1) { + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = FALSE; + return; + } + + *min_x = *max_x = path->pathdata.Points[0].X; + *min_y = *max_y = path->pathdata.Points[0].Y; + *empty = FALSE; + *infinite = FALSE; + + for (i=1; i < path->pathdata.Count; i++) + { + if (path->pathdata.Points[i].X < *min_x) + *min_x = path->pathdata.Points[i].X; + else if (path->pathdata.Points[i].X > *max_x) + *max_x = path->pathdata.Points[i].X; + if (path->pathdata.Points[i].Y < *min_y) + *min_y = path->pathdata.Points[i].Y; + else if (path->pathdata.Points[i].Y > *max_y) + *max_y = path->pathdata.Points[i].Y; + } + + return; + } + case RegionDataRect: + *min_x = element->elementdata.rect.X; + *min_y = element->elementdata.rect.Y; + *max_x = element->elementdata.rect.X + element->elementdata.rect.Width; + *max_y = element->elementdata.rect.Y + element->elementdata.rect.Height; + *empty = FALSE; + *infinite = FALSE; + return; + } + + /* Should be only combine modes left */ + assert(element->type < ARRAY_SIZE(combine_mode_flags)); + + flags = combine_mode_flags[element->type]; + + get_region_bounding_box(element->elementdata.combine.left, + &left_min_x, &left_min_y, &left_max_x, &left_max_y, &left_empty, &left_infinite); + + if (left_infinite) + { + /* change our function so we can ignore the infinity */ + flags = ((flags & 0x3) << 2) | ((flags & 0xc) >> 2); + } + + if (left_empty && (flags & 0x3) == 0) { + /* no points in region regardless of right region, return empty */ + *empty = TRUE; + *infinite = FALSE; + return; + } + + if (left_empty && (flags & 0x3) == 0x3) { + /* all points in region regardless of right region, return infinite */ + *empty = TRUE; + *infinite = TRUE; + return; + } + + get_region_bounding_box(element->elementdata.combine.right, + &right_min_x, &right_min_y, &right_max_x, &right_max_y, &right_empty, &right_infinite); + + if (right_infinite) + { + /* change our function so we can ignore the infinity */ + flags = ((flags & 0x5) << 1) | ((flags & 0xa) >> 1); + } + + /* result is infinite if points in neither region are in the result */ + *infinite = (flags & 0x1); + + if (*infinite) + { + /* Again, we modify our function to ignore the infinity. + * The points we care about are the ones that are different from the outside of our box, + * not the points inside the region, so we invert the whole thing. + * From here we can assume 0x1 is not set. */ + flags ^= 0xf; + } + + if (left_empty) + { + /* We already took care of the cases where the right region doesn't matter, + * so we can just use the right bounding box. */ + *min_x = right_min_x; + *min_y = right_min_y; + *max_x = right_max_x; + *max_y = right_max_y; + *empty = right_empty; + return; + } + + if (right_empty) + { + /* With no points in right region, and infinities eliminated, we only care + * about flag 0x4, the case where a point is in left region and not right. */ + if (flags & 0x4) + { + /* We have a copy of the left region. */ + *min_x = left_min_x; + *min_y = left_min_y; + *max_x = left_max_x; + *max_y = left_max_y; + *empty = left_empty; + return; + } + /* otherwise, it's an empty (or infinite) region */ + *empty = TRUE; + return; + } + + /* From here we know 0x1 isn't set, and we know at least one flag is set. + * We can ignore flag 0x8 because we must assume that any point within the + * intersection of the bounding boxes might be within the region. */ + switch (flags & 0x6) + { + case 0x0: + /* intersection */ + *min_x = fmaxf(left_min_x, right_min_x); + *min_y = fmaxf(left_min_y, right_min_y); + *max_x = fminf(left_max_x, right_max_x); + *max_y = fminf(left_max_y, right_max_y); + *empty = *min_x > *max_x || *min_y > *max_y; + return; + case 0x2: + /* right (or complement) */ + *min_x = right_min_x; + *min_y = right_min_y; + *max_x = right_max_x; + *max_y = right_max_y; + *empty = right_empty; + return; + case 0x4: + /* left (or exclude) */ + *min_x = left_min_x; + *min_y = left_min_y; + *max_x = left_max_x; + *max_y = left_max_y; + *empty = left_empty; + return; + case 0x6: + /* union (or xor) */ + *min_x = fminf(left_min_x, right_min_x); + *min_y = fminf(left_min_y, right_min_y); + *max_x = fmaxf(left_max_x, right_max_x); + *max_y = fmaxf(left_max_y, right_max_y); + *empty = FALSE; + return; + } +} + /***************************************************************************** * GdipIsVisibleRegionPoint [GDIPLUS.@] */ @@ -1320,12 +1523,25 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion* region, REAL x, REAL y, G { HRGN hrgn; GpStatus stat; + REAL min_x, min_y, max_x, max_y; + BOOL empty, infinite; TRACE("(%p, %.2f, %.2f, %p, %p)\n", region, x, y, graphics, res); if(!region || !res) return InvalidParameter; + x = gdip_round(x); + y = gdip_round(y); + + /* Check for cases where we can skip quantization. */ + get_region_bounding_box(&region->node, &min_x, &min_y, &max_x, &max_y, &empty, &infinite); + if (empty || x < min_x || y < min_y || x > max_x || y > max_y) + { + *res = infinite; + return Ok; + } + if((stat = GdipGetRegionHRgn(region, NULL, &hrgn)) != Ok) return stat; @@ -1335,7 +1551,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion* region, REAL x, REAL y, G return Ok; } - *res = PtInRegion(hrgn, gdip_round(x), gdip_round(y)); + *res = PtInRegion(hrgn, x, y); DeleteObject(hrgn);

1 0

Alexandre Julliard : configure: Check the correct variable for the Wayland EGL library.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 2ab736e292edad9e46db98e211c64d7fab93d12b URL: https://gitlab.winehq.org/wine/wine/-/commit/2ab736e292edad9e46db98e211c64d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 11:21:05 2024 +0100 configure: Check the correct variable for the Wayland EGL library. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56411 --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index eaaa2d7dc3e..59848dcdaf4 100755 --- a/configure +++ b/configure @@ -16356,7 +16356,7 @@ CPPFLAGS=$ac_save_CPPFLAGS if test "x$with_wayland" != "x" then - if test -z "$ac_cv_lib_soname_EGL" -o -z "$HAVE_LIBWAYLAND_EGL" + if test -z "$ac_cv_lib_soname_EGL" -o "$ac_cv_lib_wayland_egl_wl_egl_window_create" != yes then : case "x$with_opengl" in x) as_fn_append wine_notices "|EGL ${notice_platform}development files not found, the Wayland driver won't support OpenGL" ;; diff --git a/configure.ac b/configure.ac index 417b1a63a13..2282758fd10 100644 --- a/configure.ac +++ b/configure.ac @@ -1392,7 +1392,7 @@ then [WAYLAND_EGL_LIBS=""],[$WAYLAND_EGL_LIBS])])]) if test "x$with_wayland" != "x" then - WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o -z "$HAVE_LIBWAYLAND_EGL"], + WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o "$ac_cv_lib_wayland_egl_wl_egl_window_create" != yes], [EGL ${notice_platform}development files not found, the Wayland driver won't support OpenGL]) fi fi

1 0

Esme Povirk : user32/tests: Accept HCBT_ACTIVATE in TrackPopupMenu.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 14f69583aa96c24668e549bba5263ece3707d8a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/14f69583aa96c24668e549bba5263e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Mar 9 20:10:41 2024 +0000 user32/tests: Accept HCBT_ACTIVATE in TrackPopupMenu. --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8ed608c5d3b..23e9f043ed8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2175,6 +2175,7 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { HCBT_ACTIVATE, hook|optional }, /* win11 */ { WM_CANCELMODE, sent }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc },

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Only emit signatures for SM4-6.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 23259263cf662fb203a173b30b90f44cfbb9d29e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23259263cf662fb203a173b30b90f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 11:07:20 2024 +0100 vkd3d-shader/d3d-asm: Only emit signatures for SM4-6. --- libs/vkd3d-shader/d3d_asm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index ddd1f221..b8dcfd01 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -2293,7 +2293,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); - if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_IO_SIGNATURES) + /* The signatures we emit only make sense for DXBC shaders. D3DBC + * doesn't even have an explicit concept of signature. */ + if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_IO_SIGNATURES && shader_version->major >= 4) { if ((result = dump_signatures(&compiler, shader_desc, shader_version->type)) < 0) {

1 0

Evan Tang : vkd3d-shader/spirv: Implement support for rasteriser-ordered views.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: vkd3d Branch: master Commit: 4553b2a0dccd07fbbd1b51b75097f0cef706d214 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4553b2a0dccd07fbbd1b51b75097f… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Oct 11 16:09:23 2023 -0500 vkd3d-shader/spirv: Implement support for rasteriser-ordered views. Using SPV_EXT_fragment_shader_interlock. --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/spirv.c | 46 ++++++- tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- tests/shader_runner_vulkan.c | 162 +++++++++++++++++++++--- tests/vulkan_procs.h | 1 + 5 files changed, 190 insertions(+), 23 deletions(-)

1 0