- Wine-Devel - list.winehq.org

[PATCH 2/2] winmm: Don't process audio data during waveOutWrite while playing
by Andrew Eikum Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/wave.c | 1 - dlls/winmm/waveform.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 56501367190..5e46a2f46e5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1640,7 +1640,6 @@ static void CALLBACK test_reentrant_callback_func(HWAVEOUT hwo, UINT uMsg, case WOM_DONE: /* verify that WOM_DONE is not sent during the following waveOutWrite */ - todo_wine_if(wom_done_count == 1) ok(g_tid == 0, "callback called reentrantly\n"); g_tid = GetCurrentThreadId(); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1159b48b483..ecffa700662 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -191,6 +191,7 @@ static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); static LRESULT WID_Close(HWAVEIN hwave); static MMRESULT WINMM_BeginPlaying(WINMM_Device *device); +static void WOD_PushData(WINMM_Device *device); void WINMM_DeleteWaveform(void) { @@ -775,8 +776,11 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) HeapFree(GetProcessHeap(), 0, info.format); - if(!stopped) + if(!stopped){ + if(is_out) + WOD_PushData(device); WINMM_BeginPlaying(device); + } LeaveCriticalSection(&device->lock); @@ -1948,10 +1952,6 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) TRACE("(%p)\n", device->handle); - if(device->render) - /* prebuffer data before starting */ - WOD_PushData(device); - if(device->stopped){ device->stopped = FALSE; @@ -2893,6 +2893,9 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) header->dwFlags &= ~WHDR_DONE; header->dwFlags |= WHDR_INQUEUE; + if(device->stopped) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); @@ -2970,6 +2973,9 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) device->stopped = TRUE; + if(device->render) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); -- 2.35.0

1 0

[PATCH] include: Add some ListView flags.
by Nikolay Sivov Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 164de374604..944a9158371 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3158,11 +3158,18 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVNI_SELECTED 0x0002 #define LVNI_CUT 0x0004 #define LVNI_DROPHILITED 0x0008 +#define LVNI_STATEMASK (LVNI_FOCUSED | LVNI_SELECTED | LVNI_CUT | LVNI_DROPHILITED) + +#define LVNI_VISIBLEORDER 0x0010 +#define LVNI_PREVIOUS 0x0020 +#define LVNI_VISIBLEONLY 0x0040 +#define LVNI_SAMEGROUPONLY 0x0080 #define LVNI_ABOVE 0x0100 #define LVNI_BELOW 0x0200 #define LVNI_TOLEFT 0x0400 #define LVNI_TORIGHT 0x0800 +#define LVNI_DIRECTIONMASK (LVNI_ABOVE | LVNI_BELOW | LVNI_TOLEFT | LVNI_TORIGHT) #define LVHT_NOWHERE 0x0001 #define LVHT_ONITEMICON 0x0002 @@ -3201,6 +3208,12 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVGS_NORMAL 0x00000000 #define LVGS_COLLAPSED 0x00000001 #define LVGS_HIDDEN 0x00000002 +#define LVGS_NOHEADER 0x00000004 +#define LVGS_COLLAPSIBLE 0x00000008 +#define LVGS_FOCUSED 0x00000010 +#define LVGS_SELECTED 0x00000020 +#define LVGS_SUBSETED 0x00000040 +#define LVGS_SUBSETLINKFOCUSED 0x00000080 #define LVGA_HEADER_LEFT 0x00000001 #define LVGA_HEADER_CENTER 0x00000002 -- 2.34.1

1 0

[PATCH 6/6] msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.
by Daniel Lehman Jan. 27, 2022

Jan. 27, 2022

2 3

[PATCH vkd3d] vkd3d-shader: Handle VKD3DSUF_GLOBALLY_COHERENT in vkd3d_dxbc_compiler_emit_dcl_resource_raw().
by Andrey Gusev Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d-shader/spirv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1ffce6a..a361cc7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6091,8 +6091,16 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; uint32_t flags = instruction->flags; + if (flags & VKD3DSUF_GLOBALLY_COHERENT) + { + flags &= ~VKD3DSUF_GLOBALLY_COHERENT; + } /* We don't distinguish between APPEND and COUNTER UAVs. */ - flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + if (flags & VKD3DSUF_ORDER_PRESERVING_COUNTER) + { + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; + } + if (flags) FIXME("Unhandled UAV flags %#x.\n", flags); -- 2.34.1

