wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Piotr Caban : winemac.drv: Don't filter non active displays out.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 3b224895b0b6193a4181655e47aba6532e6a2302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b224895b0b6193a4181655e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:19 2021 +0200 winemac.drv: Don't filter non active displays out. On Windows 10 the DISPLAY_DEVICE_ACTIVE flag is set even if monitor is in power saving mode or switched off. Monitors without DISPLAY_DEVICE_ACTIVE are only reported when display is disabled. This doesn't match with CGDisplayIsActive function. Current code causes rendering problems when native .NET is used. When monitors are updated when in power saving mode (e.g. due to race on machine wake-up) we might end up with no monitors being enumerated by EnumDisplayMonitors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5400db15ca9983a06df2f5071705e0256e95e11e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 89 ++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 05f1c75d53b..3bb1b5151d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -646,65 +646,54 @@ int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitor if (!monitors) return -1; - /* Report an inactive monitor */ - if (!CGDisplayIsActive(adapter_id) && !CGDisplayIsInMirrorSet(adapter_id)) - { - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; - monitor_count++; - } - /* Report active and mirrored monitors in the same mirroring set */ - else - { - if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) - != kCGErrorSuccess) - goto done; + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + goto done; - if (macdrv_get_displays(&displays, &display_count)) - goto done; + if (macdrv_get_displays(&displays, &display_count)) + goto done; - for (i = 0; i < display_id_count; i++) - { - if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) - continue; + for (i = 0; i < display_id_count; i++) + { + if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) + continue; - /* Find and fill in monitor info */ - for (j = 0; j < display_count; j++) + /* Find and fill in monitor info */ + for (j = 0; j < display_count; j++) + { + if (displays[j].displayID == display_ids[i] + || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) { - if (displays[j].displayID == display_ids[i] - || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) + /* Allocate more space if needed */ + if (monitor_count >= capacity) { - /* Allocate more space if needed */ - if (monitor_count >= capacity) - { - capacity *= 2; - realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); - if (!realloc_monitors) - goto done; - monitors = realloc_monitors; - } - - if (j == 0) - primary_index = monitor_count; - - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; - monitors[monitor_count].rc_monitor = displays[j].frame; - monitors[monitor_count].rc_work = displays[j].work_frame; - monitor_count++; - break; + capacity *= 2; + realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; } + + if (j == 0) + primary_index = monitor_count; + + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; + monitors[monitor_count].rc_monitor = displays[j].frame; + monitors[monitor_count].rc_work = displays[j].work_frame; + monitor_count++; + break; } } + } - /* Make sure the first monitor on primary adapter is primary */ - if (primary_index) - { - struct macdrv_monitor tmp; - tmp = monitors[0]; - monitors[0] = monitors[primary_index]; - monitors[primary_index] = tmp; - } + /* Make sure the first monitor on primary adapter is primary */ + if (primary_index) + { + struct macdrv_monitor tmp; + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; } *new_monitors = monitors;

1 0

Brendan Shanks : configure: Work around Xcode 12's ld assuming 16KB page sizes.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: d7e26f2f7ba9e62b35fe20477e93bac5e2d84000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e26f2f7ba9e62b35fe2047… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 15 13:25:31 2021 -0700 configure: Work around Xcode 12's ld assuming 16KB page sizes. Starting in Xcode 12, ld rounds page sizes and alignments up to 16KB for all architectures. Passing '-segalign 0x1000' resets this back to 4KB. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11fd7e8394b53b04b027d7c5b26c51b8b50242b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a57773e91ef..5ed620c0e2f 100755 --- a/configure +++ b/configure @@ -8719,10 +8719,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index a9add75bfd3..5c689789c86 100644 --- a/configure.ac +++ b/configure.ac @@ -742,10 +742,10 @@ case $host_os in AC_SUBST(APPKIT_LIBS,"-framework AppKit") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,

1 0

