November 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSSetScissorRects().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: d42714814dfcde422f772344e9e7dd55628de885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42714814dfcde422f772344e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:24 2015 +0100 d3d11: Implement d3d11_immediate_context_RSSetScissorRects(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5e9e26d..936fd36 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -539,7 +539,19 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext *iface, UINT rect_count, const D3D11_RECT *rects) { - FIXME("iface %p, rect_count %u, rects %p stub!\n", iface, rect_count, rects); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); + + if (rect_count > 1) + FIXME("Multiple scissor rects not implemented.\n"); + + if (!rect_count) + return; + + wined3d_mutex_lock(); + wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSSetState().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 95998504bd397a585df32b2d23dcf5f5cb0cb733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95998504bd397a585df32b2d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:25 2015 +0100 d3d11: Implement d3d11_immediate_context_RSSetState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 69 +++++++++++++++++++++++++--------------------- dlls/d3d11/state.c | 9 ++++++ 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index fb3bb45..d99a18a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -332,6 +332,7 @@ struct d3d_rasterizer_state HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D11SamplerState, ID3D10SamplerState */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 936fd36..f276eaa 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -501,7 +501,40 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceContext *iface, ID3D11RasterizerState *rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + const D3D11_RASTERIZER_DESC *desc; + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + wined3d_mutex_lock(); + if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); + wined3d_mutex_unlock(); + return; + } + + desc = &device->rasterizer_state->desc; + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); + /* glFrontFace() */ + if (desc->FrontCounterClockwise) + FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); + /* OpenGL style depth bias. */ + if (desc->DepthBias || desc->SlopeScaledDepthBias) + FIXME("Ignoring depth bias.\n"); + /* GL_DEPTH_CLAMP */ + if (!desc->DepthClipEnable) + FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_ANTIALIASEDLINEENABLE, desc->AntialiasedLineEnable); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext *iface, @@ -2504,39 +2537,13 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D10RasterizerState *rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - const D3D11_RASTERIZER_DESC *desc; + struct d3d_rasterizer_state *rasterizer_state_object; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - wined3d_mutex_lock(); - if (!(device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state))) - { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); - wined3d_mutex_unlock(); - return; - } - - desc = &device->rasterizer_state->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); - /* glFrontFace() */ - if (desc->FrontCounterClockwise) - FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); - /* OpenGL style depth bias. */ - if (desc->DepthBias || desc->SlopeScaledDepthBias) - FIXME("Ignoring depth bias.\n"); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ANTIALIASEDLINEENABLE, desc->AntialiasedLineEnable); - wined3d_mutex_unlock(); + rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); + d3d11_immediate_context_RSSetState(&device->immediate_context.ID3D11DeviceContext_iface, + rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 502ed9a..8c7b752 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -863,6 +863,15 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d return S_OK; } +struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_rasterizer_state_vtbl); + + return impl_from_ID3D11RasterizerState(iface); +} + struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { if (!iface)

1 0

Józef Kucia : d3d11/tests: Port test_scissor() from d3d10core.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 6e22a5d69fdaab0453c77247a8c25702b1956a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e22a5d69fdaab0453c77247a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:26 2015 +0100 d3d11/tests: Port test_scissor() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e22a5d69fdaab0453c77…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMSetBlendState().
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: f1ca5038b2b7bea4d24556e4ed7348880dc5e1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ca5038b2b7bea4d24556e4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:27 2015 +0100 d3d11: Implement d3d11_immediate_context_OMSetBlendState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 110 ++++++++++++++++++++++++--------------------- dlls/d3d11/state.c | 9 ++++ 3 files changed, 69 insertions(+), 51 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index d99a18a..2ac6129 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -297,6 +297,7 @@ struct d3d_blend_state HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D11DepthStencilState, ID3D10DepthStencilState */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f276eaa..566cd16 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -452,8 +452,62 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + const D3D11_BLEND_DESC *desc; + + TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + + if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) + FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); + + wined3d_mutex_lock(); + memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); + if (!(device->blend_state = unsafe_impl_from_ID3D11BlendState(blend_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE, D3D11_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE1, D3D11_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE2, D3D11_COLOR_WRITE_ENABLE_ALL); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE3, D3D11_COLOR_WRITE_ENABLE_ALL); + wined3d_mutex_unlock(); + return; + } + + desc = &device->blend_state->desc; + /* glSampleCoverage() */ + if (desc->AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + FIXME("Per-rendertarget blend not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, + desc->RenderTarget[0].BlendEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->RenderTarget[0].SrcBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->RenderTarget[0].DestBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->RenderTarget[0].BlendOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, + desc->RenderTarget[0].SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, + desc->RenderTarget[0].DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, + desc->RenderTarget[0].BlendOpAlpha); + FIXME("Color mask > 3 not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE1, desc->RenderTarget[1].RenderTargetWriteMask); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE2, desc->RenderTarget[2].RenderTargetWriteMask); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_COLORWRITEENABLE3, desc->RenderTarget[3].RenderTargetWriteMask); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, @@ -2436,60 +2490,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); - const D3D11_BLEND_DESC *desc; + struct d3d_blend_state *blend_state_object; TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); - if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) - FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", - blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); - wined3d_mutex_lock(); - memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); - if (!(device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state))) - { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE, D3D10_COLOR_WRITE_ENABLE_ALL); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE1, D3D10_COLOR_WRITE_ENABLE_ALL); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE2, D3D10_COLOR_WRITE_ENABLE_ALL); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE3, D3D10_COLOR_WRITE_ENABLE_ALL); - wined3d_mutex_unlock(); - return; - } - - desc = &device->blend_state->desc; - /* glSampleCoverage() */ - if (desc->AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - FIXME("Per-rendertarget blend not implemented.\n"); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, - desc->RenderTarget[0].BlendEnable); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->RenderTarget[0].SrcBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->RenderTarget[0].DestBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->RenderTarget[0].BlendOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, - desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, - desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, - desc->RenderTarget[0].BlendOpAlpha); - FIXME("Color mask > 3 not implemented.\n"); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE1, desc->RenderTarget[1].RenderTargetWriteMask); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE2, desc->RenderTarget[2].RenderTargetWriteMask); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_COLORWRITEENABLE3, desc->RenderTarget[3].RenderTargetWriteMask); - wined3d_mutex_unlock(); + blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); + d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + blend_state_object ? &blend_state_object->ID3D11BlendState_iface : NULL, blend_factor, sample_mask); } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 8c7b752..b412ed6 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -313,6 +313,15 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d return S_OK; } +struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_blend_state_vtbl); + + return impl_from_ID3D11BlendState(iface); +} + struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) { if (!iface)

