wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Józef Kucia : tests: Add test for Map() on reserved resources.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: acd5417f8bb8570f35ad86ee8a77544d5e43e1b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=acd5417f8bb8570f35ad86e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:07 2019 +0200 tests: Add test for Map() on reserved resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8eb4ab..bd055fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2186,6 +2186,7 @@ static void test_create_reserved_resource(void) ID3D12Device *device; ULONG refcount; HRESULT hr; + void *ptr; if (!(device = create_device())) { @@ -2232,6 +2233,10 @@ static void test_create_reserved_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags); + /* Map() is not allowed on reserved resources */ + hr = ID3D12Resource_Map(resource, 0, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);

1 0

Józef Kucia : tests: Destroy placed resources after destroying heap.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: vkd3d Branch: master Commit: c648ea85aa567b7fd45db59ea98d90f890aa2793 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c648ea85aa567b7fd45db59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:06 2019 +0200 tests: Destroy placed resources after destroying heap. In order to exercise that the destroyed heap isn't accessed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5177607..b8eb4ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6769,11 +6769,11 @@ static void test_map_placed_resources(void) release_resource_readback(&rb); ID3D12Resource_Release(uav_buffer); - for (i = 0; i < ARRAY_SIZE(cb); ++i) - ID3D12Resource_Release(cb[i]); ID3D12Resource_Release(readback_buffer); ID3D12Heap_Release(upload_heap); ID3D12Heap_Release(readback_heap); + for (i = 0; i < ARRAY_SIZE(cb); ++i) + ID3D12Resource_Release(cb[i]); destroy_test_context(&context); }

1 0

Marcus Meissner : mshtml: Fixed buffer size to WideCharToMultiByte.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 201d13a3c31131f204f89d61be37bf75d58dc6dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=201d13a3c31131f204f89d61… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jul 4 17:22:29 2019 +0200 mshtml: Fixed buffer size to WideCharToMultiByte. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 92c79b7..ff7c62b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -566,7 +566,7 @@ static const elem_type_info_t elem_type_infos[] = { static int strncmp_wa(LPCWSTR strw, const char *stra, size_t len) { WCHAR buf[512]; - size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, sizeof(buf)); + size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, ARRAY_SIZE(buf)); return wlen == len && memcmp(strw, buf, len * sizeof(WCHAR)); } @@ -580,7 +580,7 @@ static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) int len, prefix_len; CHAR buf[512]; - len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL)-1; + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, ARRAY_SIZE(buf), NULL, NULL)-1; prefix_len = lstrlenA(prefix); if(len < prefix_len) return FALSE;

1 0