2 1

[PATCH] widl: Allow the reuse of nested declared p-Types from imported files.
by Bernhard Kölbl Jan. 27, 2022

Jan. 27, 2022

Currently widl can't import declarations of nested parameterized types from other idl files, so one has to delcare them all in the same file. An example: import "windows.foundation.idl"; namespace Windows { namespace Example { declare{ interface Windows.Foundation.Collections.IVectorView<HSTRING>; ^~~~ In the WinRT SDK this is already declared in windows.foundation.idl, which makes this line redundant. interface Windows.Foundation.Collections.IIterator<Windows.Foundation.Collections.IVectorView<HSTRING> >; interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IVectorView<HSTRING> >; } } } This commit fixes this by adding the declared p-types from imported files to the parameterized statements list as STMT_TYPEREF, so they are ignored in the header generation process. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- Thanks to Rémi Bernon for helping me on this one. :) tools/widl/parser.y | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d6ac73cbf00..64ef82450c9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -103,7 +103,7 @@ static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); static statement_t *make_statement_typedef(var_list_t *names, int declonly); static statement_t *make_statement_import(const char *str); -static statement_t *make_statement_parameterized_type(type_t *type, typeref_list_t *params); +static statement_t *make_statement_parameterized_type(type_t *type, typeref_list_t *params, enum statement_type stmt_type); static statement_t *make_statement_delegate(type_t *ret, var_list_t *args); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); @@ -370,7 +370,7 @@ m_acf: /* empty */ | aACF acf_statements decl_statements: { $$ = NULL; } | decl_statements tINTERFACE qualified_type '<' parameterized_type_args '>' ';' - { parameterized_type_stmts = append_statement(parameterized_type_stmts, make_statement_parameterized_type($3, $5)); + { parameterized_type_stmts = append_statement(parameterized_type_stmts, make_statement_parameterized_type($3, $5, STMT_TYPE)); $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); } ; @@ -379,7 +379,9 @@ decl_block: tDECLARE '{' decl_statements '}' { $$ = $3; } imp_decl_statements: { $$ = NULL; } | imp_decl_statements tINTERFACE qualified_type '<' parameterized_type_args '>' ';' - { $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); } + { parameterized_type_stmts = append_statement(parameterized_type_stmts, make_statement_parameterized_type($3, $5, STMT_TYPEREF)); + $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); + } ; imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; } @@ -3138,6 +3140,7 @@ static statement_list_t *append_parameterized_type_stmts(statement_list_t *stmts switch(stmt->type) { case STMT_TYPE: + case STMT_TYPEREF: stmt->u.type = type_parameterized_type_specialize_define(stmt->u.type); stmt->declonly = FALSE; list_remove(&stmt->entry); @@ -3327,9 +3330,9 @@ static statement_t *make_statement_typedef(declarator_list_t *decls, int declonl return stmt; } -static statement_t *make_statement_parameterized_type(type_t *type, typeref_list_t *params) +static statement_t *make_statement_parameterized_type(type_t *type, typeref_list_t *params, enum statement_type stmt_type) { - statement_t *stmt = make_statement(STMT_TYPE); + statement_t *stmt = make_statement(stmt_type); stmt->u.type = type_parameterized_type_specialize_partial(type, params); return stmt; } -- 2.34.1

1 0

