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

Zebediah Figura : wined3d: Move the constant depth bias to wined3d_rasterizer_state.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 327d1792dcae470f58004d05c0c88df9ce0d9b9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=327d1792dcae470f58004d05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:34 2020 -0600 wined3d: Move the constant depth bias to wined3d_rasterizer_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 | 8 -------- dlls/d3d11/state.c | 1 + dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 3 +++ dlls/wined3d/state.c | 27 ++++++++++++--------------- include/wine/wined3d.h | 1 + 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0e46816246..59e3ab25af 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -929,11 +929,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; - union - { - DWORD d; - float f; - } const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -941,7 +936,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); 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); @@ -952,8 +946,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - const_bias.f = desc->DepthBias; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); 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, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 4d56f7dc75..c1aaa094e0 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1079,6 +1079,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.fill_mode = desc->FillMode; wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_bias = desc->DepthBias; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; wined3d_desc.depth_clip = desc->DepthClipEnable; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ec17b59d71..ac518cae04 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1150,12 +1150,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_ZENABLE)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + device_invalidate_state(device, STATE_RASTERIZER); } else if (prev) { if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + device_invalidate_state(device, STATE_RASTERIZER); if (prev->format->stencil_size != op->view->format->stencil_size) device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e727242f4..50a0a740bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3601,6 +3601,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_FILLMODE: case WINED3D_RS_CULLMODE: case WINED3D_RS_SLOPESCALEDEPTHBIAS: + case WINED3D_RS_DEPTHBIAS: set_rasterizer_state = TRUE; break; @@ -3625,6 +3626,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, memset(&desc, 0, sizeof(desc)); desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; + bias.d = state->rs[WINED3D_RS_DEPTHBIAS]; + desc.depth_bias = bias.f; bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; desc.scale_bias = bias.f; desc.depth_clip = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 85bd1e24a3..4d5455e19b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1752,25 +1752,25 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ * * Note that SLOPESCALEDEPTHBIAS is a scaling factor for the depth slope, and * doesn't need to be scaled to account for GL vs D3D differences. */ -static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void depthbias(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_rasterizer_state *r = state->rasterizer_state; float scale_bias = r ? r->desc.scale_bias : 0.0f; + union + { + DWORD d; + float f; + } const_bias; - if (scale_bias || state->render_states[WINED3D_RS_DEPTHBIAS]) + const_bias.f = r ? r->desc.depth_bias : 0.0f; + + if (scale_bias || const_bias.f) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; float factor, units, scale, clamp; - union - { - DWORD d; - float f; - } const_bias; - clamp = r ? r->desc.depth_bias_clamp : 0.0f; - const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) { @@ -4331,8 +4331,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) - state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + depthbias(context, state); fillmode(r, gl_info); cullmode(r, gl_info); depth_clip(r, gl_info); @@ -4348,8 +4347,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) - state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + depthbias(context, state); fillmode(r, gl_info); cullmode(r, gl_info); depth_clip(r, gl_info); @@ -4669,7 +4667,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, @@ -5438,7 +5435,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {175, 175}, {177, 177}, {193, 193}, - {196, 197}, + {195, 197}, { 0, 0}, }; static const DWORD simple_states[] = diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6fc3a1aaa8..85d7885f49 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2036,6 +2036,7 @@ struct wined3d_rasterizer_state_desc enum wined3d_fill_mode fill_mode; enum wined3d_cull cull_mode; BOOL front_ccw; + float depth_bias; float depth_bias_clamp; float scale_bias; BOOL depth_clip;

1 0

Zebediah Figura : wined3d: Move the line antialias state to wined3d_rasterizer_state.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 8ddf4e20a53fcc6b37468d30b69b657f14b51ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ddf4e20a53fcc6b37468d30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:36 2020 -0600 wined3d: Move the line antialias state to wined3d_rasterizer_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 | 3 --- dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 10 +++++----- include/wine/wined3d.h | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 82292662e4..555d998da2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -937,7 +937,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); 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; } @@ -946,8 +945,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon desc = &rasterizer_state_impl->desc; 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(); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 7402ff8ce8..dd2eb6306e 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1084,6 +1084,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.scissor = desc->ScissorEnable; + wined3d_desc.line_antialias = desc->AntialiasedLineEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13b3348c04..bcad597178 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3603,6 +3603,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_SLOPESCALEDEPTHBIAS: case WINED3D_RS_DEPTHBIAS: case WINED3D_RS_SCISSORTESTENABLE: + case WINED3D_RS_ANTIALIASEDLINEENABLE: set_rasterizer_state = TRUE; break; @@ -3633,6 +3634,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.scale_bias = bias.f; desc.depth_clip = TRUE; desc.scissor = state->rs[WINED3D_RS_SCISSORTESTENABLE]; + desc.line_antialias = state->rs[WINED3D_RS_ANTIALIASEDLINEENABLE]; if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 53daca8d52..ca59eba1d7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1707,9 +1707,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] - || state->render_states[WINED3D_RS_ANTIALIASEDLINEENABLE]) + if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4334,6 +4334,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); + state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4351,6 +4352,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); + state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4511,7 +4513,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_DESTBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), state_blend }, 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_ANTIALIASEDLINEENABLE), { STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLENDALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, @@ -5431,8 +5432,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, - {174, 175}, - {177, 177}, + {174, 177}, {193, 193}, {195, 197}, { 0, 0}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 211e9d37d0..7691064f6e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2041,6 +2041,7 @@ struct wined3d_rasterizer_state_desc float scale_bias; BOOL depth_clip; BOOL scissor; + BOOL line_antialias; }; struct wined3d_sampler_desc