Henri Verbeet : wined3d: Try harder to reuse the current context.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 64d41b3dec0635c56268be64d407ed9bfd8c0695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d41b3dec0635c56268be64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:03 2019 +0430 wined3d: Try harder to reuse the current context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +--- dlls/wined3d/swapchain.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 619b5ff..32cbc02 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4215,14 +4215,12 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context; - BOOL swapchain_texture; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); if (current_context && current_context->destroyed) current_context = NULL; - swapchain_texture = texture && texture->swapchain; if (!texture) { if (current_context @@ -4248,7 +4246,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { context = current_context; } - else if (swapchain_texture) + else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 69580ad..bf0c308 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -717,25 +717,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } -static void wined3d_swapchain_cs_init(void *object) -{ - struct wined3d_swapchain *swapchain = object; - struct wined3d_context *context; - - if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) - { - WARN("Failed to acquire context.\n"); - return; - } - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (!swapchain->desc.enable_auto_depth_stencil - || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) - FIXME("Add OpenGL context recreation support.\n"); - - context_release(context); -} - void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) { /* Subtract 1 for the implicit OpenGL latency. */ @@ -890,25 +871,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } - if (!(device->wined3d->flags & WINED3D_NO3D)) - { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) - { - ERR("Failed to create the context array.\n"); - hr = E_OUTOFMEMORY; - goto err; - } - - wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); - wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - - if (!swapchain->num_contexts) - { - hr = WINED3DERR_NOTAVAILABLE; - goto err; - } - } - if (swapchain->desc.backbuffer_count > 0) { if (!(swapchain->back_buffers = heap_calloc(swapchain->desc.backbuffer_count,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object ().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: d7fd641482eed80f85f194ac5261467208d95258 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fd641482eed80f85f194ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:02 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 58e757c..b167737 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -37,10 +37,10 @@ static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) return query->map_ptr[0] == query->map_ptr[1]; } -static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_create_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint buffer_object; GL_EXTCALL(glGenBuffers(1, &buffer_object)); @@ -75,6 +75,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, * instead of from the csmt-thread. */ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLsync tmp_sync; @@ -96,7 +97,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s } if (!query->buffer_object) - wined3d_query_create_buffer_object(context, query); + wined3d_query_create_buffer_object(context_gl, query); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 2e49b85f9719f9d517785a7e4ee24e91ac51f43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e49b85f9719f9d517785a7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:01 2019 +0430 wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/nvidia_texture_shader.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f4b0791..1cffbe4 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -30,9 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* Context activation for state handlers is done by the caller. */ -static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) +static void nvts_activate_dimensions(const struct wined3d_state *state, + unsigned int stage, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *texture; BOOL bumpmap = FALSE; @@ -41,11 +42,11 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st || state->texture_states[stage - 1][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP)) { bumpmap = TRUE; - context->texShaderBumpMap |= (1u << stage); + context_gl->c.texShaderBumpMap |= (1u << stage); } else { - context->texShaderBumpMap &= ~(1u << stage); + context_gl->c.texShaderBumpMap &= ~(1u << stage); } if ((texture = state->textures[stage])) @@ -550,13 +551,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (tex_used) { if (gl_info->supported[NV_TEXTURE_SHADER2]) - { - nvts_activate_dimensions(state, stage, context); - } + nvts_activate_dimensions(state, stage, context_gl); else - { texture_activate_dimensions(state->textures[stage], gl_info); - } } } @@ -580,7 +577,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (usesBump != usedBump) { wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); - nvts_activate_dimensions(state, stage + 1, context); + nvts_activate_dimensions(state, stage + 1, context_gl); wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } } @@ -620,7 +617,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; - nvts_activate_dimensions(state, sampler, context); + nvts_activate_dimensions(state, sampler, context_gl); } static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 14f1cc73e7a5e6b5a790d6bbe94e4179fb203821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14f1cc73e7a5e6b5a790d6bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:00 2019 +0430 wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c6b6b6..e8357f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct glsl_blitter_program *program; struct glsl_blitter_args args; struct wine_rb_entry *entry; @@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli colour_key = NULL; } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context_gl, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program().
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 48d710dce93aa26b26727c3430995985f08d43c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d710dce93aa26b26727c34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:45:59 2019 +0430 wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cd6bb6..0c6b6b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10089,12 +10089,11 @@ static void set_glsl_compute_shader_program(const struct wined3d_context_gl *con } /* Context activation is done by the caller. */ -static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, +static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader *pre_rasterization_shader; const struct ps_np2fixup_info *np2fixup_info = NULL; struct wined3d_shader *hshader, *dshader, *gshader; @@ -10114,7 +10113,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD attribs_map; struct wined3d_string_buffer *tmp_name; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) { vs_id = ctx_data->glsl_program->vs.id; vs_list = &ctx_data->glsl_program->vs.shader_entry; @@ -10128,7 +10127,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; - find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); + find_vs_compile_args(state, vshader, context_gl->c.stream_info.swizzle_map, &vs_compile_args, &context_gl->c); vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; } @@ -10137,20 +10136,20 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(context, state, &settings); + wined3d_ffp_get_vs_settings(&context_gl->c, state, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; } hshader = state->shader[WINED3D_SHADER_TYPE_HULL]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) { ds_id = ctx_data->glsl_program->ds.id; } @@ -10158,12 +10157,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ds_compile_args args; - find_ds_compile_args(state, dshader, &args, context); + find_ds_compile_args(state, dshader, &args, &context_gl->c); ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) { gs_id = ctx_data->glsl_program->gs.id; } @@ -10171,7 +10170,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct gs_compile_args args; - find_gs_compile_args(state, gshader, &args, context); + find_gs_compile_args(state, gshader, &args, &context_gl->c); gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } @@ -10181,7 +10180,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ps_id = 0; ps_list = NULL; } - else if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) + else if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry; @@ -10193,7 +10192,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ps_compile_args ps_compile_args; pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context); + find_ps_compile_args(state, pshader, context_gl->c.stream_info.position_transformed, + &ps_compile_args, &context_gl->c); ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; @@ -10204,7 +10204,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - gen_ffp_frag_op(context, state, &settings, FALSE); + gen_ffp_frag_op(&context_gl->c, state, &settings, FALSE); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; @@ -10490,7 +10490,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - shader_glsl_load_samplers(context, priv, program_id, NULL); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, NULL); } for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) @@ -10542,7 +10542,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_shader_program(context, state, priv, ctx_data); + set_glsl_shader_program(context_gl, state, priv, ctx_data); glsl_program = ctx_data->glsl_program; if (glsl_program)

