January 2024 - Wine-commits

Alexandre Julliard : ntdll/tests: Port the exception unwinding tests to ARM.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: adf5f5fd304402743d1741bb96d316c8ba46a1bb URL: https://gitlab.winehq.org/wine/wine/-/commit/adf5f5fd304402743d1741bb96d316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 16:21:38 2024 +0100 ntdll/tests: Port the exception unwinding tests to ARM. --- dlls/ntdll/tests/exception.c | 189 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index aca6383c83c..b6d22092a11 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7772,6 +7772,193 @@ static void test_KiUserCallbackDispatcher(void) VirtualProtect( code_ptr, sizeof(saved_code), old_protect, &old_protect ); } +struct unwind_info +{ + DWORD function_length : 18; + DWORD version : 2; + DWORD x : 1; + DWORD e : 1; + DWORD f : 1; + DWORD epilog : 5; + DWORD codes : 4; +}; + +static void run_exception_test(void *handler, const void* context, + const void *code, unsigned int code_size, + unsigned int func2_offset, DWORD access, DWORD handler_flags) +{ + DWORD buf[11]; + RUNTIME_FUNCTION runtime_func[2]; + struct unwind_info unwind; + void (*func)(void) = (void *)((char *)code_mem + 1); /* thumb */ + DWORD oldaccess, oldaccess2; + + runtime_func[0].BeginAddress = 0; + runtime_func[0].UnwindData = 0x1000; + runtime_func[1].BeginAddress = func2_offset; + runtime_func[1].UnwindData = 0x1010; + + unwind.function_length = func2_offset / 2; + unwind.version = 0; + unwind.x = 1; + unwind.e = 1; + unwind.f = 0; + unwind.epilog = 1; + unwind.codes = 1; + buf[0] = *(DWORD *)&unwind; + buf[1] = 0xfbfbffd4; /* push {r4, lr}; end; nop; nop */ + buf[2] = 0x1021; + *(const void **)&buf[3] = context; + unwind.function_length = (code_size - func2_offset) / 2; + buf[4] = *(DWORD *)&unwind; + buf[5] = 0xfbfbffd4; /* push {r4, lr}; end; nop; nop */ + buf[6] = 0x1021; + *(const void **)&buf[7] = context; + buf[8] = 0xc004f8df; /* ldr ip, 1f */ + buf[9] = 0xbf004760; /* bx ip; nop */ + *(const void **)&buf[10] = handler; + + memcpy((unsigned char *)code_mem + 0x1000, buf, sizeof(buf)); + memcpy(code_mem, code, code_size); + if (access) VirtualProtect(code_mem, code_size, access, &oldaccess); + FlushInstructionCache( GetCurrentProcess(), code_mem, 0x2000 ); + + RtlAddFunctionTable(runtime_func, ARRAY_SIZE(runtime_func), (ULONG_PTR)code_mem); + func(); + pRtlDeleteFunctionTable(runtime_func); + + if (access) VirtualProtect(code_mem, code_size, oldaccess, &oldaccess2); +} + +static BOOL got_nested_exception, got_prev_frame_exception; +static void *nested_exception_initial_frame; + +static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + trace("nested_exception_handler pc %p, sp %p, code %#lx, flags %#lx, ExceptionAddress %p.\n", + (void *)context->Pc, (void *)context->Sp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress); + + if (rec->ExceptionCode == 0x80000003 && !(rec->ExceptionFlags & EH_NESTED_CALL)) + { + ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); + ok((char *)context->Sp == (char *)frame - 8, "Got unexpected frame %p / %p.\n", frame, (void *)context->Sp); + ok((char *)context->Lr == (char *)code_mem + 0x07, "Got unexpected lr %p.\n", (void *)context->Lr); + ok((char *)context->Pc == (char *)code_mem + 0x0b, "Got unexpected pc %p.\n", (void *)context->Pc); + + nested_exception_initial_frame = frame; + RaiseException(0xdeadbeef, 0, 0, 0); + context->Pc += 2; + return ExceptionContinueExecution; + } + + if (rec->ExceptionCode == 0xdeadbeef && + (rec->ExceptionFlags == EH_NESTED_CALL || + rec->ExceptionFlags == (EH_NESTED_CALL | EXCEPTION_SOFTWARE_ORIGINATE))) + { + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); + got_nested_exception = TRUE; + ok(frame == nested_exception_initial_frame, "Got unexpected frame %p / %p.\n", + frame, nested_exception_initial_frame); + return ExceptionContinueSearch; + } + + ok(rec->ExceptionCode == 0xdeadbeef && (!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE), + "Got unexpected exception code %#lx, flags %#lx.\n", rec->ExceptionCode, rec->ExceptionFlags); + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); + ok((char *)frame == (char *)nested_exception_initial_frame + 8, "Got unexpected frame %p / %p.\n", + frame, nested_exception_initial_frame); + got_prev_frame_exception = TRUE; + return ExceptionContinueExecution; +} + +static const WORD nested_except_code[] = +{ + 0xb510, /* 00: push {r4, lr} */ + 0xf000, 0xf801, /* 02: bl 1f */ + 0xbd10, /* 06: pop {r4, pc} */ + 0xb510, /* 08: 1: push {r4, lr} */ + 0xdefe, /* 0a: trap */ + 0xbf00, /* 0c: nop */ + 0xbd10, /* 0e: pop {r4, pc} */ +}; + +static void test_nested_exception(void) +{ + got_nested_exception = got_prev_frame_exception = FALSE; + run_exception_test(nested_exception_handler, NULL, nested_except_code, sizeof(nested_except_code), + 4 * sizeof(WORD), PAGE_EXECUTE_READ, UNW_FLAG_EHANDLER); + ok(got_nested_exception, "Did not get nested exception.\n"); + ok(got_prev_frame_exception, "Did not get nested exception in the previous frame.\n"); +} + +static unsigned int collided_unwind_exception_count; + +static DWORD collided_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + CONTEXT ctx; + + trace("collided_exception_handler pc %p, sp %p, code %#lx, flags %#lx, ExceptionAddress %p, frame %p.\n", + (void *)context->Pc, (void *)context->Sp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame); + + switch(collided_unwind_exception_count++) + { + case 0: + /* Initial exception from nested_except_code. */ + ok(rec->ExceptionCode == STATUS_BREAKPOINT, "got %#lx.\n", rec->ExceptionCode); + nested_exception_initial_frame = frame; + /* Start unwind. */ + pRtlUnwindEx((char *)frame + 8, (char *)code_mem + 0x07, NULL, NULL, &ctx, NULL); + ok(0, "shouldn't be reached\n"); + break; + case 1: + ok(rec->ExceptionCode == STATUS_UNWIND, "got %#lx.\n", rec->ExceptionCode); + ok(rec->ExceptionFlags == EH_UNWINDING, "got %#lx.\n", rec->ExceptionFlags); + ok((char *)context->Pc == (char *)code_mem + 0x0b, "got %p.\n", (void *)context->Pc); + /* generate exception in unwind handler. */ + RaiseException(0xdeadbeef, 0, 0, 0); + ok(0, "shouldn't be reached\n"); + break; + case 2: + /* Inner call frame, continue search. */ + ok(rec->ExceptionCode == 0xdeadbeef, "got %#lx.\n", rec->ExceptionCode); + ok(!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE, "got %#lx.\n", rec->ExceptionFlags); + ok(frame == nested_exception_initial_frame, "got %p, expected %p.\n", frame, nested_exception_initial_frame); + break; + case 3: + /* Top level call frame, handle exception by unwinding. */ + ok(rec->ExceptionCode == 0xdeadbeef, "got %#lx.\n", rec->ExceptionCode); + ok(!rec->ExceptionFlags || rec->ExceptionFlags == EXCEPTION_SOFTWARE_ORIGINATE, "got %#lx.\n", rec->ExceptionFlags); + ok((char *)frame == (char *)nested_exception_initial_frame + 8, "got %p, expected %p.\n", frame, nested_exception_initial_frame); + pRtlUnwindEx((char *)nested_exception_initial_frame + 8, (char *)code_mem + 0x07, NULL, NULL, &ctx, NULL); + ok(0, "shouldn't be reached\n"); + break; + case 4: + /* Collided unwind. */ + ok(rec->ExceptionCode == STATUS_UNWIND, "got %#lx.\n", rec->ExceptionCode); + ok(rec->ExceptionFlags == (EH_UNWINDING | EH_COLLIDED_UNWIND), "got %#lx.\n", rec->ExceptionFlags); + ok(frame == nested_exception_initial_frame, "got %p, expected %p.\n", frame, nested_exception_initial_frame); + break; + case 5: + /* EH_COLLIDED_UNWIND cleared for the following frames. */ + ok(rec->ExceptionCode == STATUS_UNWIND, "got %#lx.\n", rec->ExceptionCode); + ok(rec->ExceptionFlags == (EH_UNWINDING | EH_TARGET_UNWIND), "got %#lx.\n", rec->ExceptionFlags); + ok((char *)frame == (char *)nested_exception_initial_frame + 8, "got %p, expected %p.\n", frame, nested_exception_initial_frame); + break; + } + return ExceptionContinueSearch; +} + +static void test_collided_unwind(void) +{ + got_nested_exception = got_prev_frame_exception = FALSE; + collided_unwind_exception_count = 0; + run_exception_test(collided_exception_handler, NULL, nested_except_code, sizeof(nested_except_code), + 4 * sizeof(WORD), PAGE_EXECUTE_READ, UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER); + ok(collided_unwind_exception_count == 6, "got %u.\n", collided_unwind_exception_count); +} + #elif defined(__aarch64__) #define UNW_FLAG_NHANDLER 0 @@ -12864,6 +13051,8 @@ START_TEST(exception) #elif defined(__arm__) test_virtual_unwind(); + test_nested_exception(); + test_collided_unwind(); #endif