1 0

Ziqing Hui : comctl32/imagelist: Support flag ILS_SATURATE for ImageList_DrawIndirect().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: d6305e1bdb3bf0c0918d717c8567fee8b9673522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6305e1bdb3bf0c0918d717c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 18:00:39 2020 +0800 comctl32/imagelist: Support flag ILS_SATURATE for ImageList_DrawIndirect(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 24 ++++++++++++++++++------ dlls/comctl32/tests/imagelist.c | 1 - 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3cf7cc8c7f..14a17c2717 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1242,7 +1242,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, - UINT style, COLORREF blend_col, BOOL has_alpha ) + UINT style, COLORREF blend_col, BOOL has_alpha, BOOL grayscale ) { BOOL ret = FALSE; HDC hdc; @@ -1293,6 +1293,18 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } + if (grayscale) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + { + DWORD gray = (((*ptr & 0x00ff0000) >> 16) * 299 + + ((*ptr & 0x0000ff00) >> 8) * 587 + + ((*ptr & 0x000000ff) >> 0) * 114 + 500) / 1000; + if (has_alpha) gray = gray * (*ptr >> 24) / 255; + *ptr = (*ptr & 0xff000000)| (gray << 16) | (gray << 8) | gray; + } + } + if (has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ @@ -1422,7 +1434,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); - if (!bMask && (has_alpha || (fState & ILS_ALPHA))) + if (!bMask && (has_alpha || (fState & ILS_ALPHA) || (fState & ILS_SATURATE))) { COLORREF colour, blend_col = CLR_NONE; BLENDFUNCTION func; @@ -1441,8 +1453,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, + func, fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); goto end; } colour = pimldp->rgbBk; @@ -1451,7 +1463,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col, has_alpha ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, + fStyle, blend_col, has_alpha, fState & ILS_SATURATE ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; @@ -1545,7 +1558,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) } } - if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 106ae92ffd..984ca053c8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1475,7 +1475,6 @@ static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UIN expected = (gray << 16) | (gray << 8) | gray; expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; - todo_wine_if(expected != 0 && expected != 0x00FFFFFF) ok(colour_match(dst_bits[i], expected) || broken(colour_match(dst_bits[i], expected_winxp)), "ImageList_DrawIndirect: got Pixel(%d,%d) %08X, Expected a close match to %08X from line %d\n", i % width, i / width, dst_bits[i] & 0x00FFFFFF, expected, line);

1 0

