March 2023 - Wine-commits - list.winehq.org

Zebediah Figura : xslt: Use win32config.h from the correct directory.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 762832316475fc211b0954f529529ce987ac19dc URL: https://gitlab.winehq.org/wine/wine/-/commit/762832316475fc211b0954f529529c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 17:07:02 2022 -0500 xslt: Use win32config.h from the correct directory. This also fixes the build with external libxml2 but bundled libxslt. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c111332d1bd681c4955463939029d5a25138ec4f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9938e124014..163b65c2b8a 100755 --- a/configure +++ b/configure @@ -13394,7 +13394,7 @@ then : XSLT_PE_LIBS=xslt if ${XSLT_PE_CFLAGS:+false} : then : - XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" + XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt/libxslt -I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop enable_xslt=no fi diff --git a/configure.ac b/configure.ac index 2e1ea7b91e5..1e89771c2e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1106,7 +1106,7 @@ WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libm WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt/libxslt -I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread ****

1 0

Martin Storsjö : ntdll: Add SEH unwind info in ARM assembly functions/trampolines.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 65c0eacdee056c0ac4d4561dc6a56a712abb8802 URL: https://gitlab.winehq.org/wine/wine/-/commit/65c0eacdee056c0ac4d4561dc6a56a… Author: Martin Storsjö <martin(a)martin.st> Date: Wed May 11 00:52:10 2022 +0300 ntdll: Add SEH unwind info in ARM assembly functions/trampolines. Clang generates SEH unwind info on ARM in both MSVC and mingw mode since Clang 15. The unwind info gets which gets enabled automatically by building with a new enough compiler. For functions/trampolines that are implemented in assembly, the unwind information needs to be provided by hand - in particular for cases where unwinding should be diverted. Contrary to AArch64, Clang got SEH assembler directives directly from the start when SEH was implemented (when the __SEH__ compiler define gets set), so there's no need for compiler version checks (like for AArch64 in include/wine/asm.h), but the default check for __SEH__ works fine for enabling the __ARM_SEH() macro. Use a custom unwind opcode in the private opcode space for unwinding to a specific CONTEXT instead of up to the caller. (Contrary to AArch64, there's no specific unwind opcode for restoring a full CONTEXT, but the unwind opcode space does have a couple unallocated values marked as "available", which can be used for vendor specific needs here.) This fixes unwinding in ARM PE builds. Signed-off-by: Martin Storsjö <martin(a)martin.st> (cherry picked from commit 2d43653a2e789ed67a3c66db92276783b849051c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 12ffbb3663a..34bd65989ad 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -731,6 +731,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xef && ((val & 0xff) <= 0x0f)) /* ldr lr, [sp], #x */ pop_lr( 4 * (val & 0x0f), context, ptrs ); + else if (*ptr == 0xf4) /* Custom private (unallocated) opcode, saved a full CONTEXT on the stack */ + memcpy( context, (DWORD *)context->Sp, sizeof(CONTEXT) ); else if (*ptr <= 0xf4) /* Available */ WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xf5) /* vpop {dS-dE} */ @@ -1075,11 +1077,18 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "push {r0-r2,lr}\n\t" + __ASM_SEH(".seh_nop\n\t") "sub sp, sp, #0x1a0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r1, r0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r2, #0x1a0\n\t" + __ASM_SEH(".seh_nop_w\n\t") "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_SEH(".seh_custom 0xf4\n\t") /* A custom (unallocated) SEH opcode for CONTEXT on stack */ + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 0\n\t") __ASM_CFI(".cfi_escape 0x0f,0x04,0x7d,0xb8,0x00,0x06\n\t") /* DW_CFA_def_cfa_expression: DW_OP_breg13 + 56, DW_OP_deref */ __ASM_CFI(".cfi_escape 0x10,0x04,0x02,0x7d,0x14\n\t") /* DW_CFA_expression: R4 DW_OP_breg13 + 20 */ @@ -1300,6 +1309,8 @@ extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PUCHAR nonvolatile); __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, "push {r4-r11,lr}\n\t" + __ASM_SEH(".seh_save_regs_w {r4-r11,lr}\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 36\n\t") __ASM_CFI(".cfi_offset r4, -36\n\t") @@ -1410,7 +1421,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, */ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "push {r0, lr}\n\t" + __ASM_SEH(".seh_save_regs {r0, lr}\n\t") "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + __ASM_SEH(".seh_stackalloc 0x1a0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 424\n\t") __ASM_CFI(".cfi_offset lr, -4\n\t") "mov r0, sp\n\t" /* context */

