March 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Store the framebuffer inline in struct wined3d_state.
by Matteo Bruni 26 Mar '20

26 Mar '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Set the auto_depth_stencil_view after resetting the state (so that I can get rid of old_fb). Thanks Henri! --- dlls/wined3d/arb_program_shader.c | 4 +-- dlls/wined3d/context.c | 10 +++--- dlls/wined3d/cs.c | 34 +++++++++---------- dlls/wined3d/device.c | 56 +++++++++++++++++-------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 ++-- dlls/wined3d/state.c | 30 ++++++++--------- dlls/wined3d/stateblock.c | 4 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d_private.h | 11 +++--- 11 files changed, 81 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c39694f441e..36c920dc6e0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -700,7 +700,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, str { const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; - UINT rt_height = state->fb->render_targets[0]->height; + UINT rt_height = state->fb.render_targets[0]->height; /* Load DirectX 9 float constants for pixel shader */ priv->highest_dirty_ps_const = shader_arb_load_constants_f(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, @@ -4607,7 +4607,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } else { - UINT rt_height = state->fb->render_targets[0]->height; + UINT rt_height = state->fb.render_targets[0]->height; shader_arb_ps_local_constants(compiled, context_gl, state, rt_height); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e92ce62662f..c6a1d762673 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3319,7 +3319,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, uint32_t rt_mask = 0, *cur_mask; unsigned int i; - if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != state->fb + if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != &state->fb || rt_count != gl_info->limits.buffers) { if (!have_framebuffer_attachment(rt_count, rts, dsv)) @@ -3431,7 +3431,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; + struct wined3d_rendertarget_view * const *rts = state->fb.render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int rt_mask, mask; @@ -3463,7 +3463,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; DWORD color_location = 0; DWORD *cur_mask; @@ -4230,7 +4230,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_state_entry *state_table = context->state_table; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; unsigned int i, base; WORD map; @@ -5121,7 +5121,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_draw_parameters *parameters) { BOOL emulation = FALSE, rasterizer_discard = FALSE; - const struct wined3d_fb_state *fb = state->fb; + const struct wined3d_fb_state *fb = &state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_rendertarget_view *dsv, *rtv; struct wined3d_stream_info si_emulated; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0ab6dd5b189..899d5a712e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->fb; + op->fb = &cs->state.fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -624,12 +624,12 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { - if ((view = state->fb->render_targets[i])) + if ((view = state->fb.render_targets[i])) wined3d_resource_acquire(view->resource); } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - view = state->fb->depth_stencil; + view = state->fb.depth_stencil; wined3d_resource_acquire(view->resource); } @@ -915,11 +915,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_release(state->fb->render_targets[i]->resource); + if (state->fb.render_targets[i]) + wined3d_resource_release(state->fb.render_targets[i]->resource); } - if (state->fb->depth_stencil) - wined3d_resource_release(state->fb->depth_stencil->resource); + if (state->fb.depth_stencil) + wined3d_resource_release(state->fb.depth_stencil->resource); release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); @@ -949,11 +949,11 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_acquire(state->fb->render_targets[i]->resource); + if (state->fb.render_targets[i]) + wined3d_resource_acquire(state->fb.render_targets[i]->resource); } - if (state->fb->depth_stencil) - wined3d_resource_acquire(state->fb->depth_stencil->resource); + if (state->fb.depth_stencil) + wined3d_resource_acquire(state->fb.depth_stencil->resource); acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); @@ -1103,8 +1103,8 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v BOOL prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; - prev = cs->state.fb->render_targets[op->view_idx]; - cs->fb.render_targets[op->view_idx] = op->view; + prev = cs->state.fb.render_targets[op->view_idx]; + cs->state.fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; @@ -1132,7 +1132,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; - if ((prev = cs->state.fb->depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) + if ((prev = cs->state.fb.depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture *prev_texture = texture_from_resource(prev->resource); @@ -1142,7 +1142,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); } - cs->fb.depth_stencil = op->view; + cs->state.fb.depth_stencil = op->view; if (!prev != !op->view) { @@ -1965,7 +1965,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2845,7 +2845,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0a1de79098..41554b93cfa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1070,7 +1070,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; - memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -1152,8 +1152,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); - memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); @@ -1171,11 +1169,11 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = device->fb.depth_stencil)) + if ((view = device->state.fb.depth_stencil)) { TRACE("Releasing depth/stencil view %p.\n", view); - device->fb.depth_stencil = NULL; + device->state.fb.depth_stencil = NULL; wined3d_rendertarget_view_decref(view); } @@ -1194,6 +1192,9 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; + + memset(&device->state, 0, sizeof(device->state)); + state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -1662,7 +1663,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) dst_resource = &dst_texture->resource; if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) return; - if (!(src_view = state->fb->depth_stencil)) + if (!(src_view = state->fb.depth_stencil)) return; wined3d_device_resolve_sub_resource(device, dst_resource, 0, @@ -3866,7 +3867,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - struct wined3d_rendertarget_view *ds = device->fb.depth_stencil; + struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; if (!ds) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); @@ -3875,8 +3876,8 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } else if (flags & WINED3DCLEAR_TARGET) { - if (ds->width < device->fb.render_targets[0]->width - || ds->height < device->fb.render_targets[0]->height) + if (ds->width < device->state.fb.render_targets[0]->width + || ds->height < device->state.fb.render_targets[0]->height) { WARN("Silently ignoring depth and target clear with mismatching sizes\n"); return WINED3D_OK; @@ -4226,8 +4227,8 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_STENCILENABLE]) { - struct wined3d_rendertarget_view *rt = device->fb.render_targets[0]; - struct wined3d_rendertarget_view *ds = device->fb.depth_stencil; + struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; + struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; if (ds && rt && (ds->width < rt->width || ds->height < rt->height)) { @@ -4732,14 +4733,14 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(co return NULL; } - return device->fb.render_targets[view_idx]; + return device->state.fb.render_targets[view_idx]; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) { TRACE("device %p.\n", device); - return device->fb.depth_stencil; + return device->state.fb.depth_stencil; } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, @@ -4804,13 +4805,13 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } - prev = device->fb.render_targets[view_idx]; + prev = device->state.fb.render_targets[view_idx]; if (view == prev) return WINED3D_OK; if (view) wined3d_rendertarget_view_incref(view); - device->fb.render_targets[view_idx] = view; + device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ @@ -4836,14 +4837,14 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - prev = device->fb.depth_stencil; + prev = device->state.fb.depth_stencil; if (prev == view) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); return WINED3D_OK; } - if ((device->fb.depth_stencil = view)) + if ((device->state.fb.depth_stencil = view)) wined3d_rendertarget_view_incref(view); wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) @@ -5308,8 +5309,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, ERR("Failed to create rendertarget view, hr %#x.\n", hr); return hr; } - - wined3d_device_set_depth_stencil_view(device, device->auto_depth_stencil_view); } if ((view = device->back_buffer_view)) @@ -5354,14 +5353,19 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->adapter->adapter_ops->adapter_uninit_3d(device); memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); } - else if ((view = device->back_buffer_view)) - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + else + { + if ((view = device->back_buffer_view)) + wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + if ((view = device->auto_depth_stencil_view)) + wined3d_device_set_depth_stencil_view(device, view); + } if (device->d3d_initialized && reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device); @@ -5456,13 +5460,13 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) { - if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) + if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); } - if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) + if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); } @@ -5604,7 +5608,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined return hr; } - state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->max_frame_latency = 3; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4272453c1b5..c7feff85efb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1734,7 +1734,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_vec4 correction_params = { /* Position is relative to the framebuffer, not the viewport. */ - context->render_offscreen ? 0.0f : (float)state->fb->render_targets[0]->height, + context->render_offscreen ? 0.0f : (float)state->fb.render_targets[0]->height, context->render_offscreen ? 1.0f : -1.0f, 0.0f, 0.0f, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 95db994ff30..41c48c0468b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3904,7 +3904,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb)) { static unsigned int warned = 0; @@ -4161,9 +4161,9 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; - for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { - struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; + struct wined3d_rendertarget_view *rtv = state->fb.render_targets[i]; if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b5d54db5b3b..d375122781b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -236,7 +236,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* No z test without depth stencil buffers */ - if (!state->fb->depth_stencil) + if (!state->fb.depth_stencil) { TRACE("No Z buffer - disabling depth test\n"); zenable = WINED3D_ZB_FALSE; @@ -556,7 +556,7 @@ static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined { const struct wined3d_blend_state *b = state->blend_state; - if (!state->fb->render_targets[index]) + if (!state->fb.render_targets[index]) return FALSE; if (!b->desc.rt[index].enable) @@ -566,7 +566,7 @@ static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined * With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ if (context->render_offscreen - && !(state->fb->render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + && !(state->fb.render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) return FALSE; return TRUE; @@ -610,7 +610,7 @@ static void blend(struct wined3d_context *context, const struct wined3d_state *s gl_info->gl_ops.gl.p_glEnable(GL_BLEND); checkGLcall("glEnable GL_BLEND"); - rt_format = state->fb->render_targets[0]->format; + rt_format = state->fb.render_targets[0]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); @@ -683,7 +683,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat return; } - rt_format = state->fb->render_targets[0]->format; + rt_format = state->fb.render_targets[0]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); @@ -766,7 +766,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat GL_EXTCALL(glEnablei(GL_BLEND, i)); checkGLcall("glEnablei GL_BLEND"); - rt_format = state->fb->render_targets[i]->format; + rt_format = state->fb.render_targets[i]->format; gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[i].src, b->desc.rt[i].dst, rt_format); gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[i].src_alpha, b->desc.rt[i].dst_alpha, rt_format); @@ -1061,7 +1061,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ GLint depthFail_back; /* No stencil test without a stencil buffer. */ - if (!state->fb->depth_stencil) + if (!state->fb.depth_stencil) { gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); @@ -1075,7 +1075,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); @@ -1157,7 +1157,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ static void state_stencilwrite2s_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; + DWORD mask = state->fb.depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); @@ -1171,7 +1171,7 @@ static void state_stencilwrite2s_ext(struct wined3d_context *context, const stru static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; + DWORD mask = state->fb.depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; gl_info->gl_ops.gl.p_glStencilMask(mask); @@ -1859,7 +1859,7 @@ static void depthbias(struct wined3d_context *context, const struct wined3d_stat if (scale_bias || const_bias.f) { - const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; + const struct wined3d_rendertarget_view *depth = state->fb.depth_stencil; float factor, units, scale, clamp; clamp = r ? r->desc.depth_bias_clamp : 0.0f; @@ -4092,8 +4092,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine static void get_viewports(struct wined3d_context *context, const struct wined3d_state *state, unsigned int viewport_count, struct wined3d_viewport *viewports) { - const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *depth_stencil = state->fb.depth_stencil; + const struct wined3d_rendertarget_view *target = state->fb.render_targets[0]; unsigned int width, height, i; for (i = 0; i < viewport_count; ++i) @@ -4342,7 +4342,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st if (!context->render_offscreen) { - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *target = state->fb.render_targets[0]; unsigned int width; wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); @@ -4474,7 +4474,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (needs_srgb_write(context->d3d_info, state, state->fb)) + if (needs_srgb_write(context->d3d_info, state, &state->fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b6c3169c4c6..48d133485b8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1851,13 +1851,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->streams[i].frequency = 1; } -void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; state->flags = flags; - state->fb = fb; for (i = 0; i < LIGHTMAP_SIZE; i++) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c5fd2879c05..e4cb5a27469 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -506,7 +506,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; - const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; + const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; struct wined3d_texture *logo_texture, *cursor_texture; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f3ed3b3cec5..7b08851fbf9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5493,7 +5493,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = flip ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; - enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? + enum wined3d_depth_buffer_type zenable = state->fb.depth_stencil ? state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? clip_control ? 1.0f : 2.0f : 0.0f; float z_offset = zenable ? clip_control ? 0.0f : -1.0f : 0.0f; @@ -6236,7 +6236,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb0551e2af0..e0e38ea660d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3184,7 +3184,7 @@ struct wined3d_light_state struct wined3d_state { DWORD flags; - const struct wined3d_fb_state *fb; + struct wined3d_fb_state fb; struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; @@ -3301,7 +3301,6 @@ struct wined3d_device struct wine_rb_tree samplers, rasterizer_states, blend_states; /* Render Target Support */ - struct wined3d_fb_state fb; struct wined3d_rendertarget_view *auto_depth_stencil_view; /* Cursor management */ @@ -3989,8 +3988,7 @@ HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD l const struct wined3d_light *params, struct wined3d_light_info **light_info) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id @@ -4033,7 +4031,6 @@ struct wined3d_cs { const struct wined3d_cs_ops *ops; struct wined3d_device *device; - struct wined3d_fb_state fb; struct wined3d_state state; HMODULE wined3d_module; HANDLE thread; @@ -5304,12 +5301,12 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (dsv = state->fb->depth_stencil) && dsv->resource == resource + && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; -- 2.24.1

