December 2018 - Wine-Devel - list.winehq.org

[PATCH 1/4] d3d9: Fix crash in d3d9_vertexbuffer_Release().
by Paul Gofman Dec. 20, 2018

Dec. 20, 2018

If there is no draw buffer then buffer pointer gets freed in wined3d_buffer_decref() via d3d9_vertexbuffer_wined3d_parent_ops and consequent check for buffer->draw_buffer results in freed memory access. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 1533a8496d..7e178f278f 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -76,12 +76,13 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ -- 2.19.2

3 11

[PATCH vkd3d v2 2/2] vkd3d-shader: Implement DXBC checksum for root signatures.
by Józef Kucia Dec. 20, 2018

Dec. 20, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Remove redundant ok() call. --- libs/vkd3d-shader/checksum.c | 73 ++++++++++++++++-------- libs/vkd3d-shader/dxbc.c | 6 +- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- tests/d3d12.c | 9 +-- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/libs/vkd3d-shader/checksum.c b/libs/vkd3d-shader/checksum.c index d2929da92635..b9a7140221e0 100644 --- a/libs/vkd3d-shader/checksum.c +++ b/libs/vkd3d-shader/checksum.c @@ -35,11 +35,15 @@ #include "vkd3d_shader_private.h" +#define DXBC_CHECKSUM_BLOCK_SIZE 64 + +STATIC_ASSERT(sizeof(unsigned int) == 4); + struct md5_ctx { unsigned int i[2]; unsigned int buf[4]; - unsigned char in[64]; + unsigned char in[DXBC_CHECKSUM_BLOCK_SIZE]; unsigned char digest[16]; }; @@ -163,7 +167,7 @@ static void byte_reverse(unsigned char *buf, unsigned longs) * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. */ -void md5_init(struct md5_ctx *ctx) +static void md5_init(struct md5_ctx *ctx) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -177,7 +181,7 @@ void md5_init(struct md5_ctx *ctx) * Update context to reflect the concatenation of another buffer full * of bytes. */ -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) +static void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) { unsigned int t; @@ -194,7 +198,7 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) if (t) { unsigned char *p = (unsigned char *)ctx->in + t; - t = 64 - t; + t = DXBC_CHECKSUM_BLOCK_SIZE - t; if (len < t) { @@ -212,27 +216,25 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) } /* Process data in 64-byte chunks */ - while (len >= 64) + while (len >= DXBC_CHECKSUM_BLOCK_SIZE) { - memcpy(ctx->in, buf, 64); + memcpy(ctx->in, buf, DXBC_CHECKSUM_BLOCK_SIZE); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - buf += 64; - len -= 64; + buf += DXBC_CHECKSUM_BLOCK_SIZE; + len -= DXBC_CHECKSUM_BLOCK_SIZE; } /* Handle any remaining bytes of data. */ memcpy(ctx->in, buf, len); } -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void md5_final(struct md5_ctx *ctx) +static void dxbc_checksum_final(struct md5_ctx *ctx) { + unsigned int padding; + unsigned int length; unsigned int count; unsigned char *p; @@ -243,34 +245,57 @@ void md5_final(struct md5_ctx *ctx) always at least one byte free */ p = ctx->in + count; *p++ = 0x80; + ++count; /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; + padding = DXBC_CHECKSUM_BLOCK_SIZE - count; /* Pad out to 56 mod 64 */ - if (count < 8) + if (padding < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); + memset(p, 0, padding); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); + /* Now fill the next block */ + memset(ctx->in, 0, DXBC_CHECKSUM_BLOCK_SIZE); } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } + /* Make place for bitcount at the beginning of the block */ + memmove(&ctx->in[4], ctx->in, count); - byte_reverse(ctx->in, 14); + /* Pad block to 60 bytes */ + memset(p + 4, 0, padding - 4); + } /* Append length in bits and transform */ - ((unsigned int *)ctx->in)[14] = ctx->i[0]; - ((unsigned int *)ctx->in)[15] = ctx->i[1]; + length = ctx->i[0]; + memcpy(&ctx->in[0], &length, sizeof(length)); + byte_reverse(&ctx->in[4], 14); + length = ctx->i[0] >> 2 | 0x1; + memcpy(&ctx->in[DXBC_CHECKSUM_BLOCK_SIZE - 4], &length, sizeof(length)); md5_transform(ctx->buf, (unsigned int *)ctx->in); byte_reverse((unsigned char *)ctx->buf, 4); memcpy(ctx->digest, ctx->buf, 16); } + +#define DXBC_CHECKSUM_SKIP_BYTE_COUNT 20 + +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) +{ + const uint8_t *ptr = dxbc; + struct md5_ctx ctx; + + assert(size > DXBC_CHECKSUM_SKIP_BYTE_COUNT); + ptr += DXBC_CHECKSUM_SKIP_BYTE_COUNT; + size -= DXBC_CHECKSUM_SKIP_BYTE_COUNT; + + md5_init(&ctx); + md5_update(&ctx, ptr, size); + dxbc_checksum_final(&ctx); + + memcpy(checksum, ctx.digest, sizeof(ctx.digest)); +} diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b199749064f5..4b36ea644b84 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2389,7 +2389,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte if (!write_dword(context, TAG_DXBC)) return VKD3D_ERROR_OUT_OF_MEMORY; - WARN("DXBC checksum is not implemented.\n"); + /* The checksum is computed when all data is generated. */ if (!write_dwords(context, 4, 0x00000000)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2596,6 +2596,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc { struct root_signature_writer_context context; size_t total_size, chunk_size; + uint32_t checksum[4]; int ret; TRACE("root_signature %p, version %#x, dxbc %p.\n", root_signature, version, dxbc); @@ -2628,5 +2629,8 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc dxbc->code = context.data; dxbc->size = total_size; + vkd3d_compute_dxbc_checksum(dxbc->code, dxbc->size, checksum); + memcpy((uint32_t *)dxbc->code + 1, checksum, sizeof(checksum)); + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e0fad6852e53..bf2f45571375 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -815,11 +815,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; -struct md5_ctx; - -void md5_init(struct md5_ctx *ctx) DECLSPEC_HIDDEN; -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) DECLSPEC_HIDDEN; -void md5_final(struct md5_ctx *ctx) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; static inline enum vkd3d_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d67de2966dd..314f08a2fb7a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9107,14 +9107,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c ok_(line)(blob_size == code_size, "Got size %u, expected %u.\n", (unsigned int)blob_size, (unsigned int)code_size); - ok_(line)(blob_buffer[0] == code[0], "Got magic %#x, expected %#x.\n", - (unsigned int)blob_buffer[0], (unsigned int)code[0]); - for (i = 1; i < 5; ++i) - { - todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", - (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); - } - for (; i < code_size / sizeof(DWORD); ++i) + for (i = 0; i < code_size / sizeof(DWORD); ++i) { ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i); -- 2.19.2

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Import MD5 implementation from Wine.
by Józef Kucia Dec. 20, 2018