Matteo Bruni : wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 9af691e74a06cdef61cba1623047398043ef3c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af691e74a06cdef61cba162… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 31 21:12:53 2021 +0200 wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty. This fixes the non-default ARB shader backend, broken since 2ddb6b66a7cda0bf6aaddc0c6899e35cc92ceee9, although the fundamental issue was there long before that. Originally the STATE_VDECL handler did some bookkeeping (basically, computing what is now the stream info data) that's a prerequisite for running other state handlers. For this reason a somewhat complicated dance was put in place, with the dependent handlers returning right away until the STATE_VDECL handler could prepare everything up and the STATE_VDECL handler in turn explicitly calling these "downstream" handlers so that they could do their job. With the commit mentioned above the state dirty flags are cleared after the corresponding handlers are executed, which means that the relevant handlers are skipped twice and some stuff is never set up properly. Stream info is computed by context_apply_draw_state() before going through the state handler table for a long time now, getting rid of this obscure handler interdependency. So let's just get rid of the skipping altogether. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e106bbdd39a5f27bce028ed992033eb0a5635f60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/state.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e40c23daf03..269d7452c9f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -272,11 +272,7 @@ static void state_lighting(struct wined3d_context *context, const struct wined3d /* Lighting is not enabled if transformed vertices are drawn, but lighting * does not affect the stream sources, so it is not grouped for - * performance reasons. This state reads the decoded vertex declaration, - * so if it is dirty don't do anything. The vertex declaration applying - * function calls this function for updating. */ - if (isStateDirty(context, STATE_VDECL)) - return; + * performance reasons. */ if (state->render_states[WINED3D_RS_LIGHTING] && !context->stream_info.position_transformed) @@ -1504,12 +1500,6 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum Parm = 0; - /* Depends on the decoded vertex declaration to read the existence of - * diffuse data. The vertex declaration will call this function if the - * fixed function pipeline is used. */ - if (isStateDirty(&context_gl->c, STATE_VDECL)) - return; - context_gl->untracked_material_count = 0; if ((context_gl->c.stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) @@ -1650,9 +1640,6 @@ static void state_normalize(struct wined3d_context *context, const struct wined3 { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - if (isStateDirty(context, STATE_VDECL)) - return; - /* Without vertex normals, we set the current normal to 0/0/0 to remove the diffuse factor * from the opengl lighting equation, as d3d does. Normalization of 0/0/0 can lead to a division * by zero and is not properly defined in opengl, so avoid it @@ -3438,10 +3425,9 @@ static void transform_texture(struct wined3d_context *context, const struct wine unsigned int mapped_stage = context_gl->tex_unit_map[tex]; struct wined3d_matrix mat; - /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ - if (use_vs(state) || isStateDirty(context, STATE_VDECL)) + if (use_vs(state)) { - TRACE("Using a vertex shader, or stream sources not sorted out yet, skipping\n"); + TRACE("Using a vertex shader, skipping.\n"); return; } @@ -4007,8 +3993,6 @@ static void transform_projection(struct wined3d_context *context, const struct w static void streamsrc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (isStateDirty(context, STATE_VDECL)) - return; wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); }

1 0

Austin English : readme: Document Libera Chat migration.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 44da7b267afb19a848fb69d1f01ca629810be30a URL: https://source.winehq.org/git/wine.git/?a=commit;h=44da7b267afb19a848fb69d1… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 29 02:20:48 2021 -0500 readme: Document Libera Chat migration. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9a8be2a46063b5d9309e9e01bcd98826b53cef4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 2 +- documentation/README.fr | 2 +- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 2 +- documentation/README.nl | 2 +- documentation/README.no | 2 +- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 2 +- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44da7b267afb19a848fb…

1 0

Haoyang Chen : gdi32: Fix a memory leak.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 328d834ad95f6f1ef7eab445cb8836ff8dfba8e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=328d834ad95f6f1ef7eab445… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu May 13 14:17:57 2021 +0800 gdi32: Fix a memory leak. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b9c4e42014759e4f6ebb6e588a9f1113a256d61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d94643b4451..4f5d4725876 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1538,9 +1538,10 @@ static UINT parse_aa_pattern( FcPattern *pattern ) static FcPattern *create_family_pattern( const char *name, FcPattern **cached ) { - FcPattern *ret = NULL, *tmp, *pattern = pFcPatternCreate(); + FcPattern *ret = NULL, *tmp, *pattern; FcResult result; if (*cached) return *cached; + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (const FcChar8 *)name ); pFcPatternAddString( pattern, FC_NAMELANG, (const FcChar8 *)"en-us" ); pFcPatternAddString( pattern, FC_PRGNAME, (const FcChar8 *)"wine" );

1 0

Owen Rudge : winspool: Filter invalid characters when creating the PPD filename.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: fb5322856891bd0f6fb349c7999c409569f46995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5322856891bd0f6fb349c7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 10 12:26:50 2021 +0000 winspool: Filter invalid characters when creating the PPD filename. Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b906e82371513e9f5b94fa2d67ad8e0ee865335) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb9c1599d38..4d0542d20e3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,13 +721,18 @@ fail: static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - int len = (strlenW( dir ) + strlenW( file_name )) * sizeof(WCHAR) + sizeof(dot_ppd); - WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ); + static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; + int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); + WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; if (!ppd) return NULL; - strcpyW( ppd, dir ); - strcatW( ppd, file_name ); - strcatW( ppd, dot_ppd ); + memcpy( ppd, dir, dir_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len, file_name, file_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); + + p = ppd + dir_len; + while ((p = strpbrkW( p, invalid_chars ))) *p++ = '_'; return ppd; }

1 0

Paul Gofman : vcruntime140_1: Support two continuation addresses for catchblock.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 5cf41e251d8aa3198345afe08faf962f0a0bfa5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cf41e251d8aa3198345afe0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 3 16:10:39 2021 +0100 vcruntime140_1: Support two continuation addresses for catchblock. MSVC generates that sometimes when there is a goto from catch block. Fixes a crash in Company of Heroes 2. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 049bd08d8b95b544bc34385170cb362863863d73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 59 +++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index a5a760b7b08..039da37d598 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -20,6 +20,8 @@ #ifdef __x86_64__ +#include <stdlib.h> + #include "wine/exception.h" #include "wine/debug.h" #include "cppexcept.h" @@ -66,12 +68,14 @@ typedef struct UINT type_info; int offset; UINT handler; - UINT ret_addr; + UINT ret_addr[2]; } catchblock_info; #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 -#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_RET_ADDR_MASK 0x30 +#define CATCHBLOCK_RET_ADDR 0x10 +#define CATCHBLOCK_TWO_RET_ADDRS 0x20 #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -82,6 +86,8 @@ typedef struct #define UNWIND_TYPE_DTOR_PTR 2 #define UNWIND_TYPE_FRAME 3 +#define CONSOLIDATE_UNWIND_PARAMETER_COUNT 10 + typedef struct { UINT start_level; @@ -214,19 +220,31 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) { + BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; } + ret_addr_type = ci->header & CATCHBLOCK_RET_ADDR_MASK; + if (ret_addr_type == (CATCHBLOCK_RET_ADDR | CATCHBLOCK_TWO_RET_ADDRS)) + { + FIXME("unsupported ret addr type.\n"); + return FALSE; + } + if (ci->header & CATCHBLOCK_FLAGS) ci->flags = decode_uint(b); if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ci->header & CATCHBLOCK_RET_ADDR) ci->ret_addr = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b); + return TRUE; } @@ -303,9 +321,9 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT catchblock_info ci; if (!read_catchblock_info(&catchblock, &ci)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " - "ret addr %x type %x %s\n", j, ci.header, ci.offset, + "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), - ci.ret_addr, ci.type_info, + ci.ret_addr[0], ci.ret_addr[1], ci.type_info, dbgstr_type_info(rva_to_ptr(ci.type_info, image_base))); } } @@ -535,14 +553,26 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __FINALLY_CTX(cxx_catch_cleanup, &ctx) FlsSetValue(fls_index, (void*)-2); - if (rec->ExceptionInformation[8]) return (void*)rec->ExceptionInformation[8]; - return ret_addr; + TRACE("handler returned %p, ret_addr[0] %p, ret_addr[1] %p.\n", + ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]); + + if (rec->ExceptionInformation[9]) + { + if ((ULONG_PTR)ret_addr > 1) + { + ERR("unexpected handler result %p.\n", ret_addr); + abort(); + } + return (void*)rec->ExceptionInformation[8 + (ULONG_PTR)ret_addr]; + } + return rec->ExceptionInformation[8] ? (void *)rec->ExceptionInformation[8] : ret_addr; } static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) { - return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==9 && - rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block4; + return rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE + && rec->NumberParameters == CONSOLIDATE_UNWIND_PARAMETER_COUNT + && rec->ExceptionInformation[0] == (ULONG_PTR)call_catch_block4; } static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, @@ -610,7 +640,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; catch_record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - catch_record.NumberParameters = 9; + catch_record.NumberParameters = CONSOLIDATE_UNWIND_PARAMETER_COUNT; catch_record.ExceptionInformation[0] = (ULONG_PTR)call_catch_block4; catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = tryblock.catch_level; @@ -620,9 +650,12 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - if (ci.ret_addr) + if (ci.ret_addr[0]) catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + if (ci.ret_addr[1]) + catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( + ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } }

1 0

Zhiyi Zhang : ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: d7f35aacea6171c91aed0e6bf197d51c30f595b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7f35aacea6171c91aed0e6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 18:05:05 2021 +0800 ntoskrnl.exe: Exclude large integer APIs from relay tracing. Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7a4d757ce576c13ed68194e75f16a10e1f94cb7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)

1 0

Dmitry Timoshkov : ntdll: Exclude large integer APIs from relay tracing.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 8c985b2b66754335b13e170f91733f5408e828e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c985b2b66754335b13e170f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 13:00:06 2021 +0300 ntdll: Exclude large integer APIs from relay tracing. These builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations. Otherwise ucrtbase initialization code crashes with +relay enabled when compiled with clang as a PE build. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d7ec7968df1750c9c525817f1366b57fa72d839) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8ffef6b5f7d..cb6b7b12dad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1450,17 +1450,17 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __toascii(long) -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused

1 0

Arkadiusz Hiler : kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: f6144283a66c9a3f7bbc8ae6efe424974200cc5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6144283a66c9a3f7bbc8ae6… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 2 19:22:38 2021 +0200 kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources. Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e51ae86937c547124c906fb1d5db7a142af60686) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/version.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 58c49aa148b..d5bfa081939 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -240,7 +240,8 @@ done: * Copied from loader/pe_resource.c */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DIRECTORY *dir, - WORD id, const void *root ) + WORD id, const void *root, + DWORD root_size ) { const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; int min, max, pos; @@ -248,11 +249,19 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); min = dir->NumberOfNamedEntries; max = min + dir->NumberOfIdEntries - 1; + + if (max >= (root_size - ((INT_PTR)dir - (INT_PTR)root) - sizeof(*dir)) / sizeof(*entry)) + return NULL; + while (min <= max) { pos = (min + max) / 2; if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); + { + DWORD offset = entry[pos].u2.s2.OffsetToDirectory; + if (offset > root_size - sizeof(*dir)) return NULL; + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + offset); + } if (entry[pos].u.Id > id) max = pos - 1; else min = pos + 1; } @@ -294,7 +303,8 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root, DWORD flags ) + const void *root, DWORD root_size, + DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; @@ -319,7 +329,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); } - for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root, root_size ))) return ret; return find_entry_default( dir, root ); } @@ -413,7 +423,7 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; LPBYTE resSection; - DWORD len, section_size, data_size; + DWORD len, section_size, data_size, resDirSize; const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; @@ -486,21 +496,22 @@ static BOOL find_pe_resource( HANDLE handle, DWORD *resLen, DWORD *resOff, DWORD /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); + resDirSize = section_size - (resDataDir->VirtualAddress - sections[i].VirtualAddress); resPtr = resDir; - resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_FILE_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No typeid entry found\n" ); goto done; } - resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir ); + resPtr = find_entry_by_id( resPtr, VS_VERSION_INFO, resDir, resDirSize ); if ( !resPtr ) { TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir, flags ); + resPtr = find_entry_language( resPtr, resDir, resDirSize, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021