[PATCH vkd3d v3 1/8] tests: Rename shader_runner_d3d12 to shader_runner.
by Zebediah Figura Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I don't know why I didn't think of this in the first place... Makefile.am | 6 +++--- tests/{shader_runner_d3d12.c => shader_runner.c} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename tests/{shader_runner_d3d12.c => shader_runner.c} (99%) diff --git a/Makefile.am b/Makefile.am index db0a6f680..17fcae32f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ vkd3d_cross_tests = \ tests/hlsl_d3d12 vkd3d_shader_runners = \ - tests/shader_runner_d3d12 + tests/shader_runner vkd3d_shader_tests = \ tests/abs.shader_test \ @@ -282,10 +282,10 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner.c similarity index 99% rename from tests/shader_runner_d3d12.c rename to tests/shader_runner.c index 4a8d1f18e..5db963f51 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner.c @@ -643,7 +643,7 @@ static struct texture *get_texture(struct shader_context *context, unsigned int return NULL; } -START_TEST(shader_runner_d3d12) +START_TEST(shader_runner) { static const struct test_context_desc desc = { -- 2.34.1

2 15

[PATCH 5/5] wined3d: Use wined3d_bit_scan() in set_glsl_shader_program().
by Henri Verbeet Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e33cd5d5fe0..c812b2d8b08 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10231,6 +10231,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct wined3d_shader *pshader = NULL; GLuint reorder_shader_id = 0; struct glsl_program_key key; + uint32_t attribs_map; GLuint program_id; unsigned int i; GLuint vs_id = 0; @@ -10239,7 +10240,6 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, GLuint gs_id = 0; GLuint ps_id = 0; struct list *ps_list, *vs_list; - WORD attribs_map; struct wined3d_string_buffer *tmp_name; if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) @@ -10417,11 +10417,9 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, * in order to make the bindings work, and it has to be done prior * to linking the GLSL program. */ tmp_name = string_buffer_get(&priv->string_buffers); - for (i = 0; attribs_map; attribs_map >>= 1, ++i) + while (attribs_map) { - if (!(attribs_map & 1)) - continue; - + i = wined3d_bit_scan(&attribs_map); string_buffer_sprintf(tmp_name, "vs_in%u", i); GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); if (vshader && vshader->reg_maps.shader_version.major >= 4) -- 2.30.2

1 0

[PATCH 4/5] wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers().
by Henri Verbeet Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 29794fe0f35..9236d2db90f 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3570,18 +3570,16 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex { const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; unsigned int i, tex; - WORD ffu_map; + uint32_t ffu_map; ffu_map = context_gl->c.fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (!(ffu_map & 1)) - continue; - + i = wined3d_bit_scan(&ffu_map); if (context_gl->tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); @@ -3594,11 +3592,9 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex /* Now work out the mapping */ tex = 0; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (!(ffu_map & 1)) - continue; - + i = wined3d_bit_scan(&ffu_map); if (context_gl->tex_unit_map[i] != tex) { wined3d_context_gl_map_stage(context_gl, i, tex); -- 2.30.2

1 0

[PATCH 3/5] wined3d: Use wined3d_bit_scan() in draw_primitive_immediate_mode().
by Henri Verbeet Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index eed27dd445d..29794fe0f35 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4708,7 +4708,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, * them is printed after decoding the vertex declaration. */ for (vertex_idx = 0; vertex_idx < vertex_count; ++vertex_idx) { - unsigned int tmp_tex_mask; + uint32_t tmp_tex_mask; stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); @@ -4747,11 +4747,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, } tmp_tex_mask = tex_mask; - for (texture_idx = 0; tmp_tex_mask; tmp_tex_mask >>= 1, ++texture_idx) + while (tmp_tex_mask) { - if (!(tmp_tex_mask & 1)) - continue; - + texture_idx = wined3d_bit_scan(&tmp_tex_mask); coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; ptr = tex_coords[coord_idx] + (stride_idx * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( -- 2.30.2

1 0

[PATCH 2/5] wined3d: Use wined3d_bit_scan() in context_preload_textures().
by Henri Verbeet Jan. 27, 2022

Jan. 27, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6aa5ae4e997..1dc691c46a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -390,12 +390,12 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } else { - WORD ffu_map = context->fixed_function_usage_map; + uint32_t ffu_map = context->fixed_function_usage_map; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (ffu_map & 1) - context_preload_texture(context, state, i); + i = wined3d_bit_scan(&ffu_map); + context_preload_texture(context, state, i); } } } -- 2.30.2

1 0