Dec. 20, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> With style changes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/checksum.c | 276 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 + 3 files changed, 283 insertions(+) create mode 100644 libs/vkd3d-shader/checksum.c diff --git a/Makefile.am b/Makefile.am index a16f7ca42ec9..7869b2ea8f62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ include/private/vkd3d_shader.h \ + libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ diff --git a/libs/vkd3d-shader/checksum.c b/libs/vkd3d-shader/checksum.c new file mode 100644 index 000000000000..d2929da92635 --- /dev/null +++ b/libs/vkd3d-shader/checksum.c @@ -0,0 +1,276 @@ +/* + * Copyright (C) 2001 Nikos Mavroyanopoulos + * Copyright (C) 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * This code implements the MD5 message-digest algorithm. + * It is based on code in the public domain written by Colin + * Plumb in 1993. The algorithm is due to Ron Rivest. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * md5_ctx structure, pass it to md5_init, call md5_update as + * needed on buffers full of bytes, and then call md5_final, which + * will fill a supplied 16-byte array with the digest. + */ + +#include "vkd3d_shader_private.h" + +struct md5_ctx +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +}; + +/* The four core functions - F1 is optimized somewhat */ + +/* #define F1(x, y, z) (x & y | ~x & z) */ +#define F1(x, y, z) (z ^ (x & (y ^ z))) +#define F2(x, y, z) F1(z, x, y) +#define F3(x, y, z) (x ^ y ^ z) +#define F4(x, y, z) (y ^ (x | ~z)) + +/* This is the central step in the MD5 algorithm. */ +#define MD5STEP(f, w, x, y, z, data, s) \ + (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x) + +/* + * The core of the MD5 algorithm, this alters an existing MD5 hash to + * reflect the addition of 16 longwords of new data. md5_update blocks + * the data and converts bytes into longwords for this routine. + */ +static void md5_transform(unsigned int buf[4], const unsigned int in[16]) +{ + unsigned int a, b, c, d; + + a = buf[0]; + b = buf[1]; + c = buf[2]; + d = buf[3]; + + MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); + MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); + MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); + MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); + MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); + + MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); + + MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); + MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); + + MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); + MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); + + buf[0] += a; + buf[1] += b; + buf[2] += c; + buf[3] += d; +} + +/* + * Note: this code is harmless on little-endian machines. + */ +static void byte_reverse(unsigned char *buf, unsigned longs) +{ + unsigned int t; + + do + { + t = ((unsigned)buf[3] << 8 | buf[2]) << 16 | + ((unsigned)buf[1] << 8 | buf[0]); + *(unsigned int *)buf = t; + buf += 4; + } while (--longs); +} + +/* + * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious + * initialization constants. + */ +void md5_init(struct md5_ctx *ctx) +{ + ctx->buf[0] = 0x67452301; + ctx->buf[1] = 0xefcdab89; + ctx->buf[2] = 0x98badcfe; + ctx->buf[3] = 0x10325476; + + ctx->i[0] = ctx->i[1] = 0; +} + +/* + * Update context to reflect the concatenation of another buffer full + * of bytes. + */ +void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) +{ + unsigned int t; + + /* Update bitcount */ + t = ctx->i[0]; + + if ((ctx->i[0] = t + (len << 3)) < t) + ctx->i[1]++; /* Carry from low to high */ + + ctx->i[1] += len >> 29; + t = (t >> 3) & 0x3f; + + /* Handle any leading odd-sized chunks */ + if (t) + { + unsigned char *p = (unsigned char *)ctx->in + t; + t = 64 - t; + + if (len < t) + { + memcpy(p, buf, len); + return; + } + + memcpy(p, buf, t); + byte_reverse(ctx->in, 16); + + md5_transform(ctx->buf, (unsigned int *)ctx->in); + + buf += t; + len -= t; + } + + /* Process data in 64-byte chunks */ + while (len >= 64) + { + memcpy(ctx->in, buf, 64); + byte_reverse(ctx->in, 16); + + md5_transform(ctx->buf, (unsigned int *)ctx->in); + + buf += 64; + len -= 64; + } + + /* Handle any remaining bytes of data. */ + memcpy(ctx->in, buf, len); +} + +/* + * Final wrapup - pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + */ +void md5_final(struct md5_ctx *ctx) +{ + unsigned int count; + unsigned char *p; + + /* Compute number of bytes mod 64 */ + count = (ctx->i[0] >> 3) & 0x3F; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + p = ctx->in + count; + *p++ = 0x80; + + /* Bytes of padding needed to make 64 bytes */ + count = 64 - 1 - count; + + /* Pad out to 56 mod 64 */ + if (count < 8) + { + /* Two lots of padding: Pad the first block to 64 bytes */ + memset(p, 0, count); + byte_reverse(ctx->in, 16); + md5_transform(ctx->buf, (unsigned int *)ctx->in); + + /* Now fill the next block with 56 bytes */ + memset(ctx->in, 0, 56); + } + else + { + /* Pad block to 56 bytes */ + memset(p, 0, count - 8); + } + + byte_reverse(ctx->in, 14); + + /* Append length in bits and transform */ + ((unsigned int *)ctx->in)[14] = ctx->i[0]; + ((unsigned int *)ctx->in)[15] = ctx->i[1]; + + md5_transform(ctx->buf, (unsigned int *)ctx->in); + byte_reverse((unsigned char *)ctx->buf, 4); + memcpy(ctx->digest, ctx->buf, 16); +} diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index afa002b83616..e0fad6852e53 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -815,6 +815,12 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; +struct md5_ctx; + +void md5_init(struct md5_ctx *ctx) DECLSPEC_HIDDEN; +void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) DECLSPEC_HIDDEN; +void md5_final(struct md5_ctx *ctx) DECLSPEC_HIDDEN; + static inline enum vkd3d_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) { -- 2.19.2

