November 2021 - Wine-commits

Alexandre Julliard : msv1_0: Define the communication structure only on the Unix side.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 1307d44f43b78b141dc3916f248c4920c4a81229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1307d44f43b78b141dc3916f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:40:39 2021 +0100 msv1_0: Define the communication structure only on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/unixlib.c | 55 +++++++++++++++++++++++++++++++++------------------ dlls/msv1_0/unixlib.h | 6 +++--- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 789dfbbe8cb..674b61c1f7b 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -44,38 +44,51 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define INITIAL_BUFFER_SIZE 200 +struct com_buf +{ + char *buffer; + unsigned int size; + unsigned int offset; +}; + static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) { char *newline; + struct com_buf *com_buf = ctx->com_buf; - if (!ctx->com_buf) + if (!com_buf) { - if (!(ctx->com_buf = malloc( INITIAL_BUFFER_SIZE ))) + if (!(com_buf = malloc( sizeof(*com_buf) ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(com_buf->buffer = malloc( INITIAL_BUFFER_SIZE ))) + { + free( com_buf ); return SEC_E_INSUFFICIENT_MEMORY; - ctx->com_buf_size = INITIAL_BUFFER_SIZE; - ctx->com_buf_offset = 0; + } + com_buf->size = INITIAL_BUFFER_SIZE; + com_buf->offset = 0; + ctx->com_buf = com_buf; } do { ssize_t size; - if (ctx->com_buf_offset + INITIAL_BUFFER_SIZE > ctx->com_buf_size) + if (com_buf->offset + INITIAL_BUFFER_SIZE > com_buf->size) { - char *buf = realloc( ctx->com_buf, ctx->com_buf_size + INITIAL_BUFFER_SIZE ); + char *buf = realloc( com_buf->buffer, com_buf->size + INITIAL_BUFFER_SIZE ); if (!buf) return SEC_E_INSUFFICIENT_MEMORY; - ctx->com_buf_size += INITIAL_BUFFER_SIZE; - ctx->com_buf = buf; + com_buf->size += INITIAL_BUFFER_SIZE; + com_buf->buffer = buf; } - size = read( ctx->pipe_in, ctx->com_buf + ctx->com_buf_offset, ctx->com_buf_size - ctx->com_buf_offset ); + size = read( ctx->pipe_in, com_buf->buffer + com_buf->offset, com_buf->size - com_buf->offset ); if (size <= 0) return SEC_E_INTERNAL_ERROR; - ctx->com_buf_offset += size; - newline = memchr( ctx->com_buf, '\n', ctx->com_buf_offset ); + com_buf->offset += size; + newline = memchr( com_buf->buffer, '\n', com_buf->offset ); } while (!newline); /* if there's a newline character, and we read more than that newline, we have to store the offset so we can preserve the additional data */ - if (newline != ctx->com_buf + ctx->com_buf_offset) *offset = (ctx->com_buf + ctx->com_buf_offset) - (newline + 1); + if (newline != com_buf->buffer + com_buf->offset) *offset = (com_buf->buffer + com_buf->offset) - (newline + 1); else *offset = 0; *newline = 0; @@ -86,6 +99,7 @@ static NTSTATUS ntlm_chat( void *args ) { struct chat_params *params = args; struct ntlm_ctx *ctx = params->ctx; + struct com_buf *com_buf; SECURITY_STATUS status = SEC_E_OK; unsigned int offset; @@ -93,19 +107,20 @@ static NTSTATUS ntlm_chat( void *args ) write( ctx->pipe_out, "\n", 1 ); if ((status = read_line( ctx, &offset )) != SEC_E_OK) return status; - *params->retlen = strlen( ctx->com_buf ); + com_buf = ctx->com_buf; + *params->retlen = strlen( com_buf->buffer ); if (*params->retlen > params->buflen) return SEC_E_BUFFER_TOO_SMALL; if (*params->retlen < 2) return SEC_E_ILLEGAL_MESSAGE; - if (!strncmp( ctx->com_buf, "ERR", 3 )) return SEC_E_INVALID_TOKEN; + if (!strncmp( com_buf->buffer, "ERR", 3 )) return SEC_E_INVALID_TOKEN; - memcpy( params->buf, ctx->com_buf, *params->retlen + 1 ); + memcpy( params->buf, com_buf->buffer, *params->retlen + 1 ); - if (!offset) ctx->com_buf_offset = 0; + if (!offset) com_buf->offset = 0; else { - memmove( ctx->com_buf, ctx->com_buf + ctx->com_buf_offset, offset ); - ctx->com_buf_offset = offset; + memmove( com_buf->buffer, com_buf->buffer + com_buf->offset, offset ); + com_buf->offset = offset; } return SEC_E_OK; @@ -115,6 +130,7 @@ static NTSTATUS ntlm_cleanup( void *args ) { struct cleanup_params *params = args; struct ntlm_ctx *ctx = params->ctx; + struct com_buf *com_buf = ctx->com_buf; if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return STATUS_INVALID_HANDLE; ctx->mode = MODE_INVALID; @@ -131,7 +147,8 @@ static NTSTATUS ntlm_cleanup( void *args ) } while (ret < 0 && errno == EINTR); } - free( ctx->com_buf ); + if (com_buf) free( com_buf->buffer ); + free( com_buf ); return STATUS_SUCCESS; } diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 54693c7970e..efd640aaa4a 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -57,6 +57,8 @@ struct arc4_info #define FLAG_NEGOTIATE_NTLM2 0x00080000 #define FLAG_NEGOTIATE_KEY_EXCHANGE 0x40000000 +struct com_buf; + struct ntlm_ctx { enum mode mode; @@ -64,11 +66,9 @@ struct ntlm_ctx unsigned int attrs; int pipe_in; int pipe_out; - char *com_buf; - unsigned int com_buf_size; - unsigned int com_buf_offset; char session_key[16]; unsigned int flags; + struct com_buf *com_buf; struct { struct

1 0

Matteo Bruni : tests: Initialize current_texture variable.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: vkd3d Branch: master Commit: 9c645bb1f693e227cf0908c51bf937d65ac95d06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9c645bb1f693e227cf0908c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 5 19:35:48 2021 +0100 tests: Initialize current_texture variable. It avoids a compiler warning for me. There is no actual issue though. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index a17a171..20d1ad6 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -511,9 +511,9 @@ START_TEST(shader_runner_d3d12) .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; size_t shader_source_size = 0, shader_source_len = 0; + struct texture *current_texture = NULL; enum parse_state state = STATE_NONE; unsigned int i, line_number = 0; - struct texture *current_texture; struct shader_context context; const char *filename = NULL; char *shader_source = NULL;

1 0

Zebediah Figura : tests: Add a shader test for texture sampling.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: vkd3d Branch: master Commit: 3ca8f52b0b6754884b24ed898587947a249dc13e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ca8f52b0b6754884b24ed8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 5 19:35:49 2021 +0100 tests: Add a shader test for texture sampling. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/sampler.shader_test | 34 +++++++++++ tests/shader_runner_d3d12.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) diff --git a/Makefile.am b/Makefile.am index eaa4f81..d6e14cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -302,6 +303,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/sampler.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test new file mode 100644 index 0000000..3970fb5 --- /dev/null +++ b/tests/sampler.shader_test @@ -0,0 +1,34 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (2, 2) +0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 1.0 0.0 1.0 0.0 + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.5, 0.5)); +} + +[test] +draw quad +probe all rgba (0.25, 0, 0.25, 0) + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.5, 0.5)); +} + +[test] +draw quad +probe all rgba (0.25, 0, 0.25, 0) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 20d1ad6..8dd95dc 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -80,6 +80,14 @@ enum texture_data_type TEXTURE_DATA_UINT, }; +struct sampler +{ + unsigned int slot; + + D3D12_FILTER filter; + D3D12_TEXTURE_ADDRESS_MODE u_address, v_address, w_address; +}; + struct texture { unsigned int slot; @@ -108,6 +116,9 @@ struct shader_context struct texture *textures; size_t texture_count; + + struct sampler *samplers; + size_t sampler_count; }; static ID3D10Blob *compile_shader(const char *source, const char *target) @@ -139,6 +150,7 @@ enum parse_state STATE_NONE, STATE_PREPROC, STATE_PREPROC_INVALID, + STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEXTURE, @@ -195,6 +207,74 @@ static void parse_texture_format(struct texture *texture, const char *line) texture->texel_size = 16; } +static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) +{ + if (match_string(line, "border", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_BORDER; + if (match_string(line, "clamp", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + if (match_string(line, "mirror_once", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; + if (match_string(line, "mirror", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; + if (match_string(line, "wrap", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_WRAP; + fprintf(stderr, "Malformed address mode '%s'.\n", line); + return D3D12_TEXTURE_ADDRESS_MODE_WRAP; +} + +static void parse_sampler_directive(struct sampler *sampler, const char *line) +{ + const char *const orig_line = line; + + if (match_string(line, "address", &line)) + { + sampler->u_address = parse_sampler_address_mode(line, &line); + sampler->v_address = parse_sampler_address_mode(line, &line); + sampler->w_address = parse_sampler_address_mode(line, &line); + } + else if (match_string(line, "filter", &line)) + { + static const struct + { + const char *string; + D3D12_FILTER filter; + } + filters[] = + { + {"point point point", D3D12_FILTER_MIN_MAG_MIP_POINT}, + {"point point linear", D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR}, + {"point linear point", D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT}, + {"point linear linear", D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR}, + {"linear point point", D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT}, + {"linear point linear", D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR}, + {"linear linear point", D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT}, + {"linear linear linear", D3D12_FILTER_MIN_MAG_MIP_LINEAR}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(filters); ++i) + { + if (match_string(line, filters[i].string, &line)) + { + sampler->filter = filters[i].filter; + break; + } + } + if (i == ARRAY_SIZE(filters)) + goto err; + } + else + { + goto err; + } + + return; + +err: + fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); +} + static void parse_texture_directive(struct texture *texture, const char *line) { const char *const orig_line = line; @@ -266,6 +346,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin ID3D12GraphicsCommandList *command_list = context->c.list; D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; D3D12_ROOT_PARAMETER root_params[3], *root_param; + D3D12_STATIC_SAMPLER_DESC static_samplers[1]; static const float clear_color[4]; unsigned int uniform_index; ID3D12PipelineState *pso; @@ -274,6 +355,8 @@ static void parse_test_directive(struct shader_context *context, const char *lin root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = static_samplers; if (context->uniform_count) { @@ -324,6 +407,21 @@ static void parse_test_directive(struct shader_context *context, const char *lin assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); + for (i = 0; i < context->sampler_count; ++i) + { + D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; + const struct sampler *sampler = &context->samplers[i]; + + memset(sampler_desc, 0, sizeof(*sampler_desc)); + sampler_desc->Filter = sampler->filter; + sampler_desc->AddressU = sampler->u_address; + sampler_desc->AddressV = sampler->v_address; + sampler_desc->AddressW = sampler->w_address; + sampler_desc->ShaderRegister = sampler->slot; + sampler_desc->RegisterSpace = 0; + sampler_desc->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + } + if (context->c.root_signature) ID3D12RootSignature_Release(context->c.root_signature); hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); @@ -486,6 +584,22 @@ err: fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); } +static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) +{ + struct sampler *sampler; + size_t i; + + for (i = 0; i < context->sampler_count; ++i) + { + sampler = &context->samplers[i]; + + if (sampler->slot == slot) + return sampler; + } + + return NULL; +} + static struct texture *get_texture(struct shader_context *context, unsigned int slot) { struct texture *texture; @@ -511,6 +625,7 @@ START_TEST(shader_runner_d3d12) .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; size_t shader_source_size = 0, shader_source_len = 0; + struct sampler *current_sampler = NULL; struct texture *current_texture = NULL; enum parse_state state = STATE_NONE; unsigned int i, line_number = 0; @@ -559,6 +674,7 @@ START_TEST(shader_runner_d3d12) switch (state) { case STATE_NONE: + case STATE_SAMPLER: case STATE_TEST: case STATE_TEXTURE: break; @@ -663,6 +779,27 @@ START_TEST(shader_runner_d3d12) { state = STATE_SHADER_INVALID_PIXEL; } + else if (sscanf(line, "[sampler %u]\n", &index)) + { + state = STATE_SAMPLER; + + if ((current_sampler = get_sampler(&context, index))) + { + memset(current_sampler, 0, sizeof(*current_sampler)); + } + else + { + context.samplers = realloc(context.samplers, + ++context.sampler_count * sizeof(*context.samplers)); + current_sampler = &context.samplers[context.sampler_count - 1]; + memset(current_sampler, 0, sizeof(*current_sampler)); + } + current_sampler->slot = index; + current_sampler->filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + current_sampler->u_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + } else if (sscanf(line, "[texture %u]\n", &index)) { state = STATE_TEXTURE; @@ -719,6 +856,10 @@ START_TEST(shader_runner_d3d12) break; } + case STATE_SAMPLER: + parse_sampler_directive(current_sampler, line); + break; + case STATE_TEXTURE: parse_texture_directive(current_texture, line); break;

1 0

Zebediah Figura : tests: Return a failure code if unable to parse a shader_test file.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: vkd3d Branch: master Commit: 7c534f4a77dc67c7d76b9c25f905639a30007bdd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c534f4a77dc67c7d76b9c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 5 19:35:50 2021 +0100 tests: Return a failure code if unable to parse a shader_test file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 2 ++ tests/shader_runner_d3d12.c | 71 +++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 42 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 8d1ca39..b7ce9ae 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -48,9 +48,11 @@ static inline size_t align(size_t addr, size_t alignment) } #ifdef __GNUC__ +# define VKD3D_NORETURN __attribute__((noreturn)) # define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) # define VKD3D_UNUSED __attribute__((unused)) #else +# define VKD3D_NORETURN # define VKD3D_PRINTF_FUNC(fmt, args) # define VKD3D_UNUSED #endif /* __GNUC__ */ diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8dd95dc..d404895 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -45,6 +45,16 @@ #include "d3d12_crosstest.h" #include <errno.h> +static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) +{ + va_list args; + + va_start(args, format); + vfprintf(stderr, format, args); + va_end(args); + exit(1); +} + static bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) { size_t new_capacity, max_capacity; @@ -201,10 +211,7 @@ static void parse_texture_format(struct texture *texture, const char *line) } } - fprintf(stderr, "Unknown format '%s'.\n", line); - texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; - texture->data_type = TEXTURE_DATA_FLOAT; - texture->texel_size = 16; + fatal_error("Unknown format '%s'.\n", line); } static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) @@ -219,14 +226,12 @@ static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, c return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; if (match_string(line, "wrap", rest)) return D3D12_TEXTURE_ADDRESS_MODE_WRAP; - fprintf(stderr, "Malformed address mode '%s'.\n", line); - return D3D12_TEXTURE_ADDRESS_MODE_WRAP; + + fatal_error("Unknown sampler address mode '%s'.\n", line); } static void parse_sampler_directive(struct sampler *sampler, const char *line) { - const char *const orig_line = line; - if (match_string(line, "address", &line)) { sampler->u_address = parse_sampler_address_mode(line, &line); @@ -258,26 +263,20 @@ static void parse_sampler_directive(struct sampler *sampler, const char *line) if (match_string(line, filters[i].string, &line)) { sampler->filter = filters[i].filter; - break; + return; } } - if (i == ARRAY_SIZE(filters)) - goto err; + + fatal_error("Unknown sampler filter '%s'.\n", line); } else { - goto err; + fatal_error("Unknown sampler directive '%s'.\n", line); } - - return; - -err: - fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); } static void parse_texture_directive(struct texture *texture, const char *line) { - const char *const orig_line = line; int ret; if (match_string(line, "format", &line)) @@ -288,7 +287,7 @@ static void parse_texture_directive(struct texture *texture, const char *line) { ret = sscanf(line, "( %u , %u )", &texture->width, &texture->height); if (ret < 2) - goto err; + fatal_error("Malformed texture size '%s'.\n", line); } else { @@ -328,17 +327,10 @@ static void parse_texture_directive(struct texture *texture, const char *line) line = rest; } } - - return; - -err: - fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); } static void parse_test_directive(struct shader_context *context, const char *line) { - const char *const orig_line = line; - if (match_string(line, "draw quad", &line)) { D3D12_SHADER_BYTECODE ps @@ -459,7 +451,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 4) - goto err; + fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 5) ulps = 0; check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); @@ -476,7 +468,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) - goto err; + fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 9) ulps = 0; @@ -499,7 +491,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 6) - goto err; + fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 7) ulps = 0; @@ -517,7 +509,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin unsigned int offset; if (!sscanf(line, "%u", &offset)) - goto err; + fatal_error("Unknown uniform type '%s'.\n", line); line = strchr(line, ' ') + 1; if (match_string(line, "float4", &line)) @@ -525,7 +517,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin struct vec4 v; if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) - goto err; + fatal_error("Malformed float4 constant '%s'.\n", line); if (offset + 4 > context->uniform_count) { context->uniform_count = offset + 4; @@ -538,7 +530,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin float f; if (sscanf(line, "%f", &f) < 1) - goto err; + fatal_error("Malformed float constant '%s'.\n", line); if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1; @@ -551,7 +543,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin int i; if (sscanf(line, "%i", &i) < 1) - goto err; + fatal_error("Malformed int constant '%s'.\n", line); if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1; @@ -564,7 +556,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin unsigned int u; if (sscanf(line, "%u", &u) < 1) - goto err; + fatal_error("Malformed uint constant '%s'.\n", line); if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1; @@ -575,13 +567,8 @@ static void parse_test_directive(struct shader_context *context, const char *lin } else { - goto err; + fatal_error("Unknown test directive '%s'.\n", line); } - - return; - -err: - fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); } static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) @@ -656,7 +643,7 @@ START_TEST(shader_runner_d3d12) if (!(f = fopen(filename, "r"))) { - fprintf(stderr, "Unable to open '%s' for reading: %s\n", argv[1], strerror(errno)); + fatal_error("Unable to open '%s' for reading: %s\n", argv[1], strerror(errno)); return; } @@ -840,7 +827,7 @@ START_TEST(shader_runner_d3d12) switch (state) { case STATE_NONE: - fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); + fatal_error("Malformed line '%s'.\n", line); break; case STATE_PREPROC:

1 0

Eric Pouech : dbghelp/pdb: Handle a block in DEBUG_S_LINES subsection spreading across several symbols.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: bfc0edb8cfa9d8434537bf0f002cdf9088b25026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc0edb8cfa9d8434537bf0f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:59:47 2021 +0100 dbghelp/pdb: Handle a block in DEBUG_S_LINES subsection spreading across several symbols. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4fba245d815..1be73b723f0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1480,7 +1480,6 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod) { unsigned i; - DWORD_PTR addr; const void* hdr_last = (const char*)cvmod->dbgsubsect + cvmod->dbgsubsect_size; const struct CV_DebugSSubsectionHeader_t* hdr; const struct CV_DebugSSubsectionHeader_t* hdr_next; @@ -1512,6 +1511,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const hdr_next = CV_RECORD_GAP(hdr, hdr->cbLen); if (!(hdr->type & DEBUG_S_IGNORE)) { + ULONG_PTR lineblk_base; /* FIXME: should also check that whole lines_blk fits in linetab + size */ switch (hdr->type) { @@ -1520,7 +1520,6 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const files_hdr = CV_RECORD_AFTER(lines_hdr); /* Skip blocks that are too small - Intel C Compiler generates these. */ if (!CV_IS_INSIDE(files_hdr, hdr_next)) break; - addr = codeview_get_address(msc_dbg, lines_hdr->segCon, lines_hdr->offCon); TRACE("block from %04x:%08x #%x\n", lines_hdr->segCon, lines_hdr->offCon, lines_hdr->cbCon); chksms = CV_RECORD_GAP(hdr_files, files_hdr->offFile); @@ -1531,20 +1530,20 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const } source = source_new(msc_dbg->module, NULL, (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<stroutofbounds>>"); - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); - /* FIXME: at least labels support line numbers */ - if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) - { - WARN("--not a func at %04x:%08x %Ix tag=%d\n", - lines_hdr->segCon, lines_hdr->offCon, addr, func ? func->symt.tag : -1); - break; - } + lineblk_base = codeview_get_address(msc_dbg, lines_hdr->segCon, lines_hdr->offCon); lines = CV_RECORD_AFTER(files_hdr); for (i = 0; i < files_hdr->nLines; i++) { + func = (struct symt_function*)symt_find_nearest(msc_dbg->module, lineblk_base + lines[i].offset); + /* FIXME: at least labels support line numbers */ + if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) + { + WARN("--not a func at %04x:%08x %Ix tag=%d\n", + lines_hdr->segCon, lines_hdr->offCon + lines[i].offset, lineblk_base + lines[i].offset, func ? func->symt.tag : -1); + continue; + } symt_add_func_line(msc_dbg->module, func, source, - lines[i].linenumStart, - func->address + lines[i].offset); + lines[i].linenumStart, lineblk_base + lines[i].offset); } break; case DEBUG_S_FILECHKSMS: /* skip */

1 0

Eric Pouech : dbghelp/pdb: Add line number to inline sites.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: d8f26a4233be4afe21dc9a165e920e88823f3c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f26a4233be4afe21dc9a16… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 15:00:01 2021 +0100 dbghelp/pdb: Add line number to inline sites. Requires to join DEBUG_S_INLINEES subsection with symbol annotations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1be73b723f0..c0d09b75c56 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1814,6 +1814,70 @@ static BOOL codeview_advance_binannot(struct cv_binannot* cvba) return TRUE; } +static inline int binannot_getsigned(unsigned i) +{ + return (i & 1) ? -(int)(i >> 1) : (int)(i >> 1); +} + +static BOOL cv_dbgsubsect_find_inlinee(const struct msc_debug_info* msc_dbg, + unsigned inlineeid, + const struct cv_module_snarf* cvmod, + const struct CV_DebugSSubsectionHeader_t* hdr_files, + unsigned* srcfile, unsigned* srcline) +{ + const struct CV_DebugSSubsectionHeader_t* hdr; + const struct CV_DebugSSubsectionHeader_t* next_hdr; + const struct CV_InlineeSourceLine_t* inlsrc; + const struct CV_InlineeSourceLineEx_t* inlsrcex; + const struct CV_Checksum_t* chksms; + + for (hdr = cvmod->dbgsubsect; CV_IS_INSIDE(hdr, cvmod->dbgsubsect + cvmod->dbgsubsect_size); hdr = next_hdr) + { + next_hdr = CV_RECORD_GAP(hdr, hdr->cbLen); + if (hdr->type != DEBUG_S_INLINEELINES) continue; + /* subsection starts with a DWORD signature */ + switch (*(DWORD*)CV_RECORD_AFTER(hdr)) + { + case CV_INLINEE_SOURCE_LINE_SIGNATURE: + inlsrc = CV_RECORD_GAP(hdr, sizeof(DWORD)); + while (CV_IS_INSIDE(inlsrc, next_hdr)) + { + if (inlsrc->inlinee == inlineeid) + { + chksms = CV_RECORD_GAP(hdr_files, inlsrc->fileId); + if (!CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) return FALSE; + *srcfile = source_new(msc_dbg->module, NULL, + (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); + *srcline = inlsrc->sourceLineNum; + return TRUE; + } + ++inlsrc; + } + break; + case CV_INLINEE_SOURCE_LINE_SIGNATURE_EX: + inlsrcex = CV_RECORD_GAP(hdr, sizeof(DWORD)); + while (CV_IS_INSIDE(inlsrcex, next_hdr)) + { + if (inlsrcex->inlinee == inlineeid) + { + chksms = CV_RECORD_GAP(hdr_files, inlsrcex->fileId); + if (!CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) return FALSE; + *srcfile = source_new(msc_dbg->module, NULL, + (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); + *srcline = inlsrcex->sourceLineNum; + return TRUE; + } + inlsrcex = CV_RECORD_GAP(inlsrcex, inlsrcex->countOfExtraFiles * sizeof(inlsrcex->extraFileId[0])); + } + break; + default: + FIXME("Unknown signature %x in INLINEELINES subsection\n", *(DWORD*)CV_RECORD_AFTER(hdr)); + break; + } + } + return FALSE; +} + static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod, struct symt_function* top_func, @@ -1827,8 +1891,9 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu DWORD64 addr; struct symt_inlinesite* inlined; struct cv_binannot cvba; - BOOL found = FALSE; - unsigned first, offset, length; + BOOL srcok, found = FALSE; + unsigned first, offset, length, line, srcfile; + const struct CV_Checksum_t* chksms; if (!cvmod->ipi_ctp || !(cvt = codeview_jump_to_type(cvmod->ipi_ctp, inlinee))) { @@ -1891,7 +1956,12 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu break; } if (!hdr_files) return FALSE; + srcok = cv_dbgsubsect_find_inlinee(msc_dbg, inlinee, cvmod, hdr_files, &srcfile, &line); + if (srcok) + symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); + else + srcfile = line = 0; for (;;) { if (!codeview_advance_binannot(&cvba)) break; @@ -1904,21 +1974,33 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu case BA_OP_ChangeCodeOffset: offset += cvba.arg1; length = 1; + if (srcok) + symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); break; case BA_OP_ChangeCodeLength: length = cvba.arg1; break; case BA_OP_ChangeFile: + chksms = CV_RECORD_GAP(hdr_files, cvba.arg1); + if (CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) + srcfile = source_new(msc_dbg->module, NULL, + (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<str-out-of-bounds>>"); break; case BA_OP_ChangeLineOffset: + line += binannot_getsigned(cvba.arg1); break; case BA_OP_ChangeCodeOffsetAndLineOffset: + if (srcok) + symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); + line += binannot_getsigned(cvba.arg2); offset += cvba.arg1; length = 1; break; case BA_OP_ChangeCodeLengthAndCodeOffset: offset += cvba.arg2; length = cvba.arg1; + if (srcok) + symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); break; default: WARN("Unsupported op %d\n", cvba.opcode);

1 0

Rémi Bernon : include: Add some MPEG4 container attributes to mfidl.idl.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 2bec77cb5f9f0e8d0f492bf59d0230061750c1c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bec77cb5f9f0e8d0f492bf5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 15:08:16 2021 +0100 include: Add some MPEG4 container attributes to mfidl.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 511f97e3ac6..4df1d0c85ba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1589,6 +1589,9 @@ cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6 cpp_quote("EXTERN_GUID(MF_PROPERTY_HANDLER_SERVICE, 0xa3face02, 0x32b8, 0x41dd, 0x90, 0xe7, 0x5f, 0xef, 0x7c, 0x89, 0x91, 0xb5);") cpp_quote("EXTERN_GUID(MF_WORKQUEUE_SERVICES, 0x8e37d489, 0x41e0, 0x413a, 0x90, 0x68, 0x28, 0x7c, 0x88, 0x6d, 0x8d, 0xda);") +cpp_quote("EXTERN_GUID(MF_PROGRESSIVE_CODING_CONTENT, 0x8f020eea, 0x1508, 0x471f, 0x9d, 0xa6, 0x50, 0x7d, 0x7c, 0xfa, 0x40, 0xdb);") +cpp_quote("EXTERN_GUID(MF_NALU_LENGTH_SET, 0xa7911d53, 0x12a4, 0x4965, 0xae, 0x70, 0x6e, 0xad, 0xd6, 0xff, 0x05, 0x51);") + cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Arkadiusz Hiler : msvcrt: Increase module's reference count before returning from _beginthread[ex]().
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 04bb9112d2d540452068d1e22d4faf51fe11f351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04bb9112d2d540452068d1e2… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Nov 8 19:38:33 2021 +0200 msvcrt: Increase module's reference count before returning from _beginthread[ex](). Increasing DLL's reference count from the trampoline function makes it prone to race conditions. The thread can start executing after we have already returned from _beginthread[ex]() and the DLL might have been freed. Fixes rare crash on launch with Baldur's Gate 3. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 01500d93d91..173763d0eb1 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -32,6 +32,9 @@ typedef struct { _beginthreadex_start_routine_t start_address_ex; }; void *arglist; +#if _MSVCR_VER >= 140 + HMODULE module; +#endif } _beginthread_trampoline_t; /********************************************************************* @@ -113,16 +116,10 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } + data->module = local_trampoline.module; #endif local_trampoline.start_address(local_trampoline.arglist); @@ -162,7 +159,19 @@ uintptr_t CDECL _beginthread( trampoline->start_address = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + if(ResumeThread(thread) == -1) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); *_errno() = EAGAIN; return -1; @@ -181,19 +190,10 @@ static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg) thread_data_t *data = msvcrt_get_thread_data(); memcpy(&local_trampoline, arg, sizeof(local_trampoline)); - data->handle = local_trampoline.thread; free(arg); - + data->handle = local_trampoline.thread; #if _MSVCR_VER >= 140 - { - thread_data_t *data = msvcrt_get_thread_data(); - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (void*)local_trampoline.start_address_ex, &data->module)) - { - data->module = NULL; - WARN("failed to get module for the start_address: %d\n", GetLastError()); - } - } + data->module = local_trampoline.module; #endif retval = local_trampoline.start_address_ex(local_trampoline.arglist); @@ -225,9 +225,21 @@ uintptr_t CDECL _beginthreadex( trampoline->start_address_ex = start_address; trampoline->arglist = arglist; +#if _MSVCR_VER >= 140 + if(!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)start_address, &trampoline->module)) + { + trampoline->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + thread = CreateThread(security, stack_size, _beginthreadex_trampoline, trampoline, initflag, thrdaddr); if(!thread) { +#if _MSVCR_VER >= 140 + FreeLibrary(trampoline->module); +#endif free(trampoline); msvcrt_set_errno(GetLastError()); return 0;

1 0

Arkadiusz Hiler : ucrtbase/tests: Test for FreeLibrary() vs _beginthread[ex]() race condition.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 96b6dbc94926363a2305913aec17119c85d6d449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6dbc94926363a2305913a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Nov 8 19:38:34 2021 +0200 ucrtbase/tests: Test for FreeLibrary() vs _beginthread[ex]() race condition. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 8fffbffb38e..7693304e612 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,11 +105,11 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); + ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); - ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError());

1 0

Stefan Dösinger : include: Add more dummy msvc SAL macros.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 793bb89c75ab6c95acb2b686724b6e9b6d0cfce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=793bb89c75ab6c95acb2b686… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 8 16:39:00 2021 +0300 include: Add more dummy msvc SAL macros. To make Visual Studio 2019's msvcrt headers happy. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sal.h b/include/sal.h index f11e744aa51..72803a1be39 100644 --- a/include/sal.h +++ b/include/sal.h @@ -202,6 +202,7 @@ #define _Pre_z_ #define _Prepost_z_ +#define _Printf_format_string_ #define _Printf_format_string_params_(count) #define _Reserved_ @@ -224,6 +225,7 @@ #define _Scanf_format_string_ #define _Scanf_format_string_params_(count) +#define _Scanf_s_format_string_ #define _Scanf_s_format_string_params_(count) #define _Success_(exp)

1 0