January 2022 - Wine-Devel - list.winehq.org

RE: [PATCH 6/6] msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.

by Daniel Lehman

> The workcalled < 1234 occasionally fails on my machine (and if it doesn't we end with workcalled around 1230). Please remove the test or find a way to avoid the race. I wanted a way to show the 2nd argument was really a cancel, but wasn't sure about the best way. the 1234 seemed to work consistently for my box - would a higher number be ok? if not, would removing the test for now be ok, to avoid random failures? > Please also use InterlockedIncrement when updating workcalled from multiple threads. Ah, right. will do Thanks daniel

Jan. 27, 2022

Re: [RFC PATCH 1/6] server: Allow calling async_handoff() with status code STATUS_ALERTED.

by Jinoh Kang

On 1/27/22 21:02, Jacek Caban wrote: > On 1/27/22 00:52, Zebediah Figura (she/her) wrote: >> On 1/23/22 11:29, Jinoh Kang wrote: >>> +static int async_add_queue( struct object *obj, struct wait_queue_entry *entry ) >>> +{ >>> + struct async *async = (struct async *)obj; >>> + assert( obj->ops == &async_ops ); >>> + >>> + if (!async->pending && async->terminated && async->alerted) >>> + { >>> + /* The client has failed to complete synchronously (e.g. EWOULDBLOCK). >>> + * Restart the async as fully fledged asynchronous I/O, where >>> + * the completion port notification and APC call will be triggered >>> + * appropriately. */ >>> + async->pending = 1; >>> + >>> + /* Unset the signaled flag if the client wants to block on this async. */ >>> + if (async->blocking) async->signaled = 0; >>> + >>> + async_set_result( obj, STATUS_PENDING, 0 ); /* kick it off */ >>> + } >>> + >>> + return add_queue( obj, entry ); >>> +} >>> + >> >> I'll admit, this kind of thing is why I didn't really want to have to try to optimize 3 server calls into 2. Asyncs are already really complicated, in terms of the many paths they can take, and it seems like no matter what we do they're going to get worse. > > > Did you consider moving whole sock_send() and try_send() to server? The patchset is about sock_recv(), although I suppose sock_send() needs fixing as well. > We could then have a proper and reliable queue in server socket object and client could just do a regular generic server ioctl. (I didn't really follow closely the conversation, so sorry if I missed something). For small packets it seems like a good idea. We still need to handle scatter/gather I/O though. > > > Thanks, > > Jacek > -- Sincerely, Jinoh Kang

Jan. 27, 2022

[PATCH 5/5] wined3d: Use wined3d_bit_scan() in set_glsl_shader_program().

by Henri Verbeet

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

Jan. 27, 2022

[PATCH 4/5] wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers().

by Henri Verbeet

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

Jan. 27, 2022

[PATCH 3/5] wined3d: Use wined3d_bit_scan() in draw_primitive_immediate_mode().

by Henri Verbeet

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

Jan. 27, 2022

[PATCH 2/5] wined3d: Use wined3d_bit_scan() in context_preload_textures().

by Henri Verbeet

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

Jan. 27, 2022

[PATCH 1/5] wined3d: Get rid of a superfluous cast.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9fd2ed67dcc..eed27dd445d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2706,7 +2706,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ map: if (bo->b.map_ptr) - return (uint8_t *)bo->b.map_ptr; + return bo->b.map_ptr; gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); -- 2.30.2

Jan. 27, 2022