1 0

Martin Storsjö : wineps.drv: Avoid invalid unaligned accesses.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 11128e236fbd75dbecd37de1a1a9e93af3c0ad50 URL: https://gitlab.winehq.org/wine/wine/-/commit/11128e236fbd75dbecd37de1a1a9e9… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Jan 24 00:04:16 2024 +0200 wineps.drv: Avoid invalid unaligned accesses. While armv7 generally tolerates unaligned loads/stores in most cases, the compiler is free to use the ldrd/strd instructions, for loading/storing two consecutive 32 bit registers, and this requires the destination to be aligned to a 4 byte boundary. When packing a number of variable length structures, make sure that each actual struct gets aligned at the right address boundary. This fixes crashes in DllMain of wineps.drv, when built for armv7, since 351e58dc2d0aafe19294cbeaed9cd30ae965d591. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/wineps.drv/init.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 8537ba287d1..10e8e77e52d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -133,6 +133,10 @@ static BOOL import_ntf_from_reg(void) return ret; } +#define DWORD_ALIGN(x) (((x) + 3) & ~3) +#define ntf_strsize(str) DWORD_ALIGN(strlen(str) + 1) +#define ntf_wcssize(str) DWORD_ALIGN((wcslen(str) + 1) * sizeof(WCHAR)) + static BOOL convert_afm_to_ntf(void) { int i, count, size, off, metrics_size; @@ -176,8 +180,8 @@ static BOOL convert_afm_to_ntf(void) list = (void *)(data + header->glyph_set_off + sizeof(*list) * count); list->name_off = off + sizeof(*glyph_set); - list->size = sizeof(*glyph_set) + strlen(glyph_set_name) + 1 + sizeof(*cp) + - sizeof(short) * afmle->afm->NumofMetrics; + list->size = sizeof(*glyph_set) + ntf_strsize(glyph_set_name) + sizeof(*cp) + + DWORD_ALIGN(sizeof(short) * afmle->afm->NumofMetrics); list->off = off; size += list->size; new_data = realloc(data, size); @@ -196,7 +200,7 @@ static BOOL convert_afm_to_ntf(void) glyph_set->name_off = sizeof(*glyph_set); glyph_set->glyph_count = afmle->afm->NumofMetrics; glyph_set->cp_count = 1; - glyph_set->cp_off = glyph_set->name_off + strlen(glyph_set_name) + 1; + glyph_set->cp_off = glyph_set->name_off + ntf_strsize(glyph_set_name); glyph_set->glyph_set_off = glyph_set->cp_off + sizeof(*cp); strcpy(data + off + glyph_set->name_off, glyph_set_name); cp = (void *)(data + off + glyph_set->cp_off); @@ -205,12 +209,11 @@ static BOOL convert_afm_to_ntf(void) *(WCHAR*)(data + off + glyph_set->glyph_set_off + i * sizeof(short)) = afmle->afm->Metrics[i].UV; off = size; - metrics_size = sizeof(IFIMETRICS) + - (wcslen(afmle->afm->FamilyName) + 1) * sizeof(WCHAR); + metrics_size = sizeof(IFIMETRICS) + ntf_wcssize(afmle->afm->FamilyName); list = (void *)(data + header->font_mtx_off + sizeof(*list) * count); list->name_off = off + sizeof(*font_mtx); - list->size = sizeof(*font_mtx) + strlen(afmle->afm->FontName) + 1 + - strlen(glyph_set_name) + 1 + metrics_size + + list->size = sizeof(*font_mtx) + ntf_strsize(afmle->afm->FontName) + + ntf_strsize(glyph_set_name) + metrics_size + (afmle->afm->IsFixedPitch ? 0 : sizeof(*width_range) * afmle->afm->NumofMetrics); list->off = off; size += list->size; @@ -227,9 +230,9 @@ static BOOL convert_afm_to_ntf(void) font_mtx = (void *)(data + off); font_mtx->size = size - off; font_mtx->name_off = sizeof(*font_mtx); - font_mtx->glyph_set_name_off = font_mtx->name_off + strlen(afmle->afm->FontName) + 1; + font_mtx->glyph_set_name_off = font_mtx->name_off + ntf_strsize(afmle->afm->FontName); font_mtx->glyph_count = afmle->afm->NumofMetrics; - font_mtx->metrics_off = font_mtx->glyph_set_name_off + strlen(glyph_set_name) + 1; + font_mtx->metrics_off = font_mtx->glyph_set_name_off + ntf_strsize(glyph_set_name); font_mtx->width_count = afmle->afm->IsFixedPitch ? 0 : afmle->afm->NumofMetrics; font_mtx->width_off = font_mtx->metrics_off + metrics_size; font_mtx->def_width = afmle->afm->Metrics[0].WX;