2 1

[PATCH] comctl32: Make constant 'mdays' static
by Alex Henrie Dec. 20, 2018

Dec. 20, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/monthcal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 3fb76000d5..dd34c220ab 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -213,7 +213,7 @@ static inline int MONTHCAL_MonthDiff(const SYSTEMTIME *left, const SYSTEMTIME *r /* January is 1, December is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */ -- 2.19.2

7 21

[PATCH] [v2] gdi32: Use the default fallback list before trying Fontconfig.
by Akihiro Sagawa Dec. 20, 2018

Dec. 20, 2018

In v2, remove some redundant code pointed by Huw. This fixes a regression introduced by 11ab9ff7b3c43bb41c0325fe9417b1d7f44ad516. It overrides default fallback font fix for Latin scripts as seen in 3b9669017bc8425f04860f331d8a1f689c8d63e0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46285 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46244 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-)

2 4

[PATCH] comdlg32: When FOS_PICKFOLDERS is specified item selection box should contain full path name.
by Dmitry Timoshkov Dec. 20, 2018

Dec. 20, 2018

Otherwise when selecting a folder using IFileOpenDialog interface the caller instead of C:\Temp receives C:\Temp\Temp. This matches both an old GetOpenFileName behaviour and what IFileOpenDialog returns under Windows. This patch fixes the folder selection dialog in a very widely used management software in Russia. Unfortunately after examining existing IFileOpenDialog tests I don't see a way to add a test for this behaviour. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/itemdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index deae8660a9..541410ccb7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -639,7 +639,7 @@ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, } PathAddBackslashW(lpstrPathAndFile); - TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile)); + TRACE("current directory=%s, file=%s\n", debugstr_w(lpstrPathAndFile), debugstr_w(lpstrFile)); /* if the user specified a fully qualified path use it */ if(PathIsRelativeW(lpstrFile)) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ff97ae26d4..5f36d2bdee 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -424,7 +424,7 @@ static void fill_filename_from_selection(FileDialogImpl *This) (!(This->options & FOS_PICKFOLDERS) && (attr & SFGAO_FOLDER)))) continue; - hr = IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); + hr = IShellItem_GetDisplayName(psi, (This->options & FOS_PICKFOLDERS) ? SIGDN_FILESYSPATH : SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); if(SUCCEEDED(hr)) { len_total += lstrlenW(names[valid_count]) + 3; -- 2.19.2