1 0

Józef Kucia : d3d11/tests: Port test_blend() from d3d10core.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: c3e48c9b190b5f02a2624d27918fdb97d36e05bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e48c9b190b5f02a2624d279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:28 2015 +0100 d3d11/tests: Port test_blend() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e48c9b190b5f02a2624…

1 0

Martin Storsjo : vcruntime140: Implement __vcrt_InitializeCriticalSectionEx.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 36728f8b9ea3cd4d8c8efabb8cd8c60eafc16b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36728f8b9ea3cd4d8c8efabb8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:20:48 2015 +0200 vcruntime140: Implement __vcrt_InitializeCriticalSectionEx. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/misc.c | 10 ++++++++++ dlls/vcruntime140/vcruntime140.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index 887c1b0..86101a9 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -37,3 +37,13 @@ void CDECL __telemetry_main_return_trigger(HINSTANCE hinst) { FIXME("(%p)\n", hinst); } + +/********************************************************************* + * __vcrtInitializeCriticalSectionEx + */ +BOOL CDECL __vcrt_InitializeCriticalSectionEx( + CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) +{ + TRACE("(%p %x %x)\n", cs, spin_count, flags); + return InitializeCriticalSectionEx(cs, spin_count, flags); +} diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 0c5ecc9..4631073 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -51,7 +51,7 @@ @ stub __uncaught_exceptions @ stub __vcrt_GetModuleFileNameW @ stub __vcrt_GetModuleHandleW -@ stub __vcrt_InitializeCriticalSectionEx +@ cdecl __vcrt_InitializeCriticalSectionEx(ptr long long) @ stub __vcrt_LoadLibraryExW @ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2

1 0