1 0

Jacek Caban : kernel32: Terminate process in unhandled exception handler.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 4f1185d21eaf271d60004eef744ce027ee9b8a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1185d21eaf271d60004eef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 4 13:37:45 2019 +0200 kernel32: Terminate process in unhandled exception handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index dffc59a..3e33fa7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1260,7 +1260,7 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) } __EXCEPT(UnhandledExceptionFilter) { - TerminateThread( GetCurrentThread(), GetExceptionCode() ); + TerminateProcess( GetCurrentProcess(), GetExceptionCode() ); } __ENDTRY abort(); /* should not be reached */ diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 361513e..3f73f2e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -185,6 +185,8 @@ static void doCrash(int argc, char** argv) SetErrorMode( 0 ); SetUnhandledExceptionFilter( NULL ); + run_background_thread(); + if (argc >= 4) { crash_blackbox_t blackbox;

1 0

Jacek Caban : server: Fix debug event order in generate_startup_debug_events.
by Alexandre Julliard 04 Jul '19

04 Jul '19

Module: wine Branch: master Commit: 3fded30a10eb47beb48e5afdd10e8356e9a61fe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fded30a10eb47beb48e5afd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 4 13:37:38 2019 +0200 server: Fix debug event order in generate_startup_debug_events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 227949e..361513e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -290,7 +290,6 @@ static void process_attach_events(struct debugger_context *ctx) if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) /* Vista+ reports ntdll.dll before reporting threads */ { ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); - todo_wine ok(ctx->ev.u.LoadDll.lpBaseOfDll == ntdll, "The first reported DLL is not ntdll.dll\n"); next_event(ctx, 0); } @@ -302,7 +301,6 @@ static void process_attach_events(struct debugger_context *ctx) { next_event(ctx, 2000); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) - todo_wine_if(ctx->ev.u.LoadDll.lpBaseOfDll == ntdll) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); } while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT); ok(ctx->dll_cnt > 2, "dll_cnt = %d\n", ctx->dll_cnt); diff --git a/server/debugger.c b/server/debugger.c index bff813a..38fe788 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -516,22 +516,28 @@ void generate_startup_debug_events( struct process *process, client_ptr_t entry struct list *ptr; struct thread *thread, *first_thread = get_process_first_thread( process ); + generate_debug_event( first_thread, CREATE_PROCESS_DEBUG_EVENT, &entry ); + ptr = list_head( &process->dlls ); /* skip main module reported in create process event */ + + /* generate ntdll.dll load event */ + if (ptr && (ptr = list_next( &process->dlls, ptr ))) + { + struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); + generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll ); + } + /* generate creation events */ LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { - if (thread == first_thread) - generate_debug_event( thread, CREATE_PROCESS_DEBUG_EVENT, &entry ); - else + if (thread != first_thread) generate_debug_event( thread, CREATE_THREAD_DEBUG_EVENT, NULL ); } - /* generate dll events (in loading order, i.e. reverse list order) */ - ptr = list_tail( &process->dlls ); - while (ptr != list_head( &process->dlls )) + /* generate dll events (in loading order) */ + while (ptr && (ptr = list_next( &process->dlls, ptr ))) { struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll ); - ptr = list_prev( &process->dlls, ptr ); } }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

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 July 2019