1 0

[PATCH] jscript: Fix a MSVC-x64 warning about to_uint32().
by Serge Gautherie Dec. 20, 2018

Dec. 20, 2018

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\jscript\jsutils.c(679) : warning C4028: formal parameter 3 different from declaration" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b612e65..b653e52 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -675,7 +675,7 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) } /* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, DWORD *ret) +HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { INT32 n; HRESULT hres; -- 2.10.0.windows.1

2 1

[PATCH] urlmon/tests: Release correct uri object (Coverity).
by Nikolay Sivov Dec. 20, 2018

Dec. 20, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This is technically correct, because it releases what previous call returned, and doesn't rely on it being same uri instance. dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3c5e27c8d9..64b6c56d4a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10528,7 +10528,7 @@ static void test_IUriBuilderFactory(void) { ok(hr == S_OK, "Error: GetIUri return 0x%08x, expected 0x%08x.\n", hr, S_OK); ok(tmp == uri, "Error: Expected tmp to be %p, but was %p.\n", uri, tmp); - if(uri) IUri_Release(uri); + if(tmp) IUri_Release(tmp); } if(builder) IUriBuilder_Release(builder); } -- 2.19.2

2 1

[PATCH] urlmon/tests: Fix some leaks (Valgrind)
by Nikolay Sivov Dec. 20, 2018