1 0

Jeff Smith : d3drm/tests: Clean up some magic values.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: cb0d3f81975a42de3bf0eb7f486f8c0eb37d375f URL: https://gitlab.winehq.org/wine/wine/-/commit/cb0d3f81975a42de3bf0eb7f486f8c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 19 10:09:27 2022 -0500 d3drm/tests: Clean up some magic values. In BMP files with 24-bit depth, color components are stored in BGR order. Due to magic values being used several places in tests to reduce the components, some logical errors are hard to spot. Give names to the magic values to make logical errors more apparent. (cherry picked from commit 77189a341fb2e1b71a033b6f579c8b85330a1895) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5e0acc14fcb..c198c30e5aa 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6049,6 +6049,10 @@ static void test_create_device_3(void) IDirect3DRM_Release(d3drm); } +#define MOD_R 247 +#define MOD_G 239 +#define MOD_B 251 + static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { unsigned int bpp = palettized ? 8 : 24; @@ -6109,9 +6113,9 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } else { - buffer[i++] = j % 251; - buffer[i++] = j % 239; - buffer[i++] = j++ % 247; + buffer[i++] = j % MOD_B; + buffer[i++] = j % MOD_G; + buffer[i++] = j++ % MOD_R; } } ret = WriteFile(file, buffer, size, &written, NULL); @@ -6157,11 +6161,11 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, const unsigned char *ptr = &data[i * img->bytes_per_line + j * 4]; unsigned int idx = upside_down ? (h - 1 - i) * w + j : i * w + j; - if (ptr[0] != idx % 251 || ptr[1] != idx % 239 || ptr[2] != idx % 247 || ptr[3] != 0xff) + if (ptr[0] != idx % MOD_B || ptr[1] != idx % MOD_G || ptr[2] != idx % MOD_R || ptr[3] != 0xff) { ok(0, "Test %u: Got unexpected color 0x%02x%02x%02x%02x at position %u, %u, " "expected 0x%02x%02x%02x%02x.\n", test_idx, ptr[0], ptr[1], ptr[2], ptr[3], - j, i, idx % 251, idx % 239, idx % 247, 0xff); + j, i, idx % MOD_B, idx % MOD_G, idx % MOD_R, 0xff); return; } } @@ -6187,8 +6191,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, for (i = 0; i < img->palette_size; ++i) { unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; - ok(img->palette[i].red == idx % 251 - && img->palette[i].green == idx % 239 && img->palette[i].blue == idx % 247, + ok(img->palette[i].red == idx % MOD_B + && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_R, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY,

1 0

