July 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d v2] vkd3d-shader: Implement DMOV instruction.
by Conor McCarthy 28 Jul '21

28 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/spirv.c | 10 +++++++--- libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 7 +++++++ tests/d3d12.c | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e57cc413..0b6b5eea 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -311,6 +311,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DEQ = 0xc3, + VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -1250,6 +1251,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, + {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1804,6 +1806,8 @@ static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * } dst_param->write_mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; + if (data_type == VKD3D_DATA_DOUBLE) + dst_param->write_mask = vkd3d_write_mask_64_from_32(dst_param->write_mask); /* Scalar registers are declared with no write mask in shader bytecode. */ if (!dst_param->write_mask && shader_sm4_is_scalar_register(&dst_param->reg)) dst_param->write_mask = VKD3DSP_WRITEMASK_0; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0407f501..6d8b23b7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3573,6 +3573,7 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register_info reg_info; + unsigned int src_write_mask = write_mask; uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); @@ -3584,14 +3585,16 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); + if (reg->data_type == VKD3D_DATA_DOUBLE) + src_write_mask = vkd3d_write_mask_32_from_64(write_mask); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, + vkd3d_write_mask_component_count(src_write_mask)); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); component_type = reg_info.component_type; } vkd3d_dxbc_compiler_emit_store(compiler, - reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, src_write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -9309,6 +9312,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_HS_JOIN_PHASE: vkd3d_dxbc_compiler_enter_shader_phase(compiler, instruction); break; + case VKD3DSIH_DMOV: case VKD3DSIH_MOV: vkd3d_dxbc_compiler_emit_mov(compiler, instruction); break; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 556654ec..b80aef67 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DIV */ "div", + /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", /* VKD3DSIH_DP3 */ "dp3", @@ -1122,6 +1123,9 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, { static const char write_mask_chars[] = "xyzw"; + if (param->reg.data_type == VKD3D_DATA_DOUBLE) + write_mask = vkd3d_write_mask_32_from_64(write_mask); + shader_addline(buffer, ".%s", compiler->colours.write_mask); if (write_mask & VKD3DSP_WRITEMASK_0) shader_addline(buffer, "%c", write_mask_chars[0]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b247acc0..e8741790 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -193,6 +193,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFI, VKD3DSIH_DEQ, VKD3DSIH_DIV, + VKD3DSIH_DMOV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, VKD3DSIH_DP3, @@ -1034,6 +1035,12 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } +static inline unsigned int vkd3d_write_mask_64_from_32(DWORD write_mask32) +{ + unsigned int write_mask64 = write_mask32 | (write_mask32 >> 1); + return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1); +} + static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) { unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) diff --git a/tests/d3d12.c b/tests/d3d12.c index fbf14a2a..b10f24be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9878,7 +9878,7 @@ static void test_shader_instructions(void) {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, - {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true, true}, + {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, -- 2.32.0

2 1

[PATCH] msvcrt: Convert double (numerically) to UINT64 via INT64, fixing pow() on arm
by Martin Storsjo 28 Jul '21

28 Jul '21

If converting a negative double to an UINT64, on arm it's clipped to zero instead of converted to its two's complement form (contrary to x86). This fixes cases like pow(2.0, -2.0) on arm/aarch64. Add similar casts to expf() too which seems to have a similar pattern, even if it's not known if that case can cause issues or not. In the original musl source, the converttoint() function returns a signed int32_t, doing the same double->signed->unsigned conversion, implicitly. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 96cd073b3d0..2f0ee6f0918 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1203,7 +1203,7 @@ float CDECL expf( float x ) ideally ties-to-even rule is used, otherwise the magnitude of r can be bigger which gives larger approximation error. */ kd = __round(z); - ki = kd; + ki = (INT64)kd; r = z - kd; /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -1507,7 +1507,7 @@ static float powf_exp2(double xd, UINT32 sign_bias) /* N*x = k + r with r in [-1/2, 1/2] */ kd = __round(xd); /* k */ - ki = kd; + ki = (INT64)kd; r = xd - kd; /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -3822,7 +3822,7 @@ static double pow_exp(double argx, double argy, double x, double xtail, UINT32 s /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ z = invln2N * x; kd = __round(z); - ki = kd; + ki = (INT64)kd; r = x + kd * negln2hiN + kd * negln2loN; /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ r += xtail; -- 2.25.1

2 1

[PATCH 4/9] gdi32: Move ROP mode to DC_ATTR.
by Jacek Caban 28 Jul '21

28 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 18 insertions(+), 26 deletions(-)

3 3

[PATCH 1/4] ntdll: Decrement IO pending count in ioqueue_thread_proc().
by Paul Gofman 27 Jul '21

27 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The main goal of these patches is to address use after free which happens with TPIO objects when the completion arrives after TpReleaseIoCompletion() was called. Windows seems to keep the TPIO object alive after TpReleaseIoCompletion() until it receives the number of completions equal to what it expects. The following aspects are currently different in Wine: - TpWaitForIoCompletion with cancel_pending set to TRUE in Wine treats that essentially the same way as TpCancelAsyncIoOperatio(). As far as my testing goes, TpCancelAsyncIoOperatio() tells us that the operation is canceled and the completion is not expected. While with TpWaitForIoCompletion(..., TRUE) Windows still expects completions but doesn't call the callback. - The memory for TPIO object should not freed after TpReleaseIoCompletion() until the expected number of completions is received. dlls/ntdll/threadpool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9e99398bdee..b82d06e5e42 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1536,6 +1536,8 @@ static void CALLBACK ioqueue_thread_proc( void *param ) { RtlEnterCriticalSection( &io->pool->cs ); + --io->u.io.pending_count; + if (!array_reserve((void **)&io->u.io.completions, &io->u.io.completion_max, io->u.io.completion_count + 1, sizeof(*io->u.io.completions))) { @@ -2138,7 +2140,6 @@ static void tp_object_execute( struct threadpool_object *object, BOOL wait_threa { assert( object->u.io.completion_count ); completion = object->u.io.completions[--object->u.io.completion_count]; - object->u.io.pending_count--; } /* Leave critical section and do the actual callback. */ -- 2.31.1

2 5

[PATCH] msvcrt: Make the cosh/sinh/tanh functions NAN preserving
by Martin Storsjo 27 Jul '21

27 Jul '21

When a NAN is fed as input, return it as-is without mangling it through the calculation (which e.g. loses the sign of the input value). This fixes a regression in a testcase of mine, after switching to the internal implementation of these functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- v4: Integrated the handling in cosh/sinh/coshf/sinhf into the existing algorithm, as requested. Changed the tanh/tanhf implementation to readd the sign bit instead of storing the original value, and set the qnan bit too. Changed the test to not require an exact match for the mantissa bits for i386, as msvcrt.dll doesn't provide that. --- dlls/msvcrt/math.c | 42 +++++++++++++++++++++++++++++++++------- dlls/msvcrt/tests/misc.c | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d21883757a2..4671f4f4871 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1137,9 +1137,11 @@ static float __expo2f(float x, float sign) float CDECL coshf( float x ) { UINT32 ui = *(UINT32*)&x; + UINT32 sign; float t; /* |x| */ + sign = ui & 0x80000000; ui &= 0x7fffffff; x = *(float*)&ui; @@ -1160,7 +1162,10 @@ float CDECL coshf( float x ) } /* |x| > log(FLT_MAX) or nan */ - t = __expo2f(x, 1.0f); + if (ui > 0x7f800000) + *(DWORD*)&t = *(DWORD*)&x | sign | 0x400000; + else + t = __expo2f(x, 1.0f); return t; } @@ -1674,12 +1679,14 @@ float CDECL sinf( float x ) float CDECL sinhf( float x ) { UINT32 ui = *(UINT32*)&x; + UINT32 sign; float t, h, absx; h = 0.5; if (ui >> 31) h = -h; /* |x| */ + sign = ui & 0x80000000; ui &= 0x7fffffff; absx = *(float*)&ui; @@ -1695,7 +1702,10 @@ float CDECL sinhf( float x ) } /* |x| > logf(FLT_MAX) or nan */ - t = __expo2f(absx, 2 * h); + if (ui > 0x7f800000) + *(DWORD*)&t = *(DWORD*)&x | sign | 0x400000; + else + t = __expo2f(absx, 2 * h); return t; } @@ -1885,10 +1895,14 @@ float CDECL tanhf( float x ) if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { + if (isnan(x)) { + *(UINT32*)&x = ui | ((UINT32)sign << 31) | 0x400000; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanhf", x, 0, x); +#else + return x; #endif + } /* |x| > 10 */ fp_barrierf(x + 0x1p120f); t = 1 + 0 / x; @@ -2766,10 +2780,12 @@ static double __expo2(double x, double sign) double CDECL cosh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign; UINT32 w; double t; /* |x| */ + sign = ux & 0x8000000000000000ULL; ux &= (uint64_t)-1 / 2; x = *(double*)&ux; w = ux >> 32; @@ -2793,7 +2809,10 @@ double CDECL cosh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(x, 1.0); + if (w > 0x7ff00000) + *(UINT64*)&t = *(UINT64*)&x | sign | 0x0008000000000000ULL; + else + t = __expo2(x, 1.0); return t; } @@ -4032,6 +4051,7 @@ double CDECL sin( double x ) double CDECL sinh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign; UINT32 w; double t, h, absx; @@ -4039,6 +4059,7 @@ double CDECL sinh( double x ) if (ux >> 63) h = -h; /* |x| */ + sign = ux & 0x8000000000000000ULL; ux &= (UINT64)-1 / 2; absx = *(double*)&ux; w = ux >> 32; @@ -4056,7 +4077,10 @@ double CDECL sinh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(absx, 2 * h); + if (w > 0x7ff00000) + *(UINT64*)&t = *(UINT64*)&x | sign | 0x0008000000000000ULL; + else + t = __expo2(absx, 2 * h); return t; } @@ -4331,11 +4355,15 @@ double CDECL tanh( double x ) if (w > 0x3fe193ea) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (w > 0x40340000) { + if (isnan(x)) { + *(UINT64*)&x = ui | ((UINT64)sign << 63) | 0x0008000000000000ULL; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, x); +#else + return x; #endif - /* |x| > 20 or nan */ + } + /* |x| > 20 */ /* note: this branch avoids raising overflow */ fp_barrier(x + 0x1p120f); t = 1 - 0 / x; diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index b38915596df..bab6211450a 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -491,9 +491,36 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static int eq_nan(double a, double b) { + UINT64 ai = *(UINT64*)&a; + UINT64 bi = *(UINT64*)&b; +#if defined(__i386__) + /* On i386, msvcrt.dll doesn't preserve all the mantissa bits exactly + * in NANs, but e.g. the sign is preserved. */ + UINT64 mask = 0xFFF0000000000000ULL; + return (ai & mask) == (bi & mask); +#else + /* Ignore the quiet/signaling bit */ + UINT64 qbit = (1ULL << 51); + return (ai & ~qbit) == (bi & ~qbit); +#endif +} + +static int eq_nanf(float a, float b) { + /* Check if NANs are equal, ignoring the quiet/signaling bit */ + DWORD ai = *(DWORD*)&a; + DWORD bi = *(DWORD*)&b; + DWORD qbit = (1 << 22); + return (ai & ~qbit) == (bi & ~qbit); +} + static void test_math_functions(void) { double ret; + UINT64 test_nan_i = 0xFFF0000123456780ULL; // Negative snan + double test_nan = *(double*)&test_nan_i; + DWORD test_nanf_i = 0xFF801234; // Negative snan + float test_nanf = *(float*)&test_nanf_i; errno = 0xdeadbeef; p_atan(NAN); @@ -525,6 +552,13 @@ static void test_math_functions(void) errno = 0xdeadbeef; p_exp(INFINITY); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(eq_nan(test_nan, cosh(test_nan)), "cosh not preserving nan\n"); + ok(eq_nan(test_nan, sinh(test_nan)), "sinh not preserving nan\n"); + ok(eq_nan(test_nan, tanh(test_nan)), "tanh not preserving nan\n"); + ok(eq_nanf(test_nanf, coshf(test_nanf)), "coshf not preserving nan\n"); + ok(eq_nanf(test_nanf, sinhf(test_nanf)), "sinhf not preserving nan\n"); + ok(eq_nanf(test_nanf, tanhf(test_nanf)), "tanhf not preserving nan\n"); } static void __cdecl test_thread_func(void *end_thread_type) -- 2.25.1

1 0

[PATCH v2] msvcrt: Make the cosh/sinh/tanh functions NAN preserving
by Martin Storsjo 27 Jul '21

27 Jul '21

When a NAN is fed as input, return it as-is without mangling it through the calculation (which e.g. loses the sign of the input value). This fixes a regression in a testcase of mine, after switching to the internal implementation of these functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- As these routines are imported from musl, I guess I should try to upstream the same fix to them too. v2: Keep the math error reporting for msvcrt < 140 in tanh. --- dlls/msvcrt/math.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ecf5fdce4d8..9b69f6bea56 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1139,6 +1139,9 @@ float CDECL coshf( float x ) UINT32 ui = *(UINT32*)&x; float t; + if (isnan(x)) + return x; + /* |x| */ ui &= 0x7fffffff; x = *(float*)&ui; @@ -1676,6 +1679,9 @@ float CDECL sinhf( float x ) UINT32 ui = *(UINT32*)&x; float t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ui >> 31) h = -h; @@ -1885,9 +1891,11 @@ float CDECL tanhf( float x ) if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { -#if _MSVCR_VER < 140 if (isnan(x)) +#if _MSVCR_VER < 140 return math_error(_DOMAIN, "tanhf", x, 0, x); +#else + return x; #endif /* |x| > 10 */ fp_barrierf(x + 0x1p120f); @@ -2769,6 +2777,9 @@ double CDECL cosh( double x ) UINT32 w; double t; + if (isnan(x)) + return x; + /* |x| */ ux &= (uint64_t)-1 / 2; x = *(double*)&ux; @@ -4035,6 +4046,9 @@ double CDECL sinh( double x ) UINT32 w; double t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ux >> 63) h = -h; @@ -4331,9 +4345,11 @@ double CDECL tanh( double x ) if (w > 0x3fe193ea) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (w > 0x40340000) { -#if _MSVCR_VER < 140 if (isnan(x)) +#if _MSVCR_VER < 140 return math_error(_DOMAIN, "tanh", x, 0, x); +#else + return x; #endif /* |x| > 20 or nan */ /* note: this branch avoids raising overflow */ -- 2.25.1

5 8

[PATCH v2] dinput/tests: Prove that GetDeviceData() does nothing.
by Arkadiusz Hiler 27 Jul '21

27 Jul '21

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v2: use separate ok()s supersedes 210145 dlls/dinput/tests/mouse.c | 47 ++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 69051bb2a34..6bae6b9fe1e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -106,7 +106,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIMOUSESTATE m_state; HWND hwnd2; DIPROPDWORD di_op; - DIDEVICEOBJECTDATA mouse_state; + DIDEVICEOBJECTDATA mouse_state[30]; DWORD cnt; int i; @@ -159,16 +159,22 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK, "Acquire() failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); hr = IDirectInputDevice_Unacquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); @@ -178,20 +184,29 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK, "GetDeviceData() failed: %08x\n", hr); + todo_wine ok(cnt == ARRAY_SIZE(mouse_state), "GetDeviceData() unexpected cnt: %d\n", cnt); + todo_wine ok(mouse_state[0].dwTimeStamp == 0xdeadbeef, "GetDeviceData() overwrote the timestamp: %d\n", mouse_state[0].dwTimeStamp); /* Check for granularity property using BYOFFSET */ memset(&di_op, 0, sizeof(di_op)); -- 2.32.0

2 1

[PATCH] conhost: Copy font width/height to the new screen buffer to prevent an unhandled exception (divide by zero)
by Hugh McMaster 27 Jul '21

27 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..fd1b6fb380e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -90,12 +90,14 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (console->active) { - screen_buffer->max_width = console->active->max_width; - screen_buffer->max_height = console->active->max_height; - screen_buffer->win.right = console->active->win.right - console->active->win.left; - screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; - screen_buffer->attr = console->active->attr; - screen_buffer->popup_attr = console->active->attr; + screen_buffer->max_width = console->active->max_width; + screen_buffer->max_height = console->active->max_height; + screen_buffer->win.right = console->active->win.right - console->active->win.left; + screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->font.width = console->active->font.width; + screen_buffer->font.height = console->active->font.height; + screen_buffer->attr = console->active->attr; + screen_buffer->popup_attr = console->active->attr; } else { -- 2.32.0

1 0

Re: TestBot job 94484 results: [PATCH 2/2] ole32: Do not link OLE clipboard object lifecycle to OLE initialization state.
by Paul Gofman 27 Jul '21

27 Jul '21

On 7/23/21 21:18, Marvin wrote: > > > === debiant2 (64 bit WoW report) === > > ole32: > clipboard.c:1067: Test failed: OleIsCurrentClipboard returned 0 > clipboard.c:1135: Test failed: 1 WM_DRAWCLIPBOARD received Doesn't seem related to my patches, but I could reproduce this and other random failures locally (both with and without my patches). One sort of such failures I looked into (I suspect that relates to all of them actually) was due to the race between the test working with the clipboard and winex11.drv clipboard operation from explorer process (like, opening clipboard from X11DRV_SelectionRequest()). That selection request seems to be triggered by window creation and thus interferes with the test. I haven't debug that in details yet. Is it maybe a known issue?

2 3

[PATCH] reg: Support use of registry views in the 'copy' operation
by Hugh McMaster 27 Jul '21

27 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50962 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/copy.c | 26 ++++++++++++++++++++------ programs/reg/tests/copy.c | 16 ++++++++-------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/programs/reg/copy.c b/programs/reg/copy.c index 3ede5440cb6..2970ab81cc1 100644 --- a/programs/reg/copy.c +++ b/programs/reg/copy.c @@ -77,7 +77,7 @@ static enum operation ask_overwrite_value(WCHAR *path, WCHAR *value) } } -static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) +static int run_copy(struct key *src, struct key *dest, REGSAM sam, BOOL recurse, BOOL force) { LONG rc; DWORD max_subkey_len; @@ -87,14 +87,14 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) WCHAR *name = NULL; BYTE *data = NULL; - if ((rc = RegOpenKeyExW(src->root, src->subkey, 0, KEY_READ, &src->hkey))) + if ((rc = RegOpenKeyExW(src->root, src->subkey, 0, KEY_READ|sam, &src->hkey))) { output_error(rc); return 1; } if ((rc = RegCreateKeyExW(dest->root, dest->subkey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &dest->hkey, &dispos))) + KEY_READ|KEY_WRITE|sam, NULL, &dest->hkey, &dispos))) { RegCloseKey(src->hkey); output_error(rc); @@ -173,7 +173,7 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) swprintf(subkey_src.path, path_len, L"%s\\%s", src->path, name); - rc = run_copy(&subkey_src, &subkey_dest, TRUE, force); + rc = run_copy(&subkey_src, &subkey_dest, sam, TRUE, force); free(subkey_src.path); @@ -194,6 +194,7 @@ int reg_copy(int argc, WCHAR *argvW[]) { struct key src, dest; BOOL recurse = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (argc == 3) @@ -214,8 +215,18 @@ int reg_copy(int argc, WCHAR *argvW[]) str = &argvW[i][1]; - if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -234,6 +245,9 @@ int reg_copy(int argc, WCHAR *argvW[]) } } + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + if (src.root == dest.root && !lstrcmpiW(src.subkey, dest.subkey)) { output_message(STRING_COPY_SRC_DEST_SAME); @@ -242,7 +256,7 @@ int reg_copy(int argc, WCHAR *argvW[]) src.path = src.subkey; - return run_copy(&src, &dest, recurse, force); + return run_copy(&src, &dest, sam, recurse, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0f9e1221200..bc07c3cafb9 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -666,11 +666,11 @@ static void test_registry_view_win64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -691,7 +691,7 @@ static void test_registry_view_win64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -724,7 +724,7 @@ static void test_registry_view_wow64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); @@ -735,11 +735,11 @@ static void test_registry_view_wow64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -- 2.32.0

1 0