Dec. 20, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 64b6c56d4a..9069a9c176 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -8366,6 +8366,7 @@ static void test_IUri_GetPropertyLength(void) { /* Value may be unicode encoded */ expectedValueW = a2w(prop.value); expectedLen = lstrlenW(expectedValueW); + heap_free(expectedValueW); /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; @@ -11538,6 +11539,7 @@ static void test_IPersistStream(void) ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + IUri_Release(uri); hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); hr = IUri_GetRawUri(uri, &raw_uri); -- 2.19.2

3 9

[PATCH] gdi32: Fix memory leak (Valgrind).
by Daniel Lehman Dec. 20, 2018

Dec. 20, 2018

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- 728 ==17404== 4 bytes in 1 blocks are definitely lost in loss record 5 of 506 729 ==17404== at 0x7BC5B465: initialize_block (heap.c:238) 730 ==17404== by 0x7BC5B465: RtlAllocateHeap (???:0) 731 ==17404== by 0x701A57D: copy_src_bits (bitblt.c:700) 732 ==17404== by 0x701A949: execute_rop (bitblt.c:765) 733 ==17404== by 0x701B9AA: dibdrv_PutImage (bitblt.c:1034) 734 ==17404== by 0x700346D: nulldrv_StretchBlt (bitblt.c:294) 735 ==17404== by 0x701CE81: dibdrv_StretchBlt (bitblt.c:1405) 736 ==17404== by 0x7005006: StretchBlt (bitblt.c:633) 737 ==17404== by 0x7004B19: BitBlt (bitblt.c:580) 738 ==17404== by 0x6CBEB03: check_BitBlt_pixel (bitmap.c:3006) 739 ==17404== by 0x6CDD18C: test_BitBlt (bitmap.c:3054) 740 ==17404== by 0x6CDD18C: func_bitmap (???:0) 741 ==17404== by 0x6CBD941: main (test.h:617) 742 ==17404== 743 ==17404== 4 bytes in 1 blocks are definitely lost in loss record 6 of 506 744 ==17404== at 0x7BC5B465: initialize_block (heap.c:238) 745 ==17404== by 0x7BC5B465: RtlAllocateHeap (???:0) 746 ==17404== by 0x701A57D: copy_src_bits (bitblt.c:700) 747 ==17404== by 0x701A949: execute_rop (bitblt.c:765) 748 ==17404== by 0x701B9AA: dibdrv_PutImage (bitblt.c:1034) 749 ==17404== by 0x700346D: nulldrv_StretchBlt (bitblt.c:294) 750 ==17404== by 0x701CE81: dibdrv_StretchBlt (bitblt.c:1405) 751 ==17404== by 0x7005006: StretchBlt (bitblt.c:633) 752 ==17404== by 0x7004B19: BitBlt (bitblt.c:580) 753 ==17404== by 0x6CBEB03: check_BitBlt_pixel (bitmap.c:3006) 754 ==17404== by 0x6CDD216: test_BitBlt (bitmap.c:3057) 755 ==17404== by 0x6CDD216: func_bitmap (???:0) 756 ==17404== by 0x6CBD941: main (test.h:617) --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 0acb23f2e3..a84be8236e 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1035,6 +1035,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } + free_dib_info( &src_dib ); if (tmp_rgn) DeleteObject( tmp_rgn ); return ret; -- 2.17.1