1 0

Nikolay Sivov : d3d10/effect: Use bitfields for numeric type descriptions.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 3724385c86eeedd6de8fa91d6179b64ba0fd9597 URL: https://gitlab.winehq.org/wine/wine/-/commit/3724385c86eeedd6de8fa91d6179b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 25 22:20:11 2024 +0100 d3d10/effect: Use bitfields for numeric type descriptions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6e2b67bb700..534eadb2659 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -34,20 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_CLI4 MAKE_TAG('C', 'L', 'I', '4') #define TAG_CTAB MAKE_TAG('C', 'T', 'A', 'B') -#define D3D10_FX10_TYPE_COLUMN_SHIFT 11 -#define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT) - -#define D3D10_FX10_TYPE_ROW_SHIFT 8 -#define D3D10_FX10_TYPE_ROW_MASK (0x7 << D3D10_FX10_TYPE_ROW_SHIFT) - -#define D3D10_FX10_TYPE_BASETYPE_SHIFT 3 -#define D3D10_FX10_TYPE_BASETYPE_MASK (0x1f << D3D10_FX10_TYPE_BASETYPE_SHIFT) - -#define D3D10_FX10_TYPE_CLASS_SHIFT 0 -#define D3D10_FX10_TYPE_CLASS_MASK (0x7 << D3D10_FX10_TYPE_CLASS_SHIFT) - -#define D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK 0x4000 - static inline struct d3d10_effect *impl_from_ID3D10EffectPool(ID3D10EffectPool *iface) { return CONTAINING_RECORD(iface, struct d3d10_effect, ID3D10EffectPool_iface); @@ -1897,9 +1883,25 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(uint32_t t, BOOL is_object } } +struct numeric_type +{ + uint32_t type_class : 3; + uint32_t base_type : 5; + uint32_t rows : 3; + uint32_t columns : 3; + uint32_t column_major : 1; + uint32_t unknown : 17; +}; + static HRESULT parse_fx10_type(const char *data, size_t data_size, uint32_t offset, struct d3d10_effect_type *t) { uint32_t typeinfo, type_flags, type_kind; + union + { + struct numeric_type type; + uint32_t data; + } numeric; + const char *ptr; unsigned int i; @@ -1940,28 +1942,25 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, uint32_t offs case 1: TRACE("Type is numeric.\n"); - if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) + if (!require_space(ptr - data, 1, sizeof(numeric), data_size)) { WARN("Invalid offset %#x (data size %#Ix).\n", offset, data_size); return E_FAIL; } - typeinfo = read_u32(&ptr); + numeric.data = read_u32(&ptr); t->member_count = 0; - t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; - t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) - >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE, &type_flags); - t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) - >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); + t->column_count = numeric.type.columns; + t->row_count = numeric.type.rows; + t->basetype = d3d10_variable_type(numeric.type.base_type, FALSE, &type_flags); + t->type_class = d3d10_variable_class(numeric.type.type_class, numeric.type.column_major); - TRACE("Type description: %#x.\n", typeinfo); + TRACE("Type description: %#x.\n", numeric.data); TRACE("\tcolumns: %u.\n", t->column_count); TRACE("\trows: %u.\n", t->row_count); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); - TRACE("\tunknown bits: %#x.\n", typeinfo & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK - | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK | D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK)); + TRACE("\tunknown bits: %#x.\n", numeric.type.unknown); break; case 2:

1 0

Brendan McGrath : d2d1: Use 24-bit FP precision for triangulate.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 6d8489a0bb5e117296334433a38f4d3a3c8318c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8489a0bb5e117296334433a38f4d… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jan 11 11:14:19 2024 +1100 d2d1: Use 24-bit FP precision for triangulate. This fixes a rendering issue (and ultimately a crash) in PowerPoint when compiling with GCC 8. GCC8 doesn't support the `excess-precision=standard` option under the `#pragma GCC optimize` directive. This results in unpredictable floating point rounding leading to errors when inserting segments (with missing edges and/or triangles). Using 24-bit precision ensures we don't have any excess precision. --- dlls/d2d1/geometry.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index d6ee91de005..9b0b7844739 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -16,10 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__GNUC__) && !defined(__clang__) -#pragma GCC optimize "O2,no-strict-aliasing,excess-precision=standard" -#endif - #include "d2d1_private.h" #include <float.h> @@ -1539,7 +1535,7 @@ static BOOL d2d_cdt_triangulate(struct d2d_cdt *cdt, size_t start_vertex, size_t return TRUE; } - /* More than tree vertices, divide. */ + /* More than three vertices, divide. */ cut = vertex_count / 2; if (!d2d_cdt_triangulate(cdt, start_vertex, cut, &left_outer, &left_inner)) return FALSE; @@ -2289,6 +2285,9 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) size_t vertex_count, i, j; struct d2d_cdt cdt = {0}; D2D1_POINT_2F *vertices; +#ifdef __i386__ + unsigned int control_word_x87, mask = 0; +#endif for (i = 0, vertex_count = 0; i < geometry->u.path.figure_count; ++i) { @@ -2339,10 +2338,20 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) cdt.free_edge = ~0u; cdt.vertices = vertices; + +#ifdef __i386__ + control_word_x87 = _controlfp(0, 0); + _controlfp(_PC_24, mask = _MCW_PC); +#endif if (!d2d_cdt_triangulate(&cdt, 0, vertex_count, &left_edge, &right_edge)) goto fail; if (!d2d_cdt_insert_segments(&cdt, geometry)) goto fail; +#ifdef __i386__ + _controlfp(control_word_x87, _MCW_PC); + mask = 0; +#endif + if (!d2d_cdt_generate_faces(&cdt, geometry)) goto fail; @@ -2354,6 +2363,9 @@ fail: geometry->fill.vertex_count = 0; free(vertices); free(cdt.edges); +#ifdef __i386__ + if (mask) _controlfp(control_word_x87, mask); +#endif return E_FAIL; }

1 0