Jactry Zeng : riched20: Set pStream->written in ME_StreamOutFlush.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: dc6b2853f512e3193aebcf0606c67043954255eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6b2853f512e3193aebcf060… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 6 14:18:10 2015 +0800 riched20: Set pStream->written in ME_StreamOutFlush. Superseded patch 115907. ChangeLog: - Add tests. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 34 ++++++++++++++++++++++++---------- dlls/riched20/writer.c | 2 ++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4705dd6..da9671b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3307,6 +3307,8 @@ static void test_ES_PASSWORD(void) DestroyWindow(hwndRichEdit); } +LONG streamout_written = 0; + static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, @@ -3318,6 +3320,7 @@ static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, memcpy(*str, pbBuff, *pcb); *str += *pcb; } + streamout_written = *pcb; return 0; } @@ -3442,6 +3445,7 @@ static void test_EM_STREAMOUT(void) EDITSTREAM es; char buf[1024] = {0}; char * p; + LRESULT result; const char * TestItem1 = "TestSomeText"; const char * TestItem2 = "TestSomeText\r"; @@ -3453,24 +3457,28 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); r = strlen(buf); ok(r == 12, "streamed text length is %d, expecting 12\n", r); ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); /* RTF mode writes the final end of para \r if it's part of the selection */ p = buf; - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, 12); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 0, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; @@ -3478,7 +3486,8 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); r = strlen(buf); /* Here again, \r gets converted to \r\n, like WM_GETTEXT */ ok(r == 14, "streamed text length is %d, expecting 14\n", r); @@ -3487,16 +3496,19 @@ static void test_EM_STREAMOUT(void) /* And again RTF mode writes the final end of para \r if it's part of the selection */ p = buf; - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok (count_pars(buf) == 2, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, 13); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 1, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); p = buf; SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); ok (count_pars(buf) == 2, "got %s\n", buf); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; @@ -3504,7 +3516,8 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_WM_SETTEXT_esCallback; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + ok(result == streamout_written, "got %ld expected %d\n", result, streamout_written); r = strlen(buf); ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, @@ -3516,11 +3529,12 @@ static void test_EM_STREAMOUT(void) es.dwError = 0; es.pfnCallback = test_esCallback_written_1; memset(buf, 0, sizeof(buf)); - SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + result = SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); r = strlen(buf); ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, "streamed text different, got %s\n", buf); + ok(result == 0, "got %ld expected 0\n", result); DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 2c7386a..76cf5d7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -62,6 +62,8 @@ ME_StreamOutFlush(ME_OutStream *pStream) return FALSE; /* Don't resend partial chunks if nWritten < pStream->pos */ } + if (nWritten == pStream->pos) + pStream->written += nWritten; pStream->pos = 0; return TRUE; }

1 0

Jactry Zeng : riched20: Make paragraph in make_para independently.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: f8e73e370d3389cf18de3b48d53c0229bf482a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e73e370d3389cf18de3b48d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 6 17:34:37 2015 +0800 riched20: Make paragraph in make_para independently. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/list.c | 7 ------- dlls/riched20/para.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 10732e5..c57e526 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -179,13 +179,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) ZeroMemory(item, sizeof(ME_DisplayItem)); item->type = type; item->prev = item->next = NULL; - if (type == diParagraph) - { - item->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - ME_SetDefaultParaFormat(item->member.para.pFmt); - item->member.para.nFlags = MEPF_REWRAP; - } - return item; } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8cf3d24..c068d84 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,6 +23,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); +static ME_DisplayItem *make_para(ME_TextEditor *editor) +{ + ME_DisplayItem *item = ME_MakeDI(diParagraph); + + item->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); + ME_SetDefaultParaFormat(item->member.para.pFmt); + item->member.para.nFlags = MEPF_REWRAP; + return item; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -30,7 +40,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; - ME_DisplayItem *para = ME_MakeDI(diParagraph); + ME_DisplayItem *para = make_para(editor); ME_DisplayItem *run; ME_Style *style; int eol_len; @@ -196,7 +206,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, { ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; - ME_DisplayItem *new_para = ME_MakeDI(diParagraph); + ME_DisplayItem *new_para = make_para(editor); ME_DisplayItem *end_run; int ofs, i; ME_DisplayItem *pp;

1 0

Jactry Zeng : riched20: Implement alignment styles support.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 6401ab45c0a45f328dcf364519553f20a360e672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6401ab45c0a45f328dcf36451… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 6 17:35:35 2015 +0800 riched20: Implement alignment styles support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 17 +++++++---- dlls/riched20/editor.h | 4 +-- dlls/riched20/editstr.h | 1 + dlls/riched20/para.c | 6 ++-- dlls/riched20/tests/editor.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txthost.c | 2 +- dlls/riched20/txtsrv.c | 2 +- 8 files changed, 91 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6401ab45c0a45f328dcf3…

1 0

Alex Henrie : user32: Turn magic values into static constants.
by Alexandre Julliard 06 Nov '15

06 Nov '15

Module: wine Branch: master Commit: 4a3065c5d72bae0e62da0e391bff9c2d9717d366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3065c5d72bae0e62da0e391… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 5 21:00:40 2015 -0700 user32: Turn magic values into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 2 +- dlls/user32/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index db479a8..890d154 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -201,7 +201,7 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) /* retrieve the button text; returned buffer must be freed by caller */ static inline WCHAR *get_button_text( HWND hwnd ) { - INT len = 512; + static const INT len = 512; WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); return buffer; diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dfd72e8..4570073 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2883,7 +2883,7 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) */ static int calc_min_set_margin_size(HDC dc, INT left, INT right) { - WCHAR magic_string[] = {'\'','*','*','\'', 0}; + static const WCHAR magic_string[] = {'\'','*','*','\'', 0}; SIZE sz; GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz);

1 0