2 1

[PATCH] gdi32: Try to update the default families with fonts that exist.
by Huw Davies Dec. 20, 2018

Dec. 20, 2018

Based on a patch by Akihiro Sagawa. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46285 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46244 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ebecf79ee1..9f6bdfe49a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -482,10 +482,6 @@ static inline struct freetype_physdev *get_freetype_dev( PHYSDEV dev ) static const struct gdi_dc_funcs freetype_funcs; -static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; -static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -557,6 +553,10 @@ static const WCHAR *default_sans_list[] = NULL }; +static const WCHAR *default_serif = times_new_roman; +static const WCHAR *default_fixed = courier_new; +static const WCHAR *default_sans = arial; + typedef struct { WCHAR *name; INT charset; @@ -4341,22 +4341,24 @@ static BOOL move_to_front(const WCHAR *name) return FALSE; } -static BOOL set_default(const WCHAR **name_list) +static const WCHAR *set_default(const WCHAR **name_list) { - while (*name_list) + const WCHAR **entry = name_list; + + while (*entry) { - if (move_to_front(*name_list)) return TRUE; - name_list++; + if (move_to_front(*entry)) return *entry; + entry++; } - return FALSE; + return *name_list; } static void reorder_font_list(void) { - set_default( default_serif_list ); - set_default( default_fixed_list ); - set_default( default_sans_list ); + default_serif = set_default( default_serif_list ); + default_fixed = set_default( default_fixed_list ); + default_sans = set_default( default_sans_list ); } /************************************************************* @@ -5649,13 +5651,13 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if((lf.lfPitchAndFamily & FIXED_PITCH) || (lf.lfPitchAndFamily & 0xF0) == FF_MODERN) - strcpyW(lf.lfFaceName, defFixed); + strcpyW(lf.lfFaceName, default_fixed); else if((lf.lfPitchAndFamily & 0xF0) == FF_ROMAN) - strcpyW(lf.lfFaceName, defSerif); + strcpyW(lf.lfFaceName, default_serif); else if((lf.lfPitchAndFamily & 0xF0) == FF_SWISS) - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); else - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { if(!strncmpiW(family->FamilyName, lf.lfFaceName, LF_FACESIZE - 1)) { font_link = find_font_link(family->FamilyName); -- 2.17.1

1 0

[PATCH] vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2.
by Józef Kucia Dec. 19, 2018

Dec. 19, 2018

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 4143af752c20..9a93e2af6f53 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -158,6 +158,69 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void test_enumerate_physical_device2(void) +{ + static const char *procs[] = {"vkGetPhysicalDeviceProperties2", "vkGetPhysicalDeviceProperties2KHR"}; + static const char *extensions[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}; + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance; + unsigned int i, j; + const LUID *luid; + uint32_t count; + VkResult vr; + + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + return; + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < ARRAY_SIZE(procs); ++i) + { + pfn_vkGetPhysicalDeviceProperties2 + = (PFN_vkGetPhysicalDeviceProperties2)vkGetInstanceProcAddr(vk_instance, procs[i]); + if (!pfn_vkGetPhysicalDeviceProperties2) + { + skip("%s is not available.\n", procs[i]); + continue; + } + + for (j = 0; j < count; ++j) + { + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + memset(&id, 0, sizeof(id)); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); + luid = (const LUID *)id.deviceLUID; + trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", + properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), + wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + } + } + + heap_free(vk_physical_devices); + vkDestroyInstance(vk_instance, NULL); +} + static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) { VkPhysicalDeviceProperties device_properties; @@ -359,6 +422,7 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + test_enumerate_physical_device2(); for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool); -- 2.19.2

3 2

[PATCH] d3dcompiler: Fix dxbc_init() function prototype.
by Matteo Bruni Dec. 19, 2018

Dec. 19, 2018

From: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1eea0d242c5..68ff9623287 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1214,7 +1214,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) DECLSPEC_HIDDEN; void dxbc_destroy(struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) DECLSPEC_HIDDEN; -HRESULT dxbc_init(struct dxbc *dxbc, DWORD count) DECLSPEC_HIDDEN; +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b872e34d935..95a1dbd3d51 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; } -HRESULT dxbc_init(struct dxbc *dxbc, UINT size) +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) { TRACE("dxbc %p, size %u.\n", dxbc, size); -- 2.19.2

1 0

[PATCH v2] dmstyle/tests: Relax dwValidData test
by Alex Henrie Dec. 19, 2018

Dec. 19, 2018

This fixes the consistent test failures on Windows 7 and intermittent test failures on Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v2: Added missing comma and parenthesis --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c649..308ca9ba61 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok((desc.dwValidData & ~(DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION)) == DMUS_OBJ_CLASS, + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); -- 2.20.1

2 1

[PATCH] dmstyle/tests: Relax a test for a pristine DMStyle object
by Michael Stefaniuc Dec. 19, 2018

Dec. 19, 2018

Based on a patch by Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c649..4c09d44712 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); -- 2.19.2

1 0

[PATCH] gdiplus: Fix a memory leak (Valgrind).
by Sven Baars Dec. 19, 2018

Dec. 19, 2018

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdiplus/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 729592b982..5e6aa5430f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1125,6 +1125,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle return InvalidParameter; for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); return Ok; -- 2.17.1

2 2

[PATCH] [v2] gdi32: Fix compile error with Fontconfig <= 2.10.91.
by Akihiro Sagawa Dec. 19, 2018

Dec. 19, 2018

In v2, define FC_PRGNAME and FC_NAMELANG if not available. I did some tests with Fontconfig 2.8. FcPatternAddString() succeeds with these pattern names. Family name seems to be always English in the old version, so FC_NAMELANG isn't needed. FC_PRGNAME is a hint for fonts.conf author, so it doesn't affect Fontconfig internals. FC_PRGNAME is available since 2.10.92 and FC_NAMELANG is available since 2.9.91. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH] devenum/tests: Fix a memory leak (Valgrind).
by Sven Baars Dec. 19, 2018

Dec. 19, 2018

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/devenum/tests/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 10ca27a614..ec311ceab4 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -95,6 +95,7 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); -- 2.17.1

3 6

[PATCH v2] explorer: unload graphics driver and delete registry keys
by Daniel Wendt Dec. 19, 2018

Dec. 19, 2018

2 2

[PATCH resent 1/2] kernel32/tests: Test partially overlapped buffers for MultiByteToWideChar
by Gabriel Ivăncescu Dec. 19, 2018

Dec. 19, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..2e47868 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,23 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); +todo_wine + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", wine_dbgstr_wn((WCHAR *)buf, ARRAY_SIZE(strW))); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar) -- 2.19.1

3 5

Re: [PATCH] winex11.drv/window: Sync the window cursor before grabbing it
by Gabriel Ivăncescu Dec. 19, 2018

Dec. 19, 2018

On 12/18/18 22:52, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Deferred". > > This means that the patch is deferred because of code freeze for an > upcoming release. You need to either resend after the release, make > the patch less intrusive, or make a convincing argument that it needs > to be included in the release. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. > I don't think this patch has reason to be deferred. It can't possibly break anything, as it only syncs the cursor visuals, which is only needed because X11 has per-window cursor. Since Windows itself has a global cursor, then theoretically the cursor should be "permanently" synced for it to have Windows behavior. Obviously it's prohibitive to do that, but in this case it doesn't really break anything other than adding a round-trip to the wineserver when a "sizemove" drag operation begins, which needless to say is insignificant. If the cursor was already synced then nothing happens.

1 0

[PATCH] gdi32: Fix building with versions of fontconfig < 2.11.0.
by Huw Davies Dec. 19, 2018

Dec. 19, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e07aadaa1d..ebecf79ee1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -184,7 +184,13 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +#ifndef FC_NAMELANG +#define FC_NAMELANG "namelang" #endif +#ifndef FC_PRGNAME +#define FC_PRGNAME "prgname" +#endif +#endif /* SONAME_LIBFONTCONFIG */ #undef MAKE_FUNCPTR -- 2.17.1