Ziqing Hui : comctl32/tests: Add tests for grayscale.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: e8c2e505a8b12b2f4ec5eb98ef25a7ce416a7535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8c2e505a8b12b2f4ec5eb98… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:57:28 2020 +0800 comctl32/tests: Add tests for grayscale. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 42 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 806cec7bd9..24b33f54d7 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1444,6 +1444,43 @@ static void check_ImageList_DrawIndirect_broken(HDC hdc, HIMAGELIST himl, UINT32 bits[0] & 0x00FFFFFF, expected, line); } +static void check_ImageList_DrawIndirect_grayscale(HDC hdc, HIMAGELIST himl, UINT32 *dst_bits, const UINT32 *bitmap_bits, + int index, UINT width, UINT height, int line) +{ + int i; + BOOL has_alpha = FALSE; + IMAGELISTDRAWPARAMS ildp = { sizeof(IMAGELISTDRAWPARAMS), himl, index, hdc, + 0, 0, 0, 0, 0, 0, CLR_NONE, CLR_NONE, ILD_NORMAL, 0, ILS_SATURATE, 0, 0x00000000 }; + memset(dst_bits, 0, width * height * sizeof(*dst_bits)); + pImageList_DrawIndirect(&ildp); + + for (i = 0; i < width * height; i++) + if ((has_alpha = ((bitmap_bits[i] & 0xFF000000) != 0))) break; + + for (i = 0; i < width * height; i++) + { + UINT32 expected, expected_winxp; + UINT32 red = (bitmap_bits[i] & 0x00FF0000) >> 16; + UINT32 green = (bitmap_bits[i] & 0x0000FF00) >> 8; + UINT32 blue = (bitmap_bits[i] & 0x000000FF) >> 0; + UINT32 gray = (red * 299 + green * 587 + blue * 114 + 500) / 1000; + UINT32 gray_winxp = (red + green + blue) / 3; + if (has_alpha) + { + UINT32 alpha = (bitmap_bits[i] & 0xFF000000) >> 24; + gray = gray * alpha / 0xff * alpha / 0xff; + gray_winxp = gray_winxp * alpha / 0xff * 0x96 / 0xff; + } + expected = (gray << 16) | (gray << 8) | gray; + expected_winxp = (gray_winxp << 16) | (gray_winxp << 8) | gray_winxp; + + todo_wine_if(expected != 0 && expected != 0x00FFFFFF) + ok(colour_match(dst_bits[i], expected) || broken(colour_match(dst_bits[i], expected_winxp)), + "ImageList_DrawIndirect: got Pixel(%d,%d) %08X, Expected a close match to %08X from line %d\n", + i % width, i / width, dst_bits[i] & 0x00FFFFFF, expected, line); + } +} + static void test_ImageList_DrawIndirect(void) { const UINT32 bits_image[] = { 0x00ABCDEF, 0x00ABCDEF }; @@ -1546,8 +1583,9 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCCOPY, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_ILD_ROP(hdcDst, himl, bits, iAlphaImage, SRCINVERT, 0x00D3E5F7, __LINE__); - todo_wine check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00CCCCCC, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_SATURATE, 0, 0x00AFAFAF, 0x00F0F0F0, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_image, iImage, 2, 1, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_alpha, iAlphaImage, 2, 1, __LINE__); + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_transparent, iTransparentImage, 2, 1, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_GLOW, 0, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fState(hdcDst, himl, bits, iImage, ILD_NORMAL, ILS_SHADOW, 0, 0x00ABCDEF, __LINE__);

1 0

Alexandre Julliard : dxerr9: Use wide character string literals.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 5825cb01204dc0733dbebb8c8abd2b8212c5fbb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5825cb01204dc0733dbebb8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 09:54:15 2020 +0100 dxerr9: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 589 ++++++++++++- dlls/dxerr9/errors.awk | 80 -- dlls/dxerr9/errors.dat | 552 ------------ dlls/dxerr9/errors.h | 2213 ----------------------------------------------- dlls/dxerr9/make_errors | 2 - 5 files changed, 565 insertions(+), 2871 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5825cb01204dc0733dbe…

1 0

