wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Zebediah Figura : d3d11: Use wined3d_device_context_set_depth_stencil_state().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: c3bcb944107402d9e7650b6287af4502eeab1d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bcb944107402d9e7650b62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:17 2021 -0600 d3d11: Use wined3d_device_context_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6f98227bef3..664abd1eaef 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1023,7 +1023,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext1 *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_depthstencil_state *state_impl; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", @@ -1032,12 +1032,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_mutex_lock(); if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context->wined3d_context, NULL, stencil_ref); wined3d_mutex_unlock(); return; } - wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context->wined3d_context, state_impl->wined3d_state, stencil_ref); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_depth_stencil_state().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 41f521b59be289978a5b2b42338b81f666376210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f521b59be289978a5b2b42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:16 2021 -0600 wined3d: Introduce wined3d_device_context_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 36 ++++++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b24342d2f3..3864bcfbb81 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1761,22 +1761,9 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_depth_stencil_state *prev; - TRACE("device %p, depth_stencil_state %p, stencil_ref %u.\n", device, depth_stencil_state, stencil_ref); - prev = state->depth_stencil_state; - if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) - return; - - if (depth_stencil_state) - wined3d_depth_stencil_state_incref(depth_stencil_state); - state->depth_stencil_state = depth_stencil_state; - state->stencil_ref = stencil_ref; - wined3d_device_context_emit_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); - if (prev) - wined3d_depth_stencil_state_decref(prev); + wined3d_device_context_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); } struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, @@ -2142,6 +2129,27 @@ void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context wined3d_blend_state_decref(prev); } +void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) +{ + struct wined3d_state *state = context->state; + struct wined3d_depth_stencil_state *prev; + + TRACE("context %p, depth_stencil_state %p, stencil_ref %u.\n", context, depth_stencil_state, stencil_ref); + + prev = state->depth_stencil_state; + if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) + return; + + if (depth_stencil_state) + wined3d_depth_stencil_state_incref(depth_stencil_state); + state->depth_stencil_state = depth_stencil_state; + state->stencil_ref = stencil_ref; + wined3d_device_context_emit_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); + if (prev) + wined3d_depth_stencil_state_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 17cff7ffb9f..04bb975da73 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,7 @@ @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) +@ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ead427a13f6..c52f328c277 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2553,6 +2553,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_depth_stencil_state().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: a3102c7b392270ecf9f05a208b3b0d1c188238f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3102c7b392270ecf9f05a20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:15 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4d50ecba23b..4efbe61b3fb 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1679,17 +1679,17 @@ static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const device_invalidate_state(cs->c.device, STATE_STENCIL_REF); } -void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, +void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_cs_set_depth_stencil_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE; op->state = state; op->stencil_ref = stencil_ref; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5179f68cd6..0b24342d2f3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,7 +1774,7 @@ void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, wined3d_depth_stencil_state_incref(depth_stencil_state); state->depth_stencil_state = depth_stencil_state; state->stencil_ref = stencil_ref; - wined3d_cs_emit_set_depth_stencil_state(device->cs, depth_stencil_state, stencil_ref); + wined3d_device_context_emit_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } @@ -2027,7 +2027,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 } wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); - wined3d_cs_emit_set_depth_stencil_state(device->cs, state->depth_stencil_state, state->stencil_ref); + wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); wined3d_cs_emit_set_rasterizer_state(device->cs, state->rasterizer_state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7dfa7d2211b..fa8a425334f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4745,8 +4745,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, @@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Remove dead statement.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 86a06f7e9726acedd9f6e7e75e1befbdf159078f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a06f7e9726acedd9f6e7e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:18 2021 +0100 wined3d: Remove dead statement. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9ea62a81d0b..8fca81ec19c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -193,7 +193,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf return FALSE; } - list_init(&buffer_gl->bo_user.entry); list_add_head(&buffer_gl->bo.users, &buffer_gl->bo_user.entry); buffer_gl->b.buffer_object = (uintptr_t)bo; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0);

1 0