2 9

[PATCH v2] wined3d: Add GTX 1660 SUPER as a card.
by Lukáš Horáček 26 Mar '20

26 Mar '20

Signed-off-by: Lukáš Horáček <flgx16(a)gmail.com> Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- v2: Added my real name. Corrected the PCI-ID, thanks to Liam Middlebrook. dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e269bf8138..33ba2c01ca 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1363,6 +1363,7 @@ cards_nvidia_binary[] = {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ + {"GTX 1660 SUPER", CARD_NVIDIA_GEFORCE_GTX1660SUPER}, /* GeForce 1600 - highend */ {"GTX 1650 SUPER", CARD_NVIDIA_GEFORCE_GTX1650SUPER}, /* GeForce 1600 - midend high */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42cc5c8f92..4c8d91e4de 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -430,6 +430,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1650SUPER,"NVIDIA GeForce GTX 1650 SUPER", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660SUPER,"NVIDIA GeForce GTX 1660 SUPER", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a300a0ea..4c684688df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2592,6 +2592,7 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, CARD_NVIDIA_GEFORCE_GTX1650SUPER= 0x2187, + CARD_NVIDIA_GEFORCE_GTX1660SUPER= 0x21c4, CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, -- 2.26.0

3 2

[PATCH] d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Paul Gofman 26 Mar '20

26 Mar '20

Fixes Epic Games Launcher crash with native ucrtbase.dll. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 9bee927a7b..e27984212b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -30,7 +30,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx + if (!stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6bec79740b..d51d8e4e60 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1024,7 +1024,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) + && !stricmp(e1->SemanticName, e2->SemanticName) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent) -- 2.25.1