Brendan McGrath : d2d1: Fix double free bug when d2d_geometry_sink_Close fails.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 1e79217fb0c63fc53cf021fb203e282b1bae3b04 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e79217fb0c63fc53cf021fb203e28… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jan 11 15:48:52 2024 +1100 d2d1: Fix double free bug when d2d_geometry_sink_Close fails. geometry->fill.bezier_vertices was being freed on the failed path in d2d_geometry_sink_Close and then again when the path geometry was released (in d2d_geometry_cleanup). By setting it to NULL after freeing it initially, all other calls to free it are a no-op. --- dlls/d2d1/geometry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9b0b7844739..3da3ad2e65b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3247,6 +3247,7 @@ done: if (FAILED(hr)) { free(geometry->fill.bezier_vertices); + geometry->fill.bezier_vertices = NULL; geometry->fill.bezier_vertex_count = 0; d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR;

1 0

Gabriel Brand : kernel32: Add string for WSAEADDRNOTAVAIL error.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 12141ad6c57352fe05852282f3c28f8ee50969cd URL: https://gitlab.winehq.org/wine/wine/-/commit/12141ad6c57352fe05852282f3c28f… Author: Gabriel Brand <gabrielb(a)braincalibration.de> Date: Mon Jan 1 00:29:55 2024 +0100 kernel32: Add string for WSAEADDRNOTAVAIL error. --- dlls/kernelbase/winerror.mc | 5 +++++ po/ar.po | 24 ++++++++++++++---------- po/ast.po | 24 ++++++++++++++---------- po/bg.po | 24 ++++++++++++++---------- po/ca.po | 24 ++++++++++++++---------- po/cs.po | 24 ++++++++++++++---------- po/da.po | 24 ++++++++++++++---------- po/de.po | 24 ++++++++++++++---------- po/el.po | 24 ++++++++++++++---------- po/en.po | 24 ++++++++++++++---------- po/en_US.po | 24 ++++++++++++++---------- po/eo.po | 24 ++++++++++++++---------- po/es.po | 24 ++++++++++++++---------- po/fa.po | 24 ++++++++++++++---------- po/fi.po | 24 ++++++++++++++---------- po/fr.po | 24 ++++++++++++++---------- po/he.po | 24 ++++++++++++++---------- po/hi.po | 24 ++++++++++++++---------- po/hr.po | 24 ++++++++++++++---------- po/hu.po | 24 ++++++++++++++---------- po/it.po | 24 ++++++++++++++---------- po/ja.po | 24 ++++++++++++++---------- po/ka.po | 24 ++++++++++++++---------- po/ko.po | 24 ++++++++++++++---------- po/lt.po | 24 ++++++++++++++---------- po/ml.po | 24 ++++++++++++++---------- po/nb_NO.po | 24 ++++++++++++++---------- po/nl.po | 24 ++++++++++++++---------- po/or.po | 24 ++++++++++++++---------- po/pa.po | 24 ++++++++++++++---------- po/pl.po | 24 ++++++++++++++---------- po/pt_BR.po | 24 ++++++++++++++---------- po/pt_PT.po | 24 ++++++++++++++---------- po/rm.po | 24 ++++++++++++++---------- po/ro.po | 24 ++++++++++++++---------- po/ru.po | 24 ++++++++++++++---------- po/si.po | 24 ++++++++++++++---------- po/sk.po | 24 ++++++++++++++---------- po/sl.po | 24 ++++++++++++++---------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++++---------- po/sr_RS(a)latin.po | 24 ++++++++++++++---------- po/sv.po | 24 ++++++++++++++---------- po/ta.po | 24 ++++++++++++++---------- po/te.po | 24 ++++++++++++++---------- po/th.po | 24 ++++++++++++++---------- po/tr.po | 24 ++++++++++++++---------- po/uk.po | 24 ++++++++++++++---------- po/wa.po | 24 ++++++++++++++---------- po/wine.pot | 24 ++++++++++++++---------- po/zh_CN.po | 24 ++++++++++++++---------- po/zh_TW.po | 24 ++++++++++++++---------- 51 files changed, 705 insertions(+), 500 deletions(-)

1 0

Dāvis Mosāns : ntdll/tests: Test NtContinue on x86-64.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: e5aafd9eed5ff82eb33708f6abbb252bf6c9722c URL: https://gitlab.winehq.org/wine/wine/-/commit/e5aafd9eed5ff82eb33708f6abbb25… Author: Dāvis Mosāns <davispuh(a)gmail.com> Date: Tue Dec 19 18:24:36 2023 +0200 ntdll/tests: Test NtContinue on x86-64. Co-authored-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 164 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a183980895a..839f34476e6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4425,6 +4425,169 @@ static void test_thread_context(void) #undef COMPARE } +static void test_continue(void) +{ + struct context_pair { + CONTEXT before; + CONTEXT after; + } contexts; + NTSTATUS (*func_ptr)( struct context_pair *, BOOL alertable, void *continue_func, void *capture_func ) = code_mem; + int i; + + static const BYTE call_func[] = + { + /* ret at 8*13(rsp) */ + + /* need to preserve these */ + 0x53, /* push %rbx; 8*12(rsp) */ + 0x55, /* push %rbp; 8*11(rsp) */ + 0x56, /* push %rsi; 8*10(rsp) */ + 0x57, /* push %rdi; 8*9(rsp) */ + 0x41, 0x54, /* push %r12; 8*8(rsp) */ + 0x41, 0x55, /* push %r13; 8*7(rsp) */ + 0x41, 0x56, /* push %r14; 8*6(rsp) */ + 0x41, 0x57, /* push %r15; 8*5(rsp) */ + + 0x48, 0x83, 0xec, 0x28, /* sub $0x28, %rsp; reserve space for rsp and outgoing reg params */ + 0x48, 0x89, 0x64, 0x24, 0x20, /* mov %rsp, 8*4(%rsp); for stack validation */ + + /* save args */ + 0x48, 0x89, 0x4c, 0x24, 0x70, /* mov %rcx, 8*14(%rsp) */ + 0x48, 0x89, 0x54, 0x24, 0x78, /* mov %rdx, 8*15(%rsp) */ + 0x4c, 0x89, 0x84, 0x24, 0x80, 0x00, 0x00, 0x00, /* mov %r8, 8*16(%rsp) */ + 0x4c, 0x89, 0x8c, 0x24, 0x88, 0x00, 0x00, 0x00, /* mov %r9, 8*17(%rsp) */ + + /* invoke capture context */ + 0x41, 0xff, 0xd1, /* call *%r9 */ + + /* overwrite general registers */ + 0x48, 0xb8, 0xef, 0xbe, 0xad, 0xde, 0xef, 0xbe, 0xad, 0xde, /* movabs $0xdeadbeefdeadbeef, %rax */ + 0x48, 0x89, 0xc1, /* mov %rax, %rcx */ + 0x48, 0x89, 0xc2, /* mov %rax, %rdx */ + 0x48, 0x89, 0xc3, /* mov %rax, %rbx */ + 0x48, 0x89, 0xc5, /* mov %rax, %rbp */ + 0x48, 0x89, 0xc6, /* mov %rax, %rsi */ + 0x48, 0x89, 0xc7, /* mov %rax, %rdi */ + 0x49, 0x89, 0xc0, /* mov %rax, %r8 */ + 0x49, 0x89, 0xc1, /* mov %rax, %r9 */ + 0x49, 0x89, 0xc2, /* mov %rax, %r10 */ + 0x49, 0x89, 0xc3, /* mov %rax, %r11 */ + 0x49, 0x89, 0xc4, /* mov %rax, %r12 */ + 0x49, 0x89, 0xc5, /* mov %rax, %r13 */ + 0x49, 0x89, 0xc6, /* mov %rax, %r14 */ + 0x49, 0x89, 0xc7, /* mov %rax, %r15 */ + + /* overwrite SSE registers */ + 0x66, 0x48, 0x0f, 0x6e, 0xc0, /* movq %rax, %xmm0 */ + 0x66, 0x0f, 0x6c, 0xc0, /* punpcklqdq %xmm0, %xmm0; extend to high quadword */ + 0x0f, 0x28, 0xc8, /* movaps %xmm0, %xmm1 */ + 0x0f, 0x28, 0xd0, /* movaps %xmm0, %xmm2 */ + 0x0f, 0x28, 0xd8, /* movaps %xmm0, %xmm3 */ + 0x0f, 0x28, 0xe0, /* movaps %xmm0, %xmm4 */ + 0x0f, 0x28, 0xe8, /* movaps %xmm0, %xmm5 */ + 0x0f, 0x28, 0xf0, /* movaps %xmm0, %xmm6 */ + 0x0f, 0x28, 0xf8, /* movaps %xmm0, %xmm7 */ + 0x44, 0x0f, 0x28, 0xc0, /* movaps %xmm0, %xmm8 */ + 0x44, 0x0f, 0x28, 0xc8, /* movaps %xmm0, %xmm9 */ + 0x44, 0x0f, 0x28, 0xd0, /* movaps %xmm0, %xmm10 */ + 0x44, 0x0f, 0x28, 0xd8, /* movaps %xmm0, %xmm11 */ + 0x44, 0x0f, 0x28, 0xe0, /* movaps %xmm0, %xmm12 */ + 0x44, 0x0f, 0x28, 0xe8, /* movaps %xmm0, %xmm13 */ + 0x44, 0x0f, 0x28, 0xf0, /* movaps %xmm0, %xmm14 */ + 0x44, 0x0f, 0x28, 0xf8, /* movaps %xmm0, %xmm15 */ + + /* FIXME: overwrite debug, x87 FPU and AVX registers to test those */ + + /* load args */ + 0x48, 0x8b, 0x4c, 0x24, 0x70, /* mov 8*14(%rsp), %rcx; context */ + 0x48, 0x8b, 0x54, 0x24, 0x78, /* mov 8*15(%rsp), %rdx; alertable */ + 0x48, 0x83, 0xec, 0x70, /* sub $0x70, %rsp; change stack */ + + /* setup context to return to label 1 */ + 0x48, 0x8d, 0x05, 0x18, 0x00, 0x00, 0x00, /* lea 1f(%rip), %rax */ + 0x48, 0x89, 0x81, 0xf8, 0x00, 0x00, 0x00, /* mov %rax, 0xf8(%rcx); context.Rip */ + + /* flip some EFLAGS */ + 0x9c, /* pushf */ + /* + 0x0001 Carry flag + 0x0004 Parity flag + 0x0010 Auxiliary Carry flag + 0x0040 Zero flag + 0x0080 Sign flag + FIXME: 0x0400 Direction flag - not changing as it breaks Wine + 0x0800 Overflow flag + ~0x4000~ Nested task flag - not changing - breaks Wine + = 0x8d5 + */ + 0x48, 0x81, 0x34, 0x24, 0xd5, 0x08, 0x00, 0x00, /* xorq $0x8d5, (%rsp) */ + 0x9d, /* popf */ + + /* invoke NtContinue... */ + 0xff, 0x94, 0x24, 0xf0, 0x00, 0x00, 0x00, /* call *8*16+0x70(%rsp) */ + + /* validate stack pointer */ + 0x48, 0x3b, 0x64, 0x24, 0x20, /* 1: cmp 0x20(%rsp), %rsp */ + 0x74, 0x02, /* je 2f; jump over ud2 */ + 0x0f, 0x0b, /* ud2; stack pointer invalid, let's crash */ + + /* invoke capture context */ + 0x48, 0x8b, 0x4c, 0x24, 0x70, /* 2: mov 8*14(%rsp), %rcx; context */ + 0x48, 0x81, 0xc1, 0xd0, 0x04, 0x00, 0x00, /* add $0x4d0, %rcx; +sizeof(CONTEXT) to get context->after */ + 0xff, 0x94, 0x24, 0x88, 0x00, 0x00, 0x00, /* call *8*17(%rsp) */ + + /* free stack */ + 0x48, 0x83, 0xc4, 0x28, /* add $0x28, %rsp */ + + /* restore back */ + 0x41, 0x5f, /* pop %r15 */ + 0x41, 0x5e, /* pop %r14 */ + 0x41, 0x5d, /* pop %r13 */ + 0x41, 0x5c, /* pop %r12 */ + 0x5f, /* pop %rdi */ + 0x5e, /* pop %rsi */ + 0x5d, /* pop %rbp */ + 0x5b, /* pop %rbx */ + 0xc3 /* ret */ + }; + + if (!pRtlCaptureContext) + { + win_skip("RtlCaptureContext is not available.\n"); + return; + } + + memcpy( func_ptr, call_func, sizeof(call_func) ); + FlushInstructionCache( GetCurrentProcess(), func_ptr, sizeof(call_func) ); + + func_ptr( &contexts, FALSE, NtContinue, pRtlCaptureContext ); + +#define COMPARE(reg) \ + ok( contexts.before.reg == contexts.after.reg, "wrong " #reg " %p/%p\n", (void *)(ULONG64)contexts.before.reg, (void *)(ULONG64)contexts.after.reg ) + + COMPARE( Rax ); + COMPARE( Rdx ); + COMPARE( Rbx ); + COMPARE( Rbp ); + COMPARE( Rsi ); + COMPARE( Rdi ); + COMPARE( R8 ); + COMPARE( R9 ); + COMPARE( R10 ); + COMPARE( R11 ); + COMPARE( R12 ); + COMPARE( R13 ); + COMPARE( R14 ); + COMPARE( R15 ); + + for (i = 0; i < 16; i++) + ok( !memcmp( &contexts.before.Xmm0 + i, &contexts.after.Xmm0 + i, sizeof(contexts.before.Xmm0) ), + "wrong xmm%u %08I64x%08I64x/%08I64x%08I64x\n", i, *(&contexts.before.Xmm0.High + i*2), *(&contexts.before.Xmm0.Low + i*2), + *(&contexts.after.Xmm0.High + i*2), *(&contexts.after.Xmm0.Low + i*2) ); + +#undef COMPARE +} + static void test_wow64_context(void) { const char appname[] = "C:\\windows\\syswow64\\cmd.exe"; @@ -12469,6 +12632,7 @@ START_TEST(exception) test_debug_registers_wow64(); test_debug_service(1); test_simd_exceptions(); + test_continue(); test_virtual_unwind(); test___C_specific_handler(); test_restore_context();

1 0

Paul Gofman : winex11.drv: Fix wglSwapBuffers() with NULL current context with child window rendering.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: eb5993a7c6fbc1cd9deac0dceabc8f1c76e14ba8 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb5993a7c6fbc1cd9deac0dceabc8f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 22 16:28:32 2024 -0600 winex11.drv: Fix wglSwapBuffers() with NULL current context with child window rendering. --- dlls/opengl32/tests/opengl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 10 ++++----- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index e3ca82a9b03..74aff6b4bbd 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -2006,6 +2006,55 @@ static void test_copy_context(HDC hdc) ok(ret, "wglMakeCurrent failed, last error %#lx.\n", GetLastError()); } +static void test_child_window(HWND hwnd, PIXELFORMATDESCRIPTOR *pfd) +{ + int pixel_format; + DWORD t1, t; + HGLRC hglrc; + HWND child; + HDC hdc; + int res; + + child = CreateWindowA("static", "Title", WS_CHILDWINDOW | WS_VISIBLE, 50, 50, 100, 100, hwnd, NULL, NULL, NULL); + ok(!!child, "got error %lu.\n", GetLastError()); + + hdc = GetDC(child); + pixel_format = ChoosePixelFormat(hdc, pfd); + res = SetPixelFormat(hdc, pixel_format, pfd); + ok(res, "got error %lu.\n", GetLastError()); + + hglrc = wglCreateContext(hdc); + ok(!!hglrc, "got error %lu.\n", GetLastError()); + + /* Test SwapBuffers with NULL context. */ + + glDrawBuffer(GL_BACK); + + /* Currently blit happening for child window in winex11 may not be updated with the latest GL frame + * even on glXWaitForSbcOML() path. So simulate continuous present for the test purpose. */ + trace("Child window rectangle should turn from red to green now.\n"); + t1 = GetTickCount(); + while ((t = GetTickCount()) - t1 < 3000) + { + res = wglMakeCurrent(hdc, hglrc); + ok(res, "got error %lu.\n", GetLastError()); + if (t - t1 > 1500) + glClearColor(0.0f, 1.0f, 0.0f, 1.0f); + else + glClearColor(1.0f, 0.0f, 0.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT); + res = wglMakeCurrent(NULL, NULL); + ok(res, "got error %lu.\n", GetLastError()); + SwapBuffers(hdc); + } + + res = wglDeleteContext(hglrc); + ok(res, "got error %lu.\n", GetLastError()); + + ReleaseDC(child, hdc); + DestroyWindow(child); +} + START_TEST(opengl) { HWND hwnd; @@ -2138,6 +2187,9 @@ START_TEST(opengl) else skip("WGL_EXT_swap_control not supported, skipping test\n"); + if (winetest_interactive) + test_child_window(hwnd, &pfd); + cleanup: ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bb8f13f78b9..d70f1928655 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3378,7 +3378,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) case DC_GL_PIXMAP_WIN: if (ctx) sync_context( ctx ); escape.gl_drawable = gl->pixmap; - if (pglXCopySubBufferMESA) { + if (ctx && pglXCopySubBufferMESA) { /* (glX)SwapBuffers has an implicit glFlush effect, however * GLX_MESA_copy_sub_buffer doesn't. Make sure GL is flushed before * copying */ @@ -3387,7 +3387,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) gl->pixmap_size.cx, gl->pixmap_size.cy ); break; } - if (pglXSwapBuffersMscOML) + if (ctx && pglXSwapBuffersMscOML) { pglFlush(); target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); @@ -3401,7 +3401,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) if (gl->type == DC_GL_CHILD_WIN) escape.gl_drawable = gl->window; /* fall through */ default: - if (escape.gl_drawable && pglXSwapBuffersMscOML) + if (ctx && escape.gl_drawable && pglXSwapBuffersMscOML) { pglFlush(); target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); @@ -3411,13 +3411,13 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) break; } - if (escape.gl_drawable && pglXWaitForSbcOML) + if (ctx && escape.gl_drawable && pglXWaitForSbcOML) pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc ); release_gl_drawable( gl ); if (escape.gl_drawable) - NtGdiExtEscape( ctx->hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); + NtGdiExtEscape( ctx ? ctx->hdc : hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); return TRUE; }