Matteo Bruni : d3d11/tests: Report failure in test_clear_buffer_unordered_access_view() at the first mismatch.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: f75e2e4207fc4d4a75504a4a9bb7168c59e6cf29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f75e2e4207fc4d4a75504a4a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:17 2021 +0100 d3d11/tests: Report failure in test_clear_buffer_unordered_access_view() at the first mismatch. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6cdac34c0cd..1e69d827977 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16013,7 +16013,10 @@ static void test_clear_buffer_unordered_access_view(void) const struct uvec4 broken_result = {uvec4.x, uvec4.x, uvec4.x, uvec4.x}; /* Intel */ data = get_readback_uvec4(&rb, x, 0); if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + { all_match = FALSE; + break; + } } ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); @@ -16028,7 +16031,10 @@ static void test_clear_buffer_unordered_access_view(void) uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; broken_result.x = broken_result.y = broken_result.z = broken_result.w = uvec4.x; if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + { all_match = FALSE; + break; + } } ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x);

1 0

Matteo Bruni : wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: e4bc4df09f414ee44b293f942015e6e20a58c0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4bc4df09f414ee44b293f94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:15 2021 +0100 wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e1c899523d..66caf8249f5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4146,7 +4146,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, - {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; @@ -4181,6 +4181,17 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + if (vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + if (~properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + format->vk_format = vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + } + } if (properties.bufferFeatures & VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT) format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;

1 0

Jan Sikorski : wined3d: Check slice pitch against its size in wined3d_format_copy_data().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: b8a5f8098ba07731d0e1b98d869cc54a00fbb5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a5f8098ba07731d0e1b98d… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 10 15:10:43 2021 +0100 wined3d: Check slice pitch against its size in wined3d_format_copy_data(). If they don't match and there's more than one slice to copy, we can't use a single memcpy. Fixes blinking objects in Hellblade: Senua's Sacrifice. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9df51872d42..1e1c899523d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5981,17 +5981,19 @@ void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) { unsigned int row_block_count, row_count, row_size, slice, row; - unsigned int slice_count = d; + unsigned int slice_count = d, slice_size; const uint8_t *src_row; uint8_t *dst_row; row_block_count = (w + format->block_width - 1) / format->block_width; row_count = (h + format->block_height - 1) / format->block_height; row_size = row_block_count * format->block_byte_count; + slice_size = row_size * row_count; - if (src_row_pitch == row_size && dst_row_pitch == row_size && src_slice_pitch == dst_slice_pitch) + if (src_row_pitch == row_size && dst_row_pitch == row_size + && ((src_slice_pitch == slice_size && dst_slice_pitch == slice_size) || slice_count == 1)) { - memcpy(dst, src, slice_count * row_count * row_size); + memcpy(dst, src, slice_count * slice_size); return; }

1 0

Alexandre Julliard : server: Don't return image information for a terminated process.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 4ece7d409a64e0a21159c5fd550ce1e8f40fefa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ece7d409a64e0a21159c5fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 21:51:57 2021 +0100 server: Don't return image information for a terminated process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 -- server/process.c | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3e450c09849..373212cd2da 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4207,9 +4207,7 @@ static void test_dead_process(void) memset( &image, 0xcc, sizeof(image) ); status = NtQueryInformationProcess( pi.hProcess, ProcessImageInformation, &image, sizeof(image), NULL); - todo_wine ok( status == STATUS_PROCESS_IS_TERMINATING, "ProcessImageInformation wrong error %x\n", status ); - todo_wine ok( image.Machine == 0xcccc, "ProcessImageInformation info modified\n" ); while ((status = NtQuerySystemInformation(SystemProcessInformation, buffer, size, &size)) == STATUS_INFO_LENGTH_MISMATCH) diff --git a/server/process.c b/server/process.c index 90ea44515ec..f65d7abe2af 100644 --- a/server/process.c +++ b/server/process.c @@ -1361,8 +1361,12 @@ DECL_HANDLER(get_process_info) client_ptr_t base; const pe_image_info_t *info; struct memory_view *view = get_exe_view( process ); - if (view && (info = get_view_image_info( view, &base ))) - set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); + if (view) + { + if ((info = get_view_image_info( view, &base ))) + set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); + } + else set_error( STATUS_PROCESS_IS_TERMINATING ); } release_object( process ); }