2 1

[PATCH 1/6] ddraw: Factor out ddraw_surface_is_lost() function.
by Paul Gofman 26 Mar '20

26 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/surface.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 85c1ef4966..9d937414ae 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -33,6 +33,11 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawGammaControl_iface); } +static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) +{ + return surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -766,7 +771,7 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa TRACE("iface %p, caps %p, attachment %p.\n", iface, caps, surface); - if (IDirectDrawSurface7_IsLost(&head_surface->IDirectDrawSurface7_iface) != DD_OK) + if (ddraw_surface_is_lost(head_surface)) { WARN("Surface %p is lost.\n", head_surface); @@ -1291,7 +1296,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) return DDERR_NOTFLIPPABLE; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(dst_impl)) return DDERR_SURFACELOST; wined3d_mutex_lock(); @@ -3681,10 +3686,7 @@ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface) TRACE("iface %p.\n", iface); - if (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost) - return DDERR_SURFACELOST; - - return DD_OK; + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface4_IsLost(IDirectDrawSurface4 *iface) @@ -3693,7 +3695,7 @@ static HRESULT WINAPI ddraw_surface4_IsLost(IDirectDrawSurface4 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface3_IsLost(IDirectDrawSurface3 *iface) @@ -3702,7 +3704,7 @@ static HRESULT WINAPI ddraw_surface3_IsLost(IDirectDrawSurface3 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface2_IsLost(IDirectDrawSurface2 *iface) @@ -3711,7 +3713,7 @@ static HRESULT WINAPI ddraw_surface2_IsLost(IDirectDrawSurface2 *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) @@ -3720,7 +3722,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) TRACE("iface %p.\n", iface); - return ddraw_surface7_IsLost(&surface->IDirectDrawSurface7_iface); + return ddraw_surface_is_lost(surface) ? DDERR_SURFACELOST : DD_OK; } /***************************************************************************** @@ -4774,7 +4776,7 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir if (!palette) return DDERR_INVALIDPARAMS; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -4970,7 +4972,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -4985,7 +4987,7 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface4_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5000,7 +5002,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface3_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5015,7 +5017,7 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface2_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; @@ -5030,7 +5032,7 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); - if (IDirectDrawSurface_IsLost(iface) == DDERR_SURFACELOST) + if (ddraw_surface_is_lost(surface)) { WARN("Surface lost, returning DDERR_SURFACELOST.\n"); return DDERR_SURFACELOST; -- 2.25.1

3 12

[PATCH] mf: Fix a typo when setting event attribute.
by Nikolay Sivov 26 Mar '20

26 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 50f011dc52..2147f70cc8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1189,7 +1189,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo { IMFMediaEvent_SetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME, 0); IMFMediaEvent_SetUINT64(event, &MF_EVENT_PRESENTATION_TIME_OFFSET, 0); - IMFMediaEvent_GetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT, 0); + IMFMediaEvent_SetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT, 0); IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); -- 2.25.1

1 0

[PATCH] explorer: Add parsing '/cd' arg in explorer commandline
by Zhipeng Zhao 26 Mar '20

26 Mar '20

2 3

[PATCH] mf: Clean traces format for topology methods.
by Nikolay Sivov 26 Mar '20

26 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/topology.c | 166 ++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 67afba6ba4..0b4d734442 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -151,7 +151,7 @@ static HRESULT WINAPI topology_QueryInterface(IMFTopology *iface, REFIID riid, v { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFTopology) || IsEqualIID(riid, &IID_IMFAttributes) || @@ -175,7 +175,7 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) struct topology *topology = impl_from_IMFTopology(iface); ULONG refcount = InterlockedIncrement(&topology->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -285,7 +285,7 @@ static HRESULT WINAPI topology_GetItem(IMFTopology *iface, REFGUID key, PROPVARI { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetItem(topology->attributes, key, value); } @@ -294,7 +294,7 @@ static HRESULT WINAPI topology_GetItemType(IMFTopology *iface, REFGUID key, MF_A { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), type); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); return IMFAttributes_GetItemType(topology->attributes, key, type); } @@ -303,7 +303,7 @@ static HRESULT WINAPI topology_CompareItem(IMFTopology *iface, REFGUID key, REFP { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, result); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); return IMFAttributes_CompareItem(topology->attributes, key, value, result); } @@ -313,7 +313,7 @@ static HRESULT WINAPI topology_Compare(IMFTopology *iface, IMFAttributes *theirs { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p, %d, %p)\n", iface, theirs, type, result); + TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); return IMFAttributes_Compare(topology->attributes, theirs, type, result); } @@ -322,7 +322,7 @@ static HRESULT WINAPI topology_GetUINT32(IMFTopology *iface, REFGUID key, UINT32 { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetUINT32(topology->attributes, key, value); } @@ -331,7 +331,7 @@ static HRESULT WINAPI topology_GetUINT64(IMFTopology *iface, REFGUID key, UINT64 { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetUINT64(topology->attributes, key, value); } @@ -340,7 +340,7 @@ static HRESULT WINAPI topology_GetDouble(IMFTopology *iface, REFGUID key, double { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetDouble(topology->attributes, key, value); } @@ -349,7 +349,7 @@ static HRESULT WINAPI topology_GetGUID(IMFTopology *iface, REFGUID key, GUID *va { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetGUID(topology->attributes, key, value); } @@ -358,7 +358,7 @@ static HRESULT WINAPI topology_GetStringLength(IMFTopology *iface, REFGUID key, { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), length); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); return IMFAttributes_GetStringLength(topology->attributes, key, length); } @@ -368,7 +368,7 @@ static HRESULT WINAPI topology_GetString(IMFTopology *iface, REFGUID key, WCHAR { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), value, size, length); + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), value, size, length); return IMFAttributes_GetString(topology->attributes, key, value, size, length); } @@ -378,7 +378,7 @@ static HRESULT WINAPI topology_GetAllocatedString(IMFTopology *iface, REFGUID ke { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, length); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); return IMFAttributes_GetAllocatedString(topology->attributes, key, value, length); } @@ -387,7 +387,7 @@ static HRESULT WINAPI topology_GetBlobSize(IMFTopology *iface, REFGUID key, UINT { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), size); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); return IMFAttributes_GetBlobSize(topology->attributes, key, size); } @@ -397,7 +397,7 @@ static HRESULT WINAPI topology_GetBlob(IMFTopology *iface, REFGUID key, UINT8 *b { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); return IMFAttributes_GetBlob(topology->attributes, key, buf, bufsize, blobsize); } @@ -406,7 +406,7 @@ static HRESULT WINAPI topology_GetAllocatedBlob(IMFTopology *iface, REFGUID key, { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), buf, size); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); return IMFAttributes_GetAllocatedBlob(topology->attributes, key, buf, size); } @@ -415,7 +415,7 @@ static HRESULT WINAPI topology_GetUnknown(IMFTopology *iface, REFGUID key, REFII { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %s, %p)\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); return IMFAttributes_GetUnknown(topology->attributes, key, riid, ppv); } @@ -424,7 +424,7 @@ static HRESULT WINAPI topology_SetItem(IMFTopology *iface, REFGUID key, REFPROPV { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetItem(topology->attributes, key, value); } @@ -433,7 +433,7 @@ static HRESULT WINAPI topology_DeleteItem(IMFTopology *iface, REFGUID key) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s)\n", topology, debugstr_guid(key)); + TRACE("%p, %s.\n", topology, debugstr_guid(key)); return IMFAttributes_DeleteItem(topology->attributes, key); } @@ -442,7 +442,7 @@ static HRESULT WINAPI topology_DeleteAllItems(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_DeleteAllItems(topology->attributes); } @@ -451,7 +451,7 @@ static HRESULT WINAPI topology_SetUINT32(IMFTopology *iface, REFGUID key, UINT32 { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %d)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %d.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetUINT32(topology->attributes, key, value); } @@ -460,7 +460,7 @@ static HRESULT WINAPI topology_SetUINT64(IMFTopology *iface, REFGUID key, UINT64 { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); return IMFAttributes_SetUINT64(topology->attributes, key, value); } @@ -469,7 +469,7 @@ static HRESULT WINAPI topology_SetDouble(IMFTopology *iface, REFGUID key, double { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %f)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetDouble(topology->attributes, key, value); } @@ -478,7 +478,7 @@ static HRESULT WINAPI topology_SetGUID(IMFTopology *iface, REFGUID key, REFGUID { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); return IMFAttributes_SetGUID(topology->attributes, key, value); } @@ -487,7 +487,7 @@ static HRESULT WINAPI topology_SetString(IMFTopology *iface, REFGUID key, const { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_w(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); return IMFAttributes_SetString(topology->attributes, key, value); } @@ -496,7 +496,7 @@ static HRESULT WINAPI topology_SetBlob(IMFTopology *iface, REFGUID key, const UI { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p, %d)\n", iface, debugstr_guid(key), buf, size); + TRACE("%p, %s, %p, %d.\n", iface, debugstr_guid(key), buf, size); return IMFAttributes_SetBlob(topology->attributes, key, buf, size); } @@ -505,7 +505,7 @@ static HRESULT WINAPI topology_SetUnknown(IMFTopology *iface, REFGUID key, IUnkn { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), unknown); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), unknown); return IMFAttributes_SetUnknown(topology->attributes, key, unknown); } @@ -514,7 +514,7 @@ static HRESULT WINAPI topology_LockStore(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_LockStore(topology->attributes); } @@ -523,7 +523,7 @@ static HRESULT WINAPI topology_UnlockStore(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_UnlockStore(topology->attributes); } @@ -532,7 +532,7 @@ static HRESULT WINAPI topology_GetCount(IMFTopology *iface, UINT32 *count) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p)\n", iface, count); + TRACE("%p, %p.\n", iface, count); return IMFAttributes_GetCount(topology->attributes, count); } @@ -541,7 +541,7 @@ static HRESULT WINAPI topology_GetItemByIndex(IMFTopology *iface, UINT32 index, { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%u, %p, %p)\n", iface, index, key, value); + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); return IMFAttributes_GetItemByIndex(topology->attributes, index, key, value); } @@ -550,7 +550,7 @@ static HRESULT WINAPI topology_CopyAllItems(IMFTopology *iface, IMFAttributes *d { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p)\n", iface, dest); + TRACE("%p, %p.\n", iface, dest); return IMFAttributes_CopyAllItems(topology->attributes, dest); } @@ -559,7 +559,7 @@ static HRESULT WINAPI topology_GetTopologyID(IMFTopology *iface, TOPOID *id) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p)\n", iface, id); + TRACE("%p, %p.\n", iface, id); if (!id) return E_POINTER; @@ -792,7 +792,7 @@ static HRESULT WINAPI topology_GetSourceNodeCollection(IMFTopology *iface, IMFCo { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p)\n", iface, collection); + TRACE("%p, %p.\n", iface, collection); return topology_get_node_collection(topology, MF_TOPOLOGY_SOURCESTREAM_NODE, collection); } @@ -801,7 +801,7 @@ static HRESULT WINAPI topology_GetOutputNodeCollection(IMFTopology *iface, IMFCo { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%p)\n", iface, collection); + TRACE("%p, %p.\n", iface, collection); return topology_get_node_collection(topology, MF_TOPOLOGY_OUTPUT_NODE, collection); } @@ -881,7 +881,7 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) struct topology *object; HRESULT hr; - TRACE("(%p)\n", topology); + TRACE("%p.\n", topology); if (!topology) return E_POINTER; @@ -911,7 +911,7 @@ static HRESULT WINAPI topology_node_QueryInterface(IMFTopologyNode *iface, REFII { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFTopologyNode) || IsEqualIID(riid, &IID_IMFAttributes) || @@ -922,7 +922,7 @@ static HRESULT WINAPI topology_node_QueryInterface(IMFTopologyNode *iface, REFII return S_OK; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); *out = NULL; return E_NOINTERFACE; @@ -933,7 +933,7 @@ static ULONG WINAPI topology_node_AddRef(IMFTopologyNode *iface) struct topology_node *node = impl_from_IMFTopologyNode(iface); ULONG refcount = InterlockedIncrement(&node->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -944,7 +944,7 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) ULONG refcount = InterlockedDecrement(&node->refcount); unsigned int i; - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -974,7 +974,7 @@ static HRESULT WINAPI topology_node_GetItem(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetItem(node->attributes, key, value); } @@ -983,7 +983,7 @@ static HRESULT WINAPI topology_node_GetItemType(IMFTopologyNode *iface, REFGUID { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), type); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), type); return IMFAttributes_GetItemType(node->attributes, key, type); } @@ -992,7 +992,7 @@ static HRESULT WINAPI topology_node_CompareItem(IMFTopologyNode *iface, REFGUID { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, result); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, result); return IMFAttributes_CompareItem(node->attributes, key, value, result); } @@ -1002,7 +1002,7 @@ static HRESULT WINAPI topology_node_Compare(IMFTopologyNode *iface, IMFAttribute { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%p, %d, %p)\n", iface, theirs, type, result); + TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); return IMFAttributes_Compare(node->attributes, theirs, type, result); } @@ -1011,7 +1011,7 @@ static HRESULT WINAPI topology_node_GetUINT32(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetUINT32(node->attributes, key, value); } @@ -1020,7 +1020,7 @@ static HRESULT WINAPI topology_node_GetUINT64(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetUINT64(node->attributes, key, value); } @@ -1029,7 +1029,7 @@ static HRESULT WINAPI topology_node_GetDouble(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetDouble(node->attributes, key, value); } @@ -1038,7 +1038,7 @@ static HRESULT WINAPI topology_node_GetGUID(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_GetGUID(node->attributes, key, value); } @@ -1047,7 +1047,7 @@ static HRESULT WINAPI topology_node_GetStringLength(IMFTopologyNode *iface, REFG { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), length); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), length); return IMFAttributes_GetStringLength(node->attributes, key, length); } @@ -1057,7 +1057,7 @@ static HRESULT WINAPI topology_node_GetString(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), value, size, length); + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), value, size, length); return IMFAttributes_GetString(node->attributes, key, value, size, length); } @@ -1067,7 +1067,7 @@ static HRESULT WINAPI topology_node_GetAllocatedString(IMFTopologyNode *iface, R { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, length); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), value, length); return IMFAttributes_GetAllocatedString(node->attributes, key, value, length); } @@ -1076,7 +1076,7 @@ static HRESULT WINAPI topology_node_GetBlobSize(IMFTopologyNode *iface, REFGUID { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), size); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), size); return IMFAttributes_GetBlobSize(node->attributes, key, size); } @@ -1086,7 +1086,7 @@ static HRESULT WINAPI topology_node_GetBlob(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), buf, bufsize, blobsize); + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_guid(key), buf, bufsize, blobsize); return IMFAttributes_GetBlob(node->attributes, key, buf, bufsize, blobsize); } @@ -1095,7 +1095,7 @@ static HRESULT WINAPI topology_node_GetAllocatedBlob(IMFTopologyNode *iface, REF { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), buf, size); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_guid(key), buf, size); return IMFAttributes_GetAllocatedBlob(node->attributes, key, buf, size); } @@ -1104,7 +1104,7 @@ static HRESULT WINAPI topology_node_GetUnknown(IMFTopologyNode *iface, REFGUID k { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %s, %p)\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); return IMFAttributes_GetUnknown(node->attributes, key, riid, ppv); } @@ -1113,7 +1113,7 @@ static HRESULT WINAPI topology_node_SetItem(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetItem(node->attributes, key, value); } @@ -1122,7 +1122,7 @@ static HRESULT WINAPI topology_node_DeleteItem(IMFTopologyNode *iface, REFGUID k { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s)\n", iface, debugstr_guid(key)); + TRACE("%p, %s.\n", iface, debugstr_guid(key)); return IMFAttributes_DeleteItem(node->attributes, key); } @@ -1131,7 +1131,7 @@ static HRESULT WINAPI topology_node_DeleteAllItems(IMFTopologyNode *iface) { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_DeleteAllItems(node->attributes); } @@ -1140,7 +1140,7 @@ static HRESULT WINAPI topology_node_SetUINT32(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %d)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %d.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetUINT32(node->attributes, key, value); } @@ -1149,7 +1149,7 @@ static HRESULT WINAPI topology_node_SetUINT64(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); return IMFAttributes_SetUINT64(node->attributes, key, value); } @@ -1158,7 +1158,7 @@ static HRESULT WINAPI topology_node_SetDouble(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %f)\n", iface, debugstr_guid(key), value); + TRACE("%p, %s, %f.\n", iface, debugstr_guid(key), value); return IMFAttributes_SetDouble(node->attributes, key, value); } @@ -1167,7 +1167,7 @@ static HRESULT WINAPI topology_node_SetGUID(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_guid(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_guid(value)); return IMFAttributes_SetGUID(node->attributes, key, value); } @@ -1176,7 +1176,7 @@ static HRESULT WINAPI topology_node_SetString(IMFTopologyNode *iface, REFGUID ke { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_w(value)); + TRACE("%p, %s, %s.\n", iface, debugstr_guid(key), debugstr_w(value)); return IMFAttributes_SetString(node->attributes, key, value); } @@ -1185,7 +1185,7 @@ static HRESULT WINAPI topology_node_SetBlob(IMFTopologyNode *iface, REFGUID key, { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p, %d)\n", iface, debugstr_guid(key), buf, size); + TRACE("%p, %s, %p, %d.\n", iface, debugstr_guid(key), buf, size); return IMFAttributes_SetBlob(node->attributes, key, buf, size); } @@ -1194,7 +1194,7 @@ static HRESULT WINAPI topology_node_SetUnknown(IMFTopologyNode *iface, REFGUID k { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), unknown); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), unknown); return IMFAttributes_SetUnknown(node->attributes, key, unknown); } @@ -1203,7 +1203,7 @@ static HRESULT WINAPI topology_node_LockStore(IMFTopologyNode *iface) { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_LockStore(node->attributes); } @@ -1212,7 +1212,7 @@ static HRESULT WINAPI topology_node_UnlockStore(IMFTopologyNode *iface) { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); return IMFAttributes_UnlockStore(node->attributes); } @@ -1221,7 +1221,7 @@ static HRESULT WINAPI topology_node_GetCount(IMFTopologyNode *iface, UINT32 *cou { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%p)\n", iface, count); + TRACE("%p, %p.\n", iface, count); return IMFAttributes_GetCount(node->attributes, count); } @@ -1230,7 +1230,7 @@ static HRESULT WINAPI topology_node_GetItemByIndex(IMFTopologyNode *iface, UINT3 { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%u, %p, %p)\n", iface, index, key, value); + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); return IMFAttributes_GetItemByIndex(node->attributes, index, key, value); } @@ -1239,7 +1239,7 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%p)\n", iface, dest); + TRACE("%p, %p.\n", iface, dest); return IMFAttributes_CopyAllItems(node->attributes, dest); } @@ -1326,7 +1326,7 @@ static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOL { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%p)\n", iface, node_type); + TRACE("%p, %p.\n", iface, node_type); *node_type = node->node_type; @@ -1337,7 +1337,7 @@ static HRESULT WINAPI topology_node_GetTopoNodeID(IMFTopologyNode *iface, TOPOID { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%p)\n", iface, id); + TRACE("%p, %p.\n", iface, id); *id = node->id; @@ -1348,7 +1348,7 @@ static HRESULT WINAPI topology_node_SetTopoNodeID(IMFTopologyNode *iface, TOPOID { struct topology_node *node = impl_from_IMFTopologyNode(iface); - TRACE("(%p)->(%s)\n", iface, wine_dbgstr_longlong(id)); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(id)); node->id = id; @@ -1893,7 +1893,7 @@ static ULONG WINAPI topology_loader_AddRef(IMFTopoLoader *iface) struct topology_loader *loader = impl_from_IMFTopoLoader(iface); ULONG refcount = InterlockedIncrement(&loader->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -1903,7 +1903,7 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) struct topology_loader *loader = impl_from_IMFTopoLoader(iface); ULONG refcount = InterlockedDecrement(&loader->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -2022,7 +2022,7 @@ static ULONG WINAPI seq_source_AddRef(IMFSequencerSource *iface) struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); ULONG refcount = InterlockedIncrement(&seq_source->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -2032,7 +2032,7 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) struct seq_source *seq_source = impl_from_IMFSequencerSource(iface); ULONG refcount = InterlockedDecrement(&seq_source->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -2045,14 +2045,14 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) static HRESULT WINAPI seq_source_AppendTopology(IMFSequencerSource *iface, IMFTopology *topology, DWORD flags, MFSequencerElementId *id) { - FIXME("%p, %p, %x, %p\n", iface, topology, flags, id); + FIXME("%p, %p, %x, %p.\n", iface, topology, flags, id); return E_NOTIMPL; } static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSequencerElementId id) { - FIXME("%p, %#x\n", iface, id); + FIXME("%p, %#x.\n", iface, id); return E_NOTIMPL; } @@ -2060,7 +2060,7 @@ static HRESULT WINAPI seq_source_DeleteTopology(IMFSequencerSource *iface, MFSeq static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *iface, IMFPresentationDescriptor *descriptor, MFSequencerElementId *id, IMFTopology **topology) { - FIXME("%p, %p, %p, %p\n", iface, descriptor, id, topology); + FIXME("%p, %p, %p, %p.\n", iface, descriptor, id, topology); return E_NOTIMPL; } @@ -2068,14 +2068,14 @@ static HRESULT WINAPI seq_source_GetPresentationContext(IMFSequencerSource *ifac static HRESULT WINAPI seq_source_UpdateTopology(IMFSequencerSource *iface, MFSequencerElementId id, IMFTopology *topology) { - FIXME("%p, %#x, %p\n", iface, id, topology); + FIXME("%p, %#x, %p.\n", iface, id, topology); return E_NOTIMPL; } static HRESULT WINAPI seq_source_UpdateTopologyFlags(IMFSequencerSource *iface, MFSequencerElementId id, DWORD flags) { - FIXME("%p, %#x, %#x\n", iface, id, flags); + FIXME("%p, %#x, %#x.\n", iface, id, flags); return E_NOTIMPL; } @@ -2134,7 +2134,7 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** { struct seq_source *object; - TRACE("(%p, %p)\n", reserved, seq_source); + TRACE("%p, %p.\n", reserved, seq_source); if (!seq_source) return E_POINTER; -- 2.25.1

1 0

[PATCH v2] comctl32: Initialize early font metrics in edit control.
by Roman Pišl 26 Mar '20

26 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 37 +++++++++++++++--------- dlls/comctl32/tests/edit.c | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..e9e109244b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3724,6 +3724,24 @@ static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) return MAKELONG(left, right); } +static void set_font_metrics(EDITSTATE *es, DWORD *margins) +{ + TEXTMETRICW tm; + HDC dc; + HFONT old_font = 0; + dc = GetDC(es->hwndSelf); + if (es->font) + old_font = SelectObject(dc, es->font); + GetTextMetricsW(dc, &tm); + es->line_height = tm.tmHeight; + es->char_width = tm.tmAveCharWidth; + if (margins) + *margins = get_font_margins(dc, &tm); + if (es->font) + SelectObject(dc, old_font); + ReleaseDC(es->hwndSelf, dc); +} + /********************************************************************* * * WM_SETFONT @@ -3735,24 +3753,12 @@ static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) */ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) { - TEXTMETRICW tm; - HDC dc; - HFONT old_font = 0; RECT clientRect; DWORD margins; es->font = font; EDIT_InvalidateUniscribeData(es); - dc = GetDC(es->hwndSelf); - if (font) - old_font = SelectObject(dc, font); - GetTextMetricsW(dc, &tm); - es->line_height = tm.tmHeight; - es->char_width = tm.tmAveCharWidth; - margins = get_font_margins(dc, &tm); - if (font) - SelectObject(dc, old_font); - ReleaseDC(es->hwndSelf, dc); + set_font_metrics(es, &margins); /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); @@ -4488,6 +4494,11 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) else if (es->style & WS_BORDER) SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); + /* + * Initialize font metrics - line_height and char_width so that + * early messages before WM_CREATE don't lead to division by zero. + */ + set_font_metrics(es, NULL); return TRUE; cleanup: diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..3bfbee4ddd 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,64 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + return result; + + case WM_CREATE: + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_early_messages(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3451,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_early_messages(); test_margins(); test_margins_font_change(); test_text_position(); -- 2.20.1

1 0

[PATCH] ucrtbase: Set invalid_parameter_handler once.
by Piotr Caban 26 Mar '20

26 Mar '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 9 +++------ dlls/ucrtbase/tests/string.c | 27 +++------------------------ 2 files changed, 6 insertions(+), 30 deletions(-)

1 0

[PATCH] comctl32: Initialize early some edit control properties.
by Roman Pišl 26 Mar '20

26 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19239 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 2538eda4b6..6793a9818b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4489,6 +4489,14 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) else if (es->style & WS_BORDER) SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); + /* + * To initialize some final structure members, we call some helper + * functions. However, since the EDITSTATE is not consistent (i.e. + * not fully initialized), we should be very careful which + * functions can be called, and in what order. + */ + EDIT_WM_SetFont(es, 0, FALSE); + return TRUE; cleanup: @@ -4514,15 +4522,6 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, const WCHAR *name) TRACE("%s\n", debugstr_w(name)); - /* - * To initialize some final structure members, we call some helper - * functions. However, since the EDITSTATE is not consistent (i.e. - * not fully initialized), we should be very careful which - * functions can be called, and in what order. - */ - EDIT_WM_SetFont(es, 0, FALSE); - EDIT_EM_EmptyUndoBuffer(es); - /* We need to calculate the format rect (applications may send EM_SETMARGINS before the control gets visible) */ GetClientRect(es->hwndSelf, &clientRect); -- 2.20.1

2 4