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

Zebediah Figura : wined3d: Move the blend operation to wined3d_blend_state.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 936310585c533beb50188f4a5d1328983c2c10fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=936310585c533beb50188f4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:16 2020 -0500 wined3d: Move the blend operation to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 24 +++++++++++------------- include/wine/wined3d.h | 1 + 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 11265cf1b0..8193ec4cf4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -740,7 +740,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 4d5bd8d94e..693bb3df83 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -392,6 +392,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; wined3d_desc.src = desc->RenderTarget[0].SrcBlend; wined3d_desc.dst = desc->RenderTarget[0].DestBlend; + wined3d_desc.op = desc->RenderTarget[0].BlendOp; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d7175284cf..5bb9542891 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3584,6 +3584,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_ALPHABLENDENABLE: case WINED3D_RS_SRCBLEND: case WINED3D_RS_DESTBLEND: + case WINED3D_RS_BLENDOP: set_blend_state = TRUE; break; @@ -3657,6 +3658,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; desc.src = state->rs[WINED3D_RS_SRCBLEND]; desc.dst = state->rs[WINED3D_RS_DESTBLEND]; + desc.op = state->rs[WINED3D_RS_BLENDOP]; if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8de2945bf5..8999ab1696 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -390,11 +390,6 @@ static void state_ambient(struct wined3d_context *context, const struct wined3d_ checkGLcall("glLightModel for MODEL_AMBIENT"); } -static void state_blendop_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); -} - static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_blend_op op) { switch (op) @@ -418,12 +413,18 @@ static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_bl } } -static void state_blendop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blendop(const struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_blend_state *b = state->blend_state; GLenum blend_equation_alpha = GL_FUNC_ADD_EXT; GLenum blend_equation = GL_FUNC_ADD_EXT; + if (!gl_info->supported[WINED3D_GL_BLEND_EQUATION]) + { + WARN("Unsupported in local OpenGL implementation: glBlendEquation.\n"); + return; + } + /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ if (state->render_states[WINED3D_RS_BLENDOPALPHA] && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) @@ -432,7 +433,7 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ return; } - blend_equation = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOP]); + blend_equation = gl_blend_op(gl_info, b->desc.op); blend_equation_alpha = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOPALPHA]); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); @@ -559,9 +560,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); - /* Re-apply BLENDOP(ALPHA) because of a possible SEPARATEALPHABLENDENABLE change */ - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_BLENDOP))) - state_blendop(context, state, STATE_RENDER(WINED3D_RS_BLENDOPALPHA)); + blendop(state, gl_info); if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { @@ -4649,8 +4648,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite0 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5422,6 +5419,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, + {171, 171}, {174, 177}, {193, 193}, {195, 197}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3e43264a76..1bb8a8ee44 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2032,6 +2032,7 @@ struct wined3d_blend_state_desc BOOL enable; enum wined3d_blend src; enum wined3d_blend dst; + enum wined3d_blend_op op; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : wined3d: Move the source alpha blend function to wined3d_blend_state.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: fc740b872415caaab159cb4a8205c72eb2bc9f41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc740b872415caaab159cb4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:17 2020 -0500 wined3d: Move the source alpha blend function to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/state.c | 5 ++--- include/wine/wined3d.h | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8193ec4cf4..42d9ccc3bf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -741,7 +741,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 693bb3df83..231978b8a5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -393,6 +393,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.src = desc->RenderTarget[0].SrcBlend; wined3d_desc.dst = desc->RenderTarget[0].DestBlend; wined3d_desc.op = desc->RenderTarget[0].BlendOp; + wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5bb9542891..303122c2e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3585,6 +3585,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_SRCBLEND: case WINED3D_RS_DESTBLEND: case WINED3D_RS_BLENDOP: + case WINED3D_RS_SRCBLENDALPHA: set_blend_state = TRUE; break; @@ -3644,6 +3645,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (set_blend_state || changed->alpha_to_coverage + || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_SEPARATEALPHABLENDENABLE) || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_ADAPTIVETESS_Y)) { struct wined3d_blend_state *blend_state; @@ -3659,6 +3661,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.src = state->rs[WINED3D_RS_SRCBLEND]; desc.dst = state->rs[WINED3D_RS_DESTBLEND]; desc.op = state->rs[WINED3D_RS_BLENDOP]; + if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) + { + desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + } + else + { + desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8999ab1696..e0cbf82e14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,8 +573,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, - state->render_states[WINED3D_RS_SRCBLENDALPHA], + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); @@ -4503,7 +4502,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SRCBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, @@ -5423,6 +5421,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {193, 193}, {195, 197}, + {207, 207}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1bb8a8ee44..42dd078ca6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2033,6 +2033,7 @@ struct wined3d_blend_state_desc enum wined3d_blend src; enum wined3d_blend dst; enum wined3d_blend_op op; + enum wined3d_blend src_alpha; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : wined3d: Move the destination alpha blend function to wined3d_blend_state.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 30e44111fee91218a3ab3bbffe9cb2fae368e87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e44111fee91218a3ab3bbf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:18 2020 -0500 wined3d: Move the destination alpha blend function to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 3 +++ dlls/wined3d/state.c | 7 ++----- include/wine/wined3d.h | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 42d9ccc3bf..be1b6f6f00 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -741,7 +741,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); } wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 231978b8a5..aa94bc2569 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -394,6 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.dst = desc->RenderTarget[0].DestBlend; wined3d_desc.op = desc->RenderTarget[0].BlendOp; wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; + wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 303122c2e0..8ee7f8da34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3586,6 +3586,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_DESTBLEND: case WINED3D_RS_BLENDOP: case WINED3D_RS_SRCBLENDALPHA: + case WINED3D_RS_DESTBLENDALPHA: set_blend_state = TRUE; break; @@ -3664,10 +3665,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; } else { desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e0cbf82e14..17adf984c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,8 +573,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, - state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, b->desc.dst_alpha, rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); @@ -4502,8 +4501,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, @@ -5421,7 +5418,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {193, 193}, {195, 197}, - {207, 207}, + {207, 208}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42dd078ca6..aa1b30556b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc enum wined3d_blend dst; enum wined3d_blend_op op; enum wined3d_blend src_alpha; + enum wined3d_blend dst_alpha; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : wined3d: Move the alpha blend equation to wined3d_blend_state.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 29b2814a26df7f390dee30267112d0c14db3b79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b2814a26df7f390dee3026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 18:06:19 2020 -0500 wined3d: Move the alpha blend equation to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ------- dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 5 ++++- dlls/wined3d/state.c | 13 +++++-------- include/wine/wined3d.h | 1 + 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index be1b6f6f00..ab52fb1311 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -736,13 +736,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_device_set_blend_state(device->wined3d_device, blend_state_impl->wined3d_state, (const struct wined3d_color *)blend_factor); desc = &blend_state_impl->desc; - if (desc->RenderTarget[0].BlendEnable) - { - const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; - - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); - } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index aa94bc2569..3bd10dd547 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -395,6 +395,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.op = desc->RenderTarget[0].BlendOp; wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha; + wined3d_desc.op_alpha = desc->RenderTarget[0].BlendOpAlpha; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8ee7f8da34..d94b1e2f2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3585,8 +3585,10 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_SRCBLEND: case WINED3D_RS_DESTBLEND: case WINED3D_RS_BLENDOP: + case WINED3D_RS_SEPARATEALPHABLENDENABLE: case WINED3D_RS_SRCBLENDALPHA: case WINED3D_RS_DESTBLENDALPHA: + case WINED3D_RS_BLENDOPALPHA: set_blend_state = TRUE; break; @@ -3646,7 +3648,6 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (set_blend_state || changed->alpha_to_coverage - || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_SEPARATEALPHABLENDENABLE) || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_ADAPTIVETESS_Y)) { struct wined3d_blend_state *blend_state; @@ -3666,11 +3667,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; + desc.op_alpha = state->rs[WINED3D_RS_BLENDOPALPHA]; } else { desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; + desc.op_alpha = state->rs[WINED3D_RS_BLENDOP]; } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 17adf984c5..19f47f834e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -426,18 +426,17 @@ static void blendop(const struct wined3d_state *state, const struct wined3d_gl_i } /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ - if (state->render_states[WINED3D_RS_BLENDOPALPHA] - && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) + if (b->desc.op_alpha && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) { WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparate.\n"); return; } blend_equation = gl_blend_op(gl_info, b->desc.op); - blend_equation_alpha = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOPALPHA]); + blend_equation_alpha = gl_blend_op(gl_info, b->desc.op_alpha); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); - if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) + if (b->desc.op != b->desc.op_alpha) { GL_EXTCALL(glBlendEquationSeparate(blend_equation, blend_equation_alpha)); checkGLcall("glBlendEquationSeparate"); @@ -562,7 +561,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st blendop(state, gl_info); - if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) + if (b->desc.src != b->desc.src_alpha || b->desc.dst != b->desc.dst_alpha) { GLenum src_blend_alpha, dst_blend_alpha; @@ -4500,8 +4499,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, WINED3D_GL_EXT_NONE }, @@ -5418,7 +5415,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {193, 193}, {195, 197}, - {207, 208}, + {206, 209}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index aa1b30556b..9ec097ea5f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2035,6 +2035,7 @@ struct wined3d_blend_state_desc enum wined3d_blend_op op; enum wined3d_blend src_alpha; enum wined3d_blend dst_alpha; + enum wined3d_blend_op op_alpha; }; struct wined3d_rasterizer_state_desc

1 0

Zebediah Figura : d2d1: Support GUID_WICPixelFormat32bppPRGBA.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: ef0f2c7f00183ef16875cd5874c1b509e04a5a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef0f2c7f00183ef16875cd58… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 11:40:43 2020 -0500 d2d1: Support GUID_WICPixelFormat32bppPRGBA. Needed by Visio 2016. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 2 ++ dlls/d2d1/tests/d2d1.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index bc958e50a1..7ed57052b9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -527,6 +527,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW format_lookup[] = { {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, }; @@ -579,6 +580,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW switch (bitmap_desc.pixelFormat.format) { case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R8G8B8A8_UNORM: bpp = 4; break; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1d4db386ab..77899ccd6e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9341,6 +9341,77 @@ static void test_dpi(void) DestroyWindow(window); } +static void test_wic_bitmap_format(void) +{ + IWICImagingFactory *wic_factory; + IDXGISwapChain *swapchain; + D2D1_PIXEL_FORMAT format; + IWICBitmap *wic_bitmap; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Bitmap *bitmap; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + const WICPixelFormatGUID *wic; + D2D1_PIXEL_FORMAT d2d; + } + tests[] = + { + {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(hr == S_OK, "Failed to create WIC imaging factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + tests[i].wic, WICBitmapCacheOnDemand, &wic_bitmap); + ok(hr == S_OK, "%s: Failed to create WIC bitmap, hr %#x.\n", debugstr_guid(tests[i].wic), hr); + + hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap); + ok(hr == S_OK, "%s: Failed to create bitmap from WIC source, hr %#x.\n", debugstr_guid(tests[i].wic), hr); + + format = ID2D1Bitmap_GetPixelFormat(bitmap); + ok(format.format == tests[i].d2d.format, "%s: Got unexpected DXGI format %#x.\n", + debugstr_guid(tests[i].wic), format.format); + ok(format.alphaMode == tests[i].d2d.alphaMode, "%s: Got unexpected alpha mode %#x.\n", + debugstr_guid(tests[i].wic), format.alphaMode); + + ID2D1Bitmap_Release(bitmap); + IWICBitmap_Release(wic_bitmap); + } + + IWICImagingFactory_Release(wic_factory); + CoUninitialize(); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9390,6 +9461,7 @@ START_TEST(d2d1) queue_test(test_command_list); queue_test(test_max_bitmap_size); queue_test(test_dpi); + queue_test(test_wic_bitmap_format); run_queued_tests(); }

1 0

Gabriel Ivăncescu : jscript: Retrieve the proper 'this' object for bytecodes with named items.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: c2402a92ae1cb068ae871d5224b5b44381ccdd81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2402a92ae1cb068ae871d52… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 11 15:06:30 2020 +0200 jscript: Retrieve the proper 'this' object for bytecodes with named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 10 ++++++++-- dlls/jscript/tests/jscript.c | 3 --- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a627ea2be..db0863c902 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1237,8 +1237,14 @@ static HRESULT interp_this(script_ctx_t *ctx) TRACE("\n"); - if(!this_obj) - this_obj = lookup_global_host(ctx); + if(!this_obj) { + named_item_t *item = ctx->call_ctx->bytecode->named_item; + + if(item) + this_obj = (item->flags & SCRIPTITEM_CODEONLY) ? to_disp(item->script_obj) : item->disp; + else + this_obj = lookup_global_host(ctx); + } IDispatch_AddRef(this_obj); return stack_push(ctx, jsval_disp(this_obj)); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index ed56f8ce11..284390b860 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1252,7 +1252,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"visibleCodeItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == disp, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var); @@ -1413,7 +1412,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"visibleItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &visible_named_item, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var); @@ -1424,7 +1422,6 @@ static void test_named_items(void) SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, L"this", L"codeOnlyItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); - todo_wine ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == (IDispatch*)dispex2, "Unexpected 'this': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); VariantClear(&var);

1 0

Francois Gouget : kernel32/tests: Remove a 100 ms sleep in 'process exit' children.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 496100b9a734268599d3989de81174ac6feac8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=496100b9a734268599d3989d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 12 00:34:43 2020 +0100 kernel32/tests: Remove a 100 ms sleep in 'process exit' children. Such a short pause cannot serve any purpose and this shaves off 1 to 2 seconds of run time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1d426dd017..c5ff473d30 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4060,7 +4060,6 @@ START_TEST(process) } else if (!strcmp(myARGV[2], "exit")) { - Sleep(100); return; } else if (!strcmp(myARGV[2], "nested") && myARGC >= 4)

1 0

Zebediah Figura : wine.inf: Manually register qedit.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: ed0f2909ff10a55abeced50f9c3130b12daf320f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0f2909ff10a55abeced50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:08 2020 -0500 wine.inf: Manually register qedit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bca478e6d7..8267ef34dc 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2636,6 +2636,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,mshtml.dll,1 11,,msisip.dll,1 11,,qcap.dll,1 +11,,qedit.dll,1 11,,urlmon.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1

1 0

Zebediah Figura : qedit: Pass an IUnknown pointer to the object creation functions.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 98143898dbab4694cc968b4dd3ebc5eadd5186de URL: https://source.winehq.org/git/wine.git/?a=commit;h=98143898dbab4694cc968b4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:09 2020 -0500 qedit: Pass an IUnknown pointer to the object creation functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 16 ++++++++-------- dlls/qedit/mediadet.c | 3 ++- dlls/qedit/nullrenderer.c | 2 +- dlls/qedit/qedit_private.h | 8 ++++---- dlls/qedit/samplegrabber.c | 2 +- dlls/qedit/timeline.c | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 3797d96dcf..f4d1bbb061 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) typedef struct { IClassFactory IClassFactory_iface; LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -53,15 +53,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) struct object_creation_info { const CLSID *clsid; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); }; static const struct object_creation_info object_creation[] = { - { &CLSID_AMTimeline, AMTimeline_create }, - { &CLSID_MediaDet, MediaDet_create }, - { &CLSID_NullRenderer, NullRenderer_create }, - { &CLSID_SampleGrabber, SampleGrabber_create }, + {&CLSID_AMTimeline, timeline_create}, + {&CLSID_MediaDet, media_detector_create}, + {&CLSID_NullRenderer, null_renderer_create}, + {&CLSID_SampleGrabber, sample_grabber_create}, }; static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) @@ -109,7 +109,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); + hres = This->create_instance(pOuter, &punk); if (SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); @@ -186,7 +186,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + factory->create_instance = object_creation[i].create_instance; *ppv = &factory->IClassFactory_iface; return S_OK; diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d5c01aff6b..ecfafc44cb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -637,7 +637,8 @@ static const IMediaDetVtbl IMediaDet_VTable = MediaDet_EnterBitmapGrabMode, }; -HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { +HRESULT media_detector_create(IUnknown *pUnkOuter, IUnknown **ppv) +{ MediaDetImpl* obj = NULL; TRACE("(%p,%p)\n", pUnkOuter, ppv); diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 575ecea89b..cbebadfd18 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -62,7 +62,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_destroy = null_renderer_destroy, }; -HRESULT NullRenderer_create(IUnknown *outer, void **out) +HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { HRESULT hr; NullRendererImpl *pNullRenderer; diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 96f21bcb3b..7011c9f70d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -33,9 +33,9 @@ #include "dshow.h" #include "qedit.h" -HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT NullRenderer_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* __QEDIT_PRIVATE_INCLUDED__ */ diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9492620d04..7e29154762 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -634,7 +634,7 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = sample_grabber_source_DecideAllocator, }; -HRESULT SampleGrabber_create(IUnknown *outer, void **out) +HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) { SG_Impl* obj = NULL; ISeekingPassThru *passthru; diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 5d3fb461ff..a00ccdbefb 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -421,7 +421,7 @@ static const IAMTimelineVtbl IAMTimeline_VTable = Timeline_IAMTimeline_GetDefaultEffectB, }; -HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppv) +HRESULT timeline_create(IUnknown *pUnkOuter, IUnknown **ppv) { TimelineImpl* obj = NULL;

1 0

Zebediah Figura : quartz: Pass an IUnknown pointer to the object creation functions.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 56a6bc87acbbbee74fb6cd8e77ae61828e274c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a6bc87acbbbee74fb6cd8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:10 2020 -0500 quartz: Pass an IUnknown pointer to the object creation functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/dsoundrender.c | 5 ++--- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 10 +++------- dlls/quartz/filtermapper.c | 26 +++----------------------- dlls/quartz/main.c | 42 +++++++++++++++++++++--------------------- dlls/quartz/memallocator.c | 6 ++---- dlls/quartz/quartz_private.h | 27 +++++++++++++-------------- dlls/quartz/systemclock.c | 2 +- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 10 +++++----- 12 files changed, 56 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56a6bc87acbbbee74fb6…

1 0