Jeff Smith : d3drm: Fix components of palette built when loading texture from file.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 74b66e59199d76830b589ff6e5f79c3c72ccd5d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/74b66e59199d76830b589ff6e5f79c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 19 08:51:11 2022 -0500 d3drm: Fix components of palette built when loading texture from file. Fix the palette-building code used by IDirect3DTexture::InitFromFile to use color components correctly. Also, fix and expand the tests to properly check the components of a built palette. (cherry picked from commit 293c6d24e39a3c99455c15f243bafb3d87043088) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 5 +++-- dlls/d3drm/texture.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c198c30e5aa..2833419b6d6 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6191,8 +6191,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, for (i = 0; i < img->palette_size; ++i) { unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; - ok(img->palette[i].red == idx % MOD_B - && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_R, + ok(img->palette[i].red == idx % MOD_R + && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_B, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY, @@ -6271,6 +6271,7 @@ static void test_load_texture(void) {100, 100, FALSE}, {99, 100, FALSE}, {3, 39, FALSE}, + {16, 16, FALSE}, }; hr = Direct3DRMCreate(&d3drm1); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 07f0896a30b..fd9daef4cc8 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -103,9 +103,9 @@ static BOOL d3drm_image_palettise(D3DRMIMAGE *image, unsigned char *src_data, for (i = 0; i < colour_count; ++i) { entry = &palette[i]; - if (entry->red == src_ptr[x * 3 + 0] + if (entry->red == src_ptr[x * 3 + 2] && entry->green == src_ptr[x * 3 + 1] - && entry->blue == src_ptr[x * 3 + 2]) + && entry->blue == src_ptr[x * 3 + 0]) break; } @@ -119,9 +119,9 @@ static BOOL d3drm_image_palettise(D3DRMIMAGE *image, unsigned char *src_data, } entry = &palette[colour_count++]; - entry->red = src_ptr[x * 3 + 0]; + entry->red = src_ptr[x * 3 + 2]; entry->green = src_ptr[x * 3 + 1]; - entry->blue = src_ptr[x * 3 + 2]; + entry->blue = src_ptr[x * 3 + 0]; entry->flags = D3DRMPALETTE_READONLY; }

1 0

Zebediah Figura : ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 4c6c5137da029272f8025a57462874229498d552 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c6c5137da029272f8025a57462874… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:21:48 2022 -0500 ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation. This works around a spurious gcc warning: ../wine/dlls/ntdll/unix/system.c: In function ‘NtQuerySystemInformation’: ../wine/dlls/ntdll/unix/system.c:3176:36: error: ‘%s’ directive output between 0 and 2147483644 bytes may cause result to exceed ‘INT_MAX’ [-Werror=format-truncation=] 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~ ~~~~~~~~~~ ../wine/dlls/ntdll/unix/system.c:3176:9: note: ‘snprintf’ output between 8 and 2147483780 bytes into a destination of size 4294967295 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (cherry picked from commit f66b49a4968a383bccab03dc200d5448a3ab15f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a06739388b8..5a94892b2ee 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3200,8 +3200,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, struct utsname buf; uname( &buf ); - len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); + len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; if (size < len) ret = STATUS_INFO_LENGTH_MISMATCH; break; }

1 0

Daniel Lehman : kernelbase: Pass va_list copy to internal RtlFormatMessage.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 66484ed229bc75c12e0aaba02f5c0348aee70286 URL: https://gitlab.winehq.org/wine/wine/-/commit/66484ed229bc75c12e0aaba02f5c03… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Jun 4 08:03:02 2022 -0700 kernelbase: Pass va_list copy to internal RtlFormatMessage. va_list passed to RtlFormatMessage is modified even on error in this case, if the buffer is not large enough, STATUS_BUFFER_OVERFLOW is returned and FormatMessage tries again, but the va_list pointer is now moved to a later argument, so the next call reads off the end, crashing. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1714963a5f9e62deb7aaa8f751640cbf87d57993) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/locale.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 667d1a4dc65..0f6904f2ffe 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3835,6 +3835,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { WCHAR *result; + va_list args_copy; ULONG alloc = max( size * sizeof(WCHAR), 65536 ); for (;;) @@ -3844,9 +3845,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, status = STATUS_NO_MEMORY; break; } - status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), - FALSE, !!(flags & FORMAT_MESSAGE_ARGUMENT_ARRAY), args, - result, alloc, &retsize ); + if (args && !(flags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) + { + va_copy( args_copy, *args ); + status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), + FALSE, FALSE, &args_copy, result, alloc, &retsize ); + va_end( args_copy ); + } + else + status = RtlFormatMessage( src, width, !!(flags & FORMAT_MESSAGE_IGNORE_INSERTS), + FALSE, TRUE, args, result, alloc, &retsize ); + if (!status) { if (retsize <= sizeof(WCHAR)) HeapFree( GetProcessHeap(), 0, result );

1 0

Zhiyi Zhang : winex11.drv: Handle X errors from glXCopyContext().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: bd7f5699b13d675563cb0656202623ec5ae86bc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd7f5699b13d675563cb0656202623… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 22 17:21:15 2022 +0800 winex11.drv: Handle X errors from glXCopyContext(). glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect rendering contexts. When Xorg receives such requests, it rejects them because they're for direct rendering contexts and reports an X error. We also can't use indirect rendering context because it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before graphics drivers implement the support. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit ed546bf190cf5570df3086e4c7c42f7083c2a5a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 567205f742c..0dabe4153ee 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1711,9 +1711,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con { TRACE("%p -> %p mask %#x\n", src, dst, mask); - pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); + pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); + XSync( gdi_display, False ); + if (X11DRV_check_error()) + { + static unsigned int once; + + if (!once++) + { + ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " + "implemented in the host graphics driver?\n"); + } + return FALSE; + } - /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE; }

1 0

Zhiyi Zhang : winex11.drv: Don't compare error event serial if it's zero.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: ff738dec335ec0bf0b8159b6b5c96b85ee4a373c URL: https://gitlab.winehq.org/wine/wine/-/commit/ff738dec335ec0bf0b8159b6b5c96b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 16:45:58 2022 +0800 winex11.drv: Don't compare error event serial if it's zero. Sometimes error event serial is zero. For example, NVIDIA driver may send X_GLXCopyContext errors with the event serial set to zero. When it's zero, previously the error handler passes the error to the default error handler and cause application crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit d328af75fee0f10dab67ab64fee78e2e2da7a447) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..c98151149d8 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -292,7 +292,7 @@ int X11DRV_check_error(void) static int error_handler( Display *display, XErrorEvent *error_evt ) { if (err_callback && display == err_callback_display && - (long)(error_evt->serial - err_serial) >= 0) + (!error_evt->serial || error_evt->serial >= err_serial)) { if ((err_callback_result = err_callback( display, error_evt, err_callback_arg ))) {

1 0

Santino Mazza : jscript: Return ParseProcedureText when compile fails.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: e854d91eed61450b7a488c056e7668de0a8b6487 URL: https://gitlab.winehq.org/wine/wine/-/commit/e854d91eed61450b7a488c056e7668… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 20:49:00 2022 -0300 jscript: Return ParseProcedureText when compile fails. This prevents crashes when there is an invalid script inside a tag property. Because ParseProcedureText calls release_bytecode without checking if compile_script failed, "code" is not set, and this leads to a crash when release_bytecode tries to access it. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> (cherry picked from commit d93712feee25bfe989b5dabcd25759e713a8580a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/jscript.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 160269cc3c9..4e59d4f2e01 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1204,9 +1204,12 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, pstrDelimiter, FALSE, This->is_encode, item, &code); - if(SUCCEEDED(hres)) - hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); + if(FAILED(hres)) + return leave_script(This->ctx, hres); + + hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); + hres = leave_script(This->ctx, hres); if(FAILED(hres)) return hres;

1 0

Tim Clem : kernelbase: Don't assume the length of the process image name.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 67c81ef39e5a22c89da7bc56cb3872ac6a1dc6a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/67c81ef39e5a22c89da7bc56cb3872… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Aug 9 13:10:15 2022 -0700 kernelbase: Don't assume the length of the process image name. NtQueryInformationProcess(ProcessImageFileNameWin32) may return an empty string in some circumstances, which leads QueryFullProcessImageNameW to crash if called with flags including PROCESS_NAME_NATIVE, as that path assumed the image name had a length of at least 2. (cherry picked from commit a7937e83b2f8606aa777098eb5e738241a5458e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..450cb33ce8e 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1567,7 +1567,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryFullProcessImageNameW( HANDLE process, DWORD if (status) goto cleanup; - if (flags & PROCESS_NAME_NATIVE) + if (flags & PROCESS_NAME_NATIVE && result->Length > 2 * sizeof(WCHAR)) { WCHAR drive[3]; WCHAR device[1024];

1 0