1 0

Re: [PATCH 2/2] explorer: send WM_NCDESTROY message to delete hwnd-related global atom
by Daniel Wendt Dec. 19, 2018

Dec. 19, 2018

Applying the patch failed because the patch is dependent on another one (ID 155628: [PATCH v2] explorer: unload graphics driver and delete registry keys). If the patch is accepted, I will test this patch series again and resubmitting it. On Tue, Dec 4, 2018 at 11:44 PM Marvin <testbot(a)winehq.org> wrote: > > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Apply failure". > > This means that git-apply refused to apply the patch. This could be > either because it got mangled in transit, it's not relative to the > latest git, or it conflicts with someone else's patch in the same > area. You need to resend an updated patch. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

1 0

[PATCH] scrrun/tests: Skip BOM reading tests if we don't know the right result
by Alex Henrie Dec. 19, 2018

Dec. 19, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/scrrun/tests/filesystem.c | 80 ++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 29ee73f243..d84828ec75 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1469,6 +1469,7 @@ static void test_CreateTextFile(void) HANDLE file; HRESULT hr; BOOL ret; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1519,17 +1520,24 @@ static void test_CreateTextFile(void) ITextStream_Release(stream); /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode - treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - SysFreeString(str); - ITextStream_Release(stream); + treats BOM like valuable data with appropriate CP_ACP -> WCHAR conversion. */ + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } DeleteFileW(nameW); RemoveDirectoryW(dirW); @@ -1615,6 +1623,7 @@ static void test_ReadAll(void) HRESULT hr; BOOL ret; BSTR str; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1651,13 +1660,21 @@ static void test_ReadAll(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ - str = NULL; - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); - SysFreeString(str); + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + str = NULL; + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + SysFreeString(str); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } ITextStream_Release(stream); /* Unicode file -> read with unicode stream */ @@ -1744,6 +1761,7 @@ static void test_Read(void) HRESULT hr; BOOL ret; BSTR str; + INT len; get_temp_filepath(testfileW, pathW, dirW); @@ -1796,16 +1814,22 @@ static void test_Read(void) ok(str == NULL, "got %p\n", str); /* Buffer content is not interpreted - BOM is kept, all data is converted to WCHARs */ - str = NULL; - hr = ITextStream_Read(stream, 2, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); - - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); - SysFreeString(str); + len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + if (len) + { + str = NULL; + hr = ITextStream_Read(stream, 2, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); + SysFreeString(str); + } + else + { + /* ITextStream lets invalid characters through, but MultiByteToWideChar doesn't. + * This happens in Chinese, Japanese, and Korean locales. */ + skip("Can't determine how byte order mark should be (mis)interpreted in this locale\n"); + } ITextStream_Release(stream); /* Unicode file -> read with unicode stream */ -- 2.20.1

2 3

[PATCH] dmstyle/tests: Relax dwValidData test
by Alex Henrie Dec. 18, 2018

Dec. 18, 2018

This fixes the consistent test failures on Windows 7 and intermittent test failures on Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c649..65d9348fba 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(desc.dwValidData & ~(DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION) == DMUS_OBJ_CLASS + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); -- 2.20.1

2 1