Ziqing Hui : comctl32/tests: Add a 4x4 bitmap for ImageList_DrawIndirect tests.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 7a1727004ba1aebf4af9fd975ed326c1a7e6b3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1727004ba1aebf4af9fd97… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:57:43 2020 +0800 comctl32/tests: Add a 4x4 bitmap for ImageList_DrawIndirect tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 24b33f54d7..106ae92ffd 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -77,6 +77,7 @@ static void (WINAPI *pImageList_EndDrag)(void); static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); static BOOL (WINAPI *pImageList_SetDragCursorImage)(HIMAGELIST, int, int, int); static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static BOOL (WINAPI *pImageList_SetIconSize)(HIMAGELIST, INT, INT); static BOOL (WINAPI *pImageList_Remove)(HIMAGELIST, int); static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST, int, HICON); static BOOL (WINAPI *pImageList_Replace)(HIMAGELIST, int, HBITMAP, HBITMAP); @@ -1487,12 +1488,17 @@ static void test_ImageList_DrawIndirect(void) const UINT32 bits_alpha[] = { 0x89ABCDEF, 0x89ABCDEF }; const UINT32 bits_transparent[] = { 0x00ABCDEF, 0x89ABCDEF }; + const UINT32 bits_4x4[] = { 0x00ABCDEF, 0x89ABCDEF, 0xFFABCDEF, 0xFEDCBA98, + 0x00345678, 0x12345678, 0xFF345678, 0x87654321, + 0x00987654, 0xBA987654, 0xFF987654, 0x456789AB, + 0x00000000, 0xFF000000, 0xFFFFFFFF, 0x00FFFFFF }; + HIMAGELIST himl = NULL; int ret; HDC hdcDst = NULL; HBITMAP hbmOld = NULL, hbmDst = NULL; HBITMAP hbmMask = NULL, hbmInverseMask = NULL; - HBITMAP hbmImage = NULL, hbmAlphaImage = NULL, hbmTransparentImage = NULL; + HBITMAP hbmImage = NULL, hbmAlphaImage = NULL, hbmTransparentImage = NULL, hbm4x4 = NULL; int iImage = -1, iAlphaImage = -1, iTransparentImage = -1; UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; @@ -1594,6 +1600,29 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_ALPHA, 127, 0x00E9F2FB, 0x00AEB7C0, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, ILS_NORMAL, 127, 0x00E9F2FB, 0x00D3E5F7, __LINE__); + /* 4x4 bitmap tests */ + SelectObject(hdcDst, hbmOld); + DeleteObject(hbmDst); + bitmapInfo.bmiHeader.biWidth = 4; + bitmapInfo.bmiHeader.biHeight = -4; + hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok (hbmDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); + if (!hbmDst || !bits) goto cleanup; + SelectObject(hdcDst, hbmDst); + + hbm4x4 = create_test_bitmap(hdcDst, 4, 4, 32, bits_4x4); + if (!hbm4x4) goto cleanup; + + ret = pImageList_SetIconSize(himl, 4, 4); + ok(ret, "ImageList_SetIconSize failed\n"); + if (!ret) goto cleanup; + + ret = pImageList_Add(himl, hbm4x4, NULL); + ok(ret != -1, "ImageList_Add failed\n"); + if(ret == -1) goto cleanup; + + check_ImageList_DrawIndirect_grayscale(hdcDst, himl, bits, bits_4x4, 0, 4, 4, __LINE__); + cleanup: if(hbmOld) @@ -1614,6 +1643,8 @@ cleanup: DeleteObject(hbmAlphaImage); if(hbmTransparentImage) DeleteObject(hbmTransparentImage); + if(hbm4x4) + DeleteObject(hbm4x4); if(himl) { @@ -2509,6 +2540,7 @@ static void init_functions(void) X(ImageList_GetImageCount); X(ImageList_SetDragCursorImage); X(ImageList_GetIconSize); + X(ImageList_SetIconSize); X(ImageList_Remove); X(ImageList_ReplaceIcon); X(ImageList_Replace);

1 0

Roman Pišl : wineconsole: Allow maximization.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: da395975b0af96b9a523ad9d563c66e0ae44d4a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da395975b0af96b9a523ad9d… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Fri Mar 6 15:22:55 2020 +0100 wineconsole: Allow maximization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48706 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 5cc405d5b7..212c65cee4 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1437,7 +1437,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data) RegisterClassW(&wndclass); data->hWnd = CreateWindowW(wndclass.lpszClassName, NULL, - WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, + WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_HSCROLL|WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); if (!data->hWnd) return init_not_supported;

1 0

Zebediah Figura : winegstreamer: Reimplement COM registration and vending locally.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 74dc0c5df9c3094352caedda8ebe14ed2dfd615e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74dc0c5df9c3094352caedda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:05:09 2020 -0500 winegstreamer: Reimplement COM registration and vending locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 +- dlls/winegstreamer/gst_private.h | 17 +- dlls/winegstreamer/gstdemux.c | 69 +-- dlls/winegstreamer/main.c | 484 +++++++++++---------- dlls/winegstreamer/mfplat.c | 11 +- .../{mfplat.idl => winegstreamer_classes.idl} | 36 +- 6 files changed, 320 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74dc0c5df9c3094352ca…

1 0