1 0

Alexandre Julliard : server: Store a copy of the image file name in the process.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 3c9b5379d1a57f69fa14f87f64f2079171becb6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9b5379d1a57f69fa14f87f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 21:51:37 2021 +0100 server: Store a copy of the image file name in the process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 -- server/mapping.c | 3 +++ server/process.c | 21 +++++++++------------ server/process.h | 2 ++ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1c47f8a3b64..3e450c09849 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4192,9 +4192,7 @@ static void test_dead_process(void) memset( data, 0, sizeof(data) ); status = NtQueryInformationProcess( pi.hProcess, ProcessImageFileName, data, sizeof(data), NULL); ok( !status, "ProcessImageFileName failed %x\n", status ); - todo_wine ok( ((UNICODE_STRING *)data)->Length, "ProcessImageFileName not set\n" ); - todo_wine ok( ((UNICODE_STRING *)data)->Buffer[0] == '\\', "ProcessImageFileName not set\n" ); memset( prio, 0xcc, sizeof(*prio) ); diff --git a/server/mapping.c b/server/mapping.c index 17c7ca26b3a..ebf3e057c75 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -353,6 +353,7 @@ struct memory_view *get_exe_view( struct process *process ) static void add_process_view( struct thread *thread, struct memory_view *view ) { struct process *process = thread->process; + struct unicode_str name; if (view->flags & SEC_IMAGE) { @@ -362,6 +363,8 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) { /* main exe */ list_add_head( &process->views, &view->entry ); + if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) + process->imagelen = name.len; return; } } diff --git a/server/process.c b/server/process.c index 0d550328312..90ea44515ec 100644 --- a/server/process.c +++ b/server/process.c @@ -536,6 +536,8 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, process->is_system = 0; process->debug_children = 1; process->is_terminating = 0; + process->imagelen = 0; + process->image = NULL; process->job = NULL; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; @@ -649,6 +651,7 @@ static void process_destroy( struct object *obj ) if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); free( process->dir_cache ); + free( process->image ); } /* dump a process on stdout for debugging purposes */ @@ -1381,13 +1384,12 @@ DECL_HANDLER(get_process_debug_info) /* fetch the name of the process image */ DECL_HANDLER(get_process_image_name) { - struct unicode_str name; - struct memory_view *view; struct process *process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ); if (!process) return; - if ((view = get_exe_view( process )) && get_view_nt_name( view, &name )) + if (process->image) { + struct unicode_str name = { process->image, process->imagelen }; /* skip the \??\ prefix */ if (req->win32 && name.len > 6 * sizeof(WCHAR) && name.str[5] == ':') { @@ -1724,7 +1726,6 @@ DECL_HANDLER(list_processes) { struct process *process; struct thread *thread; - struct unicode_str nt_name; unsigned int pos = 0; char *buffer; @@ -1733,10 +1734,8 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { - struct memory_view *view = get_exe_view( process ); - if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; reply->info_size = (reply->info_size + 7) & ~7; - reply->info_size += sizeof(struct process_info) + nt_name.len; + reply->info_size += sizeof(struct process_info) + process->imagelen; reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; @@ -1754,13 +1753,11 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { struct process_info *process_info; - struct memory_view *view = get_exe_view( process ); pos = (pos + 7) & ~7; - if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; process_info = (struct process_info *)(buffer + pos); process_info->start_time = process->start_time; - process_info->name_len = nt_name.len; + process_info->name_len = process->imagelen; process_info->thread_count = process->running_threads; process_info->priority = process->priority; process_info->pid = process->id; @@ -1768,8 +1765,8 @@ DECL_HANDLER(list_processes) process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); - memcpy( buffer + pos, nt_name.str, nt_name.len ); - pos += nt_name.len; + memcpy( buffer + pos, process->image, process->imagelen ); + pos += process->imagelen; pos = (pos + 7) & ~7; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { diff --git a/server/process.h b/server/process.h index c8be5640a54..0997a759330 100644 --- a/server/process.h +++ b/server/process.h @@ -64,6 +64,8 @@ struct process unsigned int is_system:1; /* is it a system process? */ unsigned int debug_children:1;/* also debug all child processes */ unsigned int is_terminating:1;/* is process terminating? */ + data_size_t imagelen; /* length of image path in bytes */ + WCHAR *image; /* main exe image full path */ struct job *job; /* job object ascoicated with this process */ struct list job_entry; /* list entry for job object */ struct list asyncs; /* list of async object owned by the process */

1 0

Alexandre Julliard : server: Only keep the running processes in the global process list.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d316d548c2006b14efd5e822be05e83f3cbc7d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d316d548c2006b14efd5e822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 11 18:09:42 2021 +0100 server: Only keep the running processes in the global process list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - server/console.c | 3 +-- server/process.c | 21 +++++++-------------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 108851000ff..1c47f8a3b64 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4231,7 +4231,6 @@ static void test_dead_process(void) } offset += spi->NextEntryOffset; } while (spi->NextEntryOffset); - todo_wine ok( !found, "process still enumerated\n" ); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); diff --git a/server/console.c b/server/console.c index 92bda51846c..848ee6e8d98 100644 --- a/server/console.c +++ b/server/console.c @@ -649,8 +649,7 @@ static int propagate_console_signal_cb(struct process *process, void *user) { struct console_signal_info* csi = (struct console_signal_info*)user; - if (process->console == csi->console && process->running_threads && - (!csi->group || process->group_id == csi->group)) + if (process->console == csi->console && (!csi->group || process->group_id == csi->group)) { /* find a suitable thread to signal */ struct thread *thread; diff --git a/server/process.c b/server/process.c index e5fe7cc6b6e..0d550328312 100644 --- a/server/process.c +++ b/server/process.c @@ -559,7 +559,6 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, list_init( &process->rawinput_devices ); process->end_time = 0; - list_add_tail( &process_list, &process->entry ); if (sd && !default_set_sd( &process->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION )) @@ -646,7 +645,6 @@ static void process_destroy( struct object *obj ) } if (process->console) release_object( process->console ); if (process->msg_fd) release_object( process->msg_fd ); - list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); @@ -804,15 +802,11 @@ restart: /* kill all processes */ static void kill_all_processes(void) { - for (;;) - { - struct process *process; + struct list *ptr; - LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (process->running_threads) break; - } - if (&process->entry == &process_list) break; /* no process found */ + while ((ptr = list_head( &process_list ))) + { + struct process *process = LIST_ENTRY( ptr, struct process, entry ); terminate_process( process, NULL, 1 ); } } @@ -828,7 +822,6 @@ void kill_console_processes( struct thread *renderer, int exit_code ) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { if (process == renderer->process) continue; - if (!process->running_threads) continue; if (process->console && console_get_renderer( process->console ) == renderer) break; } if (&process->entry == &process_list) break; /* no process found */ @@ -875,6 +868,7 @@ void add_process_thread( struct process *process, struct thread *thread ) list_add_tail( &process->thread_list, &thread->proc_entry ); if (!process->running_threads++) { + list_add_tail( &process_list, &process->entry ); running_processes++; if (!process->is_system) { @@ -901,6 +895,7 @@ void remove_process_thread( struct process *process, struct thread *thread ) /* we have removed the last running thread, exit the process */ process->exit_code = thread->exit_code; generate_debug_event( thread, DbgExitProcessStateChange, process ); + list_remove( &process->entry ); process_killed( process ); } else generate_debug_event( thread, DbgExitThreadStateChange, thread ); @@ -979,10 +974,8 @@ void detach_debugged_processes( struct debug_obj *debug_obj, int exit_code ) /* find the first process being debugged by 'debugger' and still running */ LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) - { - if (!process->running_threads) continue; if (process->debug_obj == debug_obj) break; - } + if (&process->entry == &process_list) break; /* no process found */ if (exit_code) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021