1 0

Gabriel Brand : ws2_32/tests: Test binding UDP socket to invalid address.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: b7f06a4a19f37ae1ffd3142d63e8a30d1a33ccf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7f06a4a19f37ae1ffd3142d63e8a3… Author: Gabriel Brand <gabrielb(a)braincalibration.de> Date: Mon Jan 1 00:27:33 2024 +0100 ws2_32/tests: Test binding UDP socket to invalid address. --- dlls/ws2_32/tests/sock.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c2345c1fa60..c93fb62c9d2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12526,6 +12526,13 @@ static void test_bind(void) s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + WSASetLastError(0xdeadbeef); + ret = bind(s, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + todo_wine + ok(ret == -1, "expected failure\n"); + todo_wine + ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); ret = bind(s, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "expected success\n");

1 0

Gabriel Brand : server: Return failure in bind if the address is not found.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 6361a20c5231e818cb8c669c152f248758b47da3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6361a20c5231e818cb8c669c152f24… Author: Gabriel Brand <gabrielb(a)braincalibration.de> Date: Mon Jan 1 00:27:59 2024 +0100 server: Return failure in bind if the address is not found. --- dlls/ws2_32/tests/sock.c | 2 -- server/sock.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c93fb62c9d2..b43d7d61867 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12528,9 +12528,7 @@ static void test_bind(void) WSASetLastError(0xdeadbeef); ret = bind(s, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); - todo_wine ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); diff --git a/server/sock.c b/server/sock.c index 84c0d4a4931..c34fd3eb5eb 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2231,7 +2231,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr in_addr_t bind_addr = addr->sin_addr.s_addr; struct ifaddrs *ifaddrs, *ifaddr; int fd = get_unix_fd( sock->fd ); - int err = 0; + int err = -1; if (bind_addr == htonl( INADDR_ANY ) || bind_addr == htonl( INADDR_LOOPBACK )) return 0;

1 0