Alexandre Julliard : dxerr8: Use wide character string literals.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 92ba0d3a91907bb8d8367c0ab20b0f4e00156fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92ba0d3a91907bb8d8367c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 09:53:46 2020 +0100 dxerr8: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 460 ++++++++++++- dlls/dxerr8/errors.awk | 80 --- dlls/dxerr8/errors.dat | 425 ------------ dlls/dxerr8/errors.h | 1705 ----------------------------------------------- dlls/dxerr8/make_errors | 2 - 5 files changed, 437 insertions(+), 2235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92ba0d3a91907bb8d836…

1 0

Ziqing Hui : comctl32/tests: Change create_test_bitmap() to give it the ability to create more kinds of bitmaps.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: d6268b9e88b01795be7af414e6434eb115a5d958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6268b9e88b01795be7af414… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Mar 6 17:56:50 2020 +0800 comctl32/tests: Change create_test_bitmap() to give it the ability to create more kinds of bitmaps. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d4da38b151..806cec7bd9 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1363,12 +1363,12 @@ static void test_shell_imagelist(void) FreeLibrary(hShell32); } -static HBITMAP create_test_bitmap(HDC hdc, int bpp, UINT32 pixel1, UINT32 pixel2) +static HBITMAP create_test_bitmap(HDC hdc, UINT width, UINT height, WORD bpp, const UINT32 *bits) { HBITMAP hBitmap; UINT32 *buffer = NULL; - BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, bpp, BI_RGB, - 0, 0, 0, 0, 0}}; + UINT stride = ((width * bpp + 31) >> 3) & ~3; + BITMAPINFO bitmapInfo = { { sizeof(BITMAPINFOHEADER), width, - height, 1, bpp, BI_RGB, 0, 0, 0, 0, 0 } }; hBitmap = CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, (void**)&buffer, NULL, 0); ok(hBitmap != NULL && buffer != NULL, "CreateDIBSection failed.\n"); @@ -1379,8 +1379,7 @@ static HBITMAP create_test_bitmap(HDC hdc, int bpp, UINT32 pixel1, UINT32 pixel2 return NULL; } - buffer[0] = pixel1; - buffer[1] = pixel2; + memcpy(buffer, bits, stride * height); return hBitmap; } @@ -1447,6 +1446,10 @@ static void check_ImageList_DrawIndirect_broken(HDC hdc, HIMAGELIST himl, UINT32 static void test_ImageList_DrawIndirect(void) { + const UINT32 bits_image[] = { 0x00ABCDEF, 0x00ABCDEF }; + const UINT32 bits_alpha[] = { 0x89ABCDEF, 0x89ABCDEF }; + const UINT32 bits_transparent[] = { 0x00ABCDEF, 0x89ABCDEF }; + HIMAGELIST himl = NULL; int ret; HDC hdcDst = NULL; @@ -1480,7 +1483,7 @@ static void test_ImageList_DrawIndirect(void) if(!himl) goto cleanup; /* Add a no-alpha image */ - hbmImage = create_test_bitmap(hdcDst, 32, 0x00ABCDEF, 0x00ABCDEF); + hbmImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_image); if(!hbmImage) goto cleanup; iImage = pImageList_Add(himl, hbmImage, hbmMask); @@ -1488,7 +1491,7 @@ static void test_ImageList_DrawIndirect(void) if(iImage == -1) goto cleanup; /* Add an alpha image */ - hbmAlphaImage = create_test_bitmap(hdcDst, 32, 0x89ABCDEF, 0x89ABCDEF); + hbmAlphaImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_alpha); if(!hbmAlphaImage) goto cleanup; iAlphaImage = pImageList_Add(himl, hbmAlphaImage, hbmMask); @@ -1496,7 +1499,7 @@ static void test_ImageList_DrawIndirect(void) if(iAlphaImage == -1) goto cleanup; /* Add a transparent alpha image */ - hbmTransparentImage = create_test_bitmap(hdcDst, 32, 0x00ABCDEF, 0x89ABCDEF); + hbmTransparentImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_transparent); if(!hbmTransparentImage) goto cleanup; iTransparentImage = pImageList_Add(himl, hbmTransparentImage, hbmMask); @@ -2310,7 +2313,7 @@ static void test_alpha(void) for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) { - hbm_test = create_test_bitmap(hdc, 32, test_bitmaps[i], test_bitmaps[i + 1]); + hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); ret = pImageList_AddMasked(himl, hbm_test, CLR_NONE); ok(ret == i / 2, "ImageList_AddMasked returned %d, expected %d\n", ret, i / 2); DeleteObject(hbm_test);

1 0