Re: [PATCH 2/2] winecoreaudio: Remove unnecessary buffer sizes.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jan 26, 2022 at 01:26:13PM +0000, Huw Davies wrote: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/winecoreaudio.drv/coreaudio.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c > index a2bbc3e45c9..f242ebe54a8 100644 > --- a/dlls/winecoreaudio.drv/coreaudio.c > +++ b/dlls/winecoreaudio.drv/coreaudio.c > @@ -92,7 +92,6 @@ struct coreaudio_stream > INT32 getbuf_last; > WAVEFORMATEX *fmt; > BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; > - SIZE_T local_buffer_size, tmp_buffer_size; > }; > > static HRESULT osstatus_to_hresult(OSStatus sc) > @@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) > struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); > AURenderCallbackStruct input; > OSStatus sc; > + SIZE_T size; > > if(!stream){ > params->result = E_OUTOFMEMORY; > @@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) > goto end; > } > > - stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; > - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, > + size = stream->bufsize_frames * stream->fmt->nBlockAlign; > + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, > MEM_COMMIT, PAGE_READWRITE)){ > params->result = E_OUTOFMEMORY; > goto end; > @@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) > { > struct get_render_buffer_params *params = args; > struct coreaudio_stream *stream = params->stream; > + SIZE_T size; > UINT32 pad; > > OSSpinLockLock(&stream->lock); > @@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) > if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ > if(stream->tmp_buffer_frames < params->frames){ > if(stream->tmp_buffer){ > - SIZE_T size = 0; > + size = 0; > NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, > &size, MEM_RELEASE); > stream->tmp_buffer = NULL; > } > - stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; > + size = params->frames * stream->fmt->nBlockAlign; > if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, > - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ > + &size, MEM_COMMIT, PAGE_READWRITE)){ > stream->tmp_buffer_frames = 0; > params->result = E_OUTOFMEMORY; > goto end; > @@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) > struct coreaudio_stream *stream = params->stream; > UINT32 chunk_bytes, chunk_frames; > LARGE_INTEGER stamp, freq; > + SIZE_T size; > > OSSpinLockLock(&stream->lock); > > @@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) > if(chunk_frames < stream->period_frames){ > chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; > if(!stream->tmp_buffer){ > - stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; > + size = stream->period_frames * stream->fmt->nBlockAlign; > NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, > - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); > + &size, MEM_COMMIT, PAGE_READWRITE); > } > *params->data = stream->tmp_buffer; > memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, > -- > 2.23.0 > >

Jan. 27, 2022

Re: [PATCH 1/2] winepulse: Remove unnecessary alloc_size.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jan 26, 2022 at 01:26:12PM +0000, Huw Davies wrote: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/winepulse.drv/pulse.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c > index f32f2a3d26c..3e65936a18f 100644 > --- a/dlls/winepulse.drv/pulse.c > +++ b/dlls/winepulse.drv/pulse.c > @@ -59,7 +59,7 @@ struct pulse_stream > > INT32 locked; > BOOL started; > - SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; > + SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; > SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; > SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; > BYTE *local_buffer, *tmp_buffer, *peek_buffer; > @@ -868,14 +868,16 @@ static NTSTATUS pulse_create_stream(void *args) > if (SUCCEEDED(hr)) { > UINT32 unalign; > const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); > + SIZE_T size; > + > stream->attr = *attr; > /* Update frames according to new size */ > dump_attr(attr); > if (stream->dataflow == eRender) { > - stream->alloc_size = stream->real_bufsize_bytes = > + size = stream->real_bufsize_bytes = > stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); > if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, > - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) > + 0, &size, MEM_COMMIT, PAGE_READWRITE)) > hr = E_OUTOFMEMORY; > } else { > UINT32 i, capture_packets; > @@ -887,9 +889,9 @@ static NTSTATUS pulse_create_stream(void *args) > > capture_packets = stream->real_bufsize_bytes / stream->period_bytes; > > - stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); > + size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); > if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, > - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) > + 0, &size, MEM_COMMIT, PAGE_READWRITE)) > hr = E_OUTOFMEMORY; > else { > ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes); > -- > 2.23.0 > >

Jan. 27, 2022

Re: [PATCH vkd3d v2] build: Disable crosstests as well if tests are disabled.

by Henri Verbeet

On Wed, 26 Jan 2022 at 18:36, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > v2: Actually disable them in the makefile. > > Makefile.am | 10 ++++++++++ > configure.ac | 9 +++++---- > 2 files changed, 15 insertions(+), 4 deletions(-) > If the goal is just to disable the crosstest targets, wouldn't inserting something like AS_IF([test "x$enable_tests" = "xno"], [CROSSTARGET32=no CROSSTARGET64=no]) before CROSSTARGET32/CROSSTARGET64 are used be a little more straightforward? Alternatively, we could use the existing BUILD_TESTS in Makefile.am and adjust the messages in configure.ac. Note however that the crosstest targets also build the demos, not just the tests.

Jan. 27, 2022