wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetRenderState().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 3d3de79741576ce77f7ed74fbaa113ecda7c7316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3de79741576ce77f7ed74f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:15 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetRenderState(). 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/d3d9/device.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d08d052284..441bfd2f44 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2331,22 +2331,11 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_color factor; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - { - if (state == D3DRS_BLENDFACTOR) - { - wined3d_color_from_d3dcolor(&factor, value); - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); - } - else - wined3d_device_set_render_state(device->wined3d_device, state, value); - } if (state == D3DRS_POINTSIZE && value == D3D9_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d9: Handle multisample depth resolve in d3d9_device_SetRenderState().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: cff0496efbbaf13d4b78570cc7b4ab21fc1e8988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff0496efbbaf13d4b78570c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:14 2020 -0600 d3d9: Handle multisample depth resolve in d3d9_device_SetRenderState(). 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/d3d9/d3d9_private.h | 3 +++ dlls/d3d9/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d9/directx.c | 14 ++++++++++++-- include/wine/wined3d.h | 2 ++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 03e2aa7f8a..a7072162d5 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -47,6 +47,9 @@ #define D3D9_TEXTURE_MIPMAP_DIRTY 0x1 +#define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') +#define D3D9_RESZ_CODE 0x7fa05000 + extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index be9c2a9d5a..d08d052284 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2299,6 +2299,34 @@ static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD return hr; } +static void resolve_depth_buffer(struct d3d9_device *device) +{ + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + struct wined3d_rendertarget_view *wined3d_dsv; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; + struct wined3d_resource_desc desc; + struct d3d9_surface *d3d9_dsv; + + if (!(dst_texture = state->textures[0])) + return; + dst_resource = wined3d_texture_get_resource(dst_texture); + wined3d_resource_get_desc(dst_resource, &desc); + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT + && desc.format != WINED3DFMT_X8D24_UNORM + && desc.format != WINED3DFMT_DF16 + && desc.format != WINED3DFMT_DF24 + && desc.format != WINED3DFMT_INTZ) + return; + + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + return; + d3d9_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); + + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d9_dsv->sub_resource_idx, desc.format); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevice9Ex *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -2319,6 +2347,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi else wined3d_device_set_render_state(device->wined3d_device, state, value); } + if (state == D3DRS_POINTSIZE && value == D3D9_RESZ_CODE) + resolve_depth_buffer(device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1d3754adf8..b552c3b910 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -289,8 +289,18 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, + wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, + wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4306f5ae21..d313c7aec8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -267,6 +267,8 @@ enum wined3d_format_id WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), WINED3DFMT_NV12 = WINEMAKEFOURCC('N','V','1','2'), + WINED3DFMT_DF16 = WINEMAKEFOURCC('D','F','1','6'), + WINED3DFMT_DF24 = WINEMAKEFOURCC('D','F','2','4'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Zebediah Figura : d3d9: Apply the device state before executing a draw call.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 7654d58b047be3a54d814d890bf1a26374559c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7654d58b047be3a54d814d89… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:13 2020 -0600 d3d9: Apply the device state before executing a draw call. 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/d3d9/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 82fba25ce7..be9c2a9d5a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1821,6 +1821,7 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); rtv = d3d9_surface_acquire_rendertarget_view(surface_impl); hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); @@ -2071,6 +2072,7 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co wined3d_color_from_d3dcolor(&c, color); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -2654,6 +2656,7 @@ static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWOR TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2885,6 +2888,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); @@ -2917,6 +2921,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -3003,6 +3008,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3119,6 +3125,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3203,6 +3210,8 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: wine Branch: master Commit: 93a226f28bf6813f88b5aea1ac406217b451b067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a226f28bf6813f88b5aea1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:12 2020 -0600 wined3d: Introduce wined3d_device_apply_stateblock(). 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/wined3d/device.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 195 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cdc65a6fa7..fc4933bd72 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3831,6 +3831,199 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j, count; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + count = 0; + for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + { + if (stateblock->changed.vs_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_f(device, i - count, count, state->vs_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_b(device, i - count, count, state->vs_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_vs_consts_i(device, i - count, count, state->vs_consts_i + i - count); + + count = 0; + for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + { + if (stateblock->changed.ps_consts_f[i]) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_f(device, i - count, count, state->ps_consts_f + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_b(device, i - count, count, state->ps_consts_b + i - count); + + count = 0; + for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + ++count; + else if (count) + { + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + count = 0; + } + } + if (count) + wined3d_device_set_ps_consts_i(device, i - count, count, state->ps_consts_i + i - count); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cdf18633c..4306f5ae21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2289,6 +2289,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil);

1 0

Francois Gouget : testbot/LogUtils: Keep track of the first line of each error group.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: tools Branch: master Commit: b8f646134f2988fa733301ec5882e6970a61a156 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8f646134f2988fa733301e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 28 12:12:16 2020 +0100 testbot/LogUtils: Keep track of the first line of each error group. This will make it possible to jump to the first line of a test unit that contains failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 75d2833..4d0d99b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -709,16 +709,20 @@ sub _DumpErrors($$) } } -sub _AddLogGroup($$) +sub _AddLogGroup($$;$) { - my ($LogInfo, $GroupName) = @_; + my ($LogInfo, $GroupName, $LineNo) = @_; # In theory the error group names are all unique. But, just in case, make # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. if (!$LogInfo->{ErrGroups}->{$GroupName}) { push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { LineNos => [], Errors => [] }; + $LogInfo->{ErrGroups}->{$GroupName} = { + LineNo => $LineNo || 0, + LineNos => [], + Errors => [] + }; } return $LogInfo->{ErrGroups}->{$GroupName}; } @@ -758,6 +762,10 @@ A hashtable indexed by the error group name. Each entry contains: =over +=item LineNo +The line number of the start of this error group. Note that this is normally +different from the line of the first error in that group. + =item Errors An array containing the error messages. @@ -798,7 +806,7 @@ sub GetLogErrors($) { $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; - my $CurrentGroup; + my ($CurrentGroup, $GroupLineNo); my $LineNo = 0; foreach my $Line (<$LogFile>) { @@ -807,6 +815,7 @@ sub GetLogErrors($) if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) { $CurrentModule = $1; + $GroupLineNo = $LineNo; $CurrentGroup = undef; next; } @@ -820,7 +829,7 @@ sub GetLogErrors($) } if (!$CurrentGroup) { - $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); + $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule, $GroupLineNo || $LineNo); } _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } @@ -848,7 +857,7 @@ sub GetLogErrors($) # Note: $GroupName must not depend on the previous content as this # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; - $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); + $CurrentGroup = _AddLogGroup($LogInfo, $GroupName, $LineNo); } _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); }

1 0

Francois Gouget : testbot/JobDetails: Highlight new errors in the full log too.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: tools Branch: master Commit: 399fa0f31f62d257e9d2da3acac3686093c1b39a URL: https://source.winehq.org/git/tools.git/?a=commit;h=399fa0f31f62d257e9d2da3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 28 12:12:07 2020 +0100 testbot/JobDetails: Highlight new errors in the full log too. Extend $LogInfo to store the 1-based source line number of each error. For extra errors (i.e. errors not present in the source log), set the line number to 0. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 20 ++++++++++++---- testbot/web/JobDetails.pl | 46 +++++++++++++++++++++++++++++++++---- testbot/web/WineTestBot.css | 1 + 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8187826..75d2833 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -718,16 +718,17 @@ sub _AddLogGroup($$) if (!$LogInfo->{ErrGroups}->{$GroupName}) { push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { Errors => [] }; + $LogInfo->{ErrGroups}->{$GroupName} = { LineNos => [], Errors => [] }; } return $LogInfo->{ErrGroups}->{$GroupName}; } -sub _AddLogError($$$) +sub _AddLogError($$$;$) { - my ($LogInfo, $ErrGroup, $Line) = @_; + my ($LogInfo, $ErrGroup, $Line, $LineNo) = @_; push @{$ErrGroup->{Errors}}, $Line; + push @{$ErrGroup->{LineNos}}, $LineNo || 0; $LogInfo->{ErrCount}++; } @@ -756,8 +757,13 @@ An array containing the names of all the error groups. A hashtable indexed by the error group name. Each entry contains: =over + =item Errors An array containing the error messages. + +=item LineNos +An array containing the line number of the error in the log file. + =back =back @@ -793,8 +799,10 @@ sub GetLogErrors($) $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; my $CurrentGroup; + my $LineNo = 0; foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) { @@ -814,7 +822,7 @@ sub GetLogErrors($) { $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); } - _AddLogError($LogInfo, $CurrentGroup, $Line); + _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } close($LogFile); } @@ -830,8 +838,10 @@ sub GetLogErrors($) $LogInfo->{ErrCount} ||= 0; # Add the related extra errors my $CurrentGroup; + my $LineNo = 0; foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if (!$CurrentGroup) { @@ -840,7 +850,7 @@ sub GetLogErrors($) my $GroupName = $IsReport ? "Report errors" : "Task errors"; $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); } - _AddLogError($LogInfo, $CurrentGroup, $Line); + _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } close($LogFile); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2909eb7..f1ffd49 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -351,19 +351,42 @@ sub GetErrorCategory($) return "error"; } -sub GenerateFullLog($$$;$) +sub GenerateFullLog($$$$;$) { - my ($self, $FileName, $HideLog, $Header) = @_; + my ($self, $FileName, $HideLog, $LogInfo, $Header) = @_; + + my %NewLineNos; + if ($LogInfo and $LogInfo->{NewCount}) + { + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + { + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + next if (!$Group->{NewCount}); + if (($FileName =~ /\.err$/) == + ($GroupName =~ /^(?:Report errors|Task errors|TestBot errors)$/)) + { + for my $ErrIndex (0..@{$Group->{Errors}} - 1) + { + if ($Group->{IsNew}->[$ErrIndex]) + { + $NewLineNos{$Group->{LineNos}->[$ErrIndex]} = 1; + } + } + } + } + } my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : $FileName =~ /\.report$/ ? \&GetReportLineCategory : \&GetLogLineCategory; + my $LineNo = 0; my $IsEmpty = 1; if (open(my $LogFile, "<", $FileName)) { foreach my $Line (<$LogFile>) { + $LineNo++; $Line =~ s/\s*$//; if ($IsEmpty) { @@ -372,8 +395,8 @@ sub GenerateFullLog($$$;$) $IsEmpty = 0; } - my $Category = $GetCategory->($Line); my $Html = $self->escapeHTML($Line); + my $Category = $NewLineNos{$LineNo} ? "fullnew" : $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; @@ -463,11 +486,24 @@ EOF # Show this log in full, highlighting the important lines # + my $LogInfo; + my $LogFileName = "$TaskDir/$MoreInfo->{Full}"; + if ($MoreInfo->{Full} =~ /\.report$/) + { + $LogInfo = GetLogErrors($LogFileName); + if ($LogInfo->{ErrCount}) + { + # Identify new errors in test reports + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($MoreInfo->{Full})); + TagNewErrors($RefReportPath, $LogInfo); + } + } + my ($Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($MoreInfo->{Full}), "Full", $MoreInfo->{Full}); $Url = $self->CGI->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; - my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}", $HideLog); + my $LogIsEmpty = $self->GenerateFullLog($LogFileName, $HideLog, $LogInfo); my $EmptyDiag; if ($LogIsEmpty) { @@ -490,7 +526,7 @@ EOF my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; - my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $HideLog, $ErrHeader); + my $ErrIsEmpty = $self->GenerateFullLog("$LogFileName.err", $HideLog, $LogInfo, $ErrHeader); print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index f588355..9a23f5f 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -402,6 +402,7 @@ pre .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } .log-new { color: #e56e00; font-weight: bold; } +.log-fullnew { color: red; font-weight: bold; } a.title { color:inherit; text-decoration: none; }

1 0

Francois Gouget : testbot/LogUtils: Store the filename in the $LogInfo structures.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: tools Branch: master Commit: 96cd74841084de0c2d23108e897bc76ef8476861 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96cd74841084de0c2d23108… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 28 12:05:35 2020 +0100 testbot/LogUtils: Store the filename in the $LogInfo structures. Also standardize on $LogPath for the full path to log files, and $LogName for their basename, which matches the field names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 55 +++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9aa2e81..8187826 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -90,16 +90,22 @@ Contains an error message if the task log could not be read. sub ParseTaskLog($) { - my ($FileName) = @_; + my ($LogPath) = @_; + + my $LogName = basename($LogPath); + my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + }; my $LogFile; - if (!open($LogFile, "<", $FileName)) + if (!open($LogFile, "<", $LogPath)) { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; } - my $LogInfo = {Type => "build"}; + $LogInfo->{Type} = "build"; foreach my $Line (<$LogFile>) { chomp $Line; @@ -362,16 +368,12 @@ Contains an error message if the report could not be read. sub ParseWineTestReport($$$) { - my ($FileName, $IsWineTest, $TaskTimedOut) = @_; - - my $LogFile; - if (!open($LogFile, "<", $FileName)) - { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; - } + my ($LogPath, $IsWineTest, $TaskTimedOut) = @_; + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, IsWineTest => $IsWineTest, TaskTimedOut => $TaskTimedOut, @@ -381,6 +383,13 @@ sub ParseWineTestReport($$$) Extra => [], }; + my $LogFile; + if (!open($LogFile, "<", $LogPath)) + { + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; + } + my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -757,10 +766,10 @@ An array containing the error messages. sub GetLogErrors($) { - my ($LogFileName) = @_; + my ($LogPath) = @_; my ($IsReport, $GetCategory); - if ($LogFileName =~ /\.report$/) + if ($LogPath =~ /\.report$/) { $IsReport = 1; $GetCategory = \&GetReportLineCategory; @@ -770,12 +779,16 @@ sub GetLogErrors($) $GetCategory = \&GetLogLineCategory; } + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + ErrCount => undef, # until we open a log ErrGroupNames => [], ErrGroups => {}, }; - if (open(my $LogFile, "<", $LogFileName)) + if (open(my $LogFile, "<", $LogPath)) { $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; @@ -805,14 +818,14 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f $LogFileName) + elsif (-f $LogPath) { - $LogInfo->{BadLog} = "Could not open '". basename($LogFileName) ."' for reading: $!"; + $LogInfo->{BadLog} = "Could not open '$LogName' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } - if (open(my $LogFile, "<", "$LogFileName.err")) + if (open(my $LogFile, "<", "$LogPath.err")) { $LogInfo->{ErrCount} ||= 0; # Add the related extra errors @@ -831,9 +844,9 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f "$LogFileName.err") + elsif (-f "$LogPath.err") { - $LogInfo->{BadLog} ||= "Could not open '". basename($LogFileName) .".err' for reading: $!"; + $LogInfo->{BadLog} ||= "Could not open '$LogName.err' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); }

1 0

Julian Rüger : German translation for release 5.0.
by Alexandre Julliard 28 Jan '20

28 Jan '20

Module: website Branch: master Commit: 53bbbed2a8e32700d914275dadb1fa46e60b705f URL: https://source.winehq.org/git/website.git/?a=commit;h=53bbbed2a8e32700d9142… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jan 24 11:27:24 2020 +0100 German translation for release 5.0. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020012101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020012101.xml b/news/de/2020012101.xml new file mode 100644 index 00000000..f41b82ae --- /dev/null +++ b/news/de/2020012101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. Januar 2020</date> +<title>Wine 5.0 freigegeben</title> +<body> +<p> Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 5.0 verfügbar ist.</p> +<p> Dieses Release verkörpert den Entwicklungsaufwand eines Jahres und über 7400 individuellen Änderungen. Enthalten sind eine große Zahl an Verbesserungen, welche in den <a href="{$root}/announce/5.0">Release Notes (en)</a> aufgeführt sind. Die Höhepunkte lauten:</p> +<ul> + <li>Eingebaute Module im PE-Format.</li> + <li>Multi-Monitor-Unterstützung.</li> + <li>XAudio2-Reimplementierung.</li> + <li>Unterstützung von Vulkan 1.1.</li> +</ul> +<p> Dieses Release ist dem Gedenken an Józef Kucia gewidmet, der im August 2019 im jungen Alter von 30 Jahren von uns ging. Józef hat maßgeblich zu Wines Direct3D-Implementierung beigetragen und war der leitende Entwickler des vkd3d-Projekts. Seine außerordentlichen Fähigkeiten und seine Liebenswürdigkeit werden von uns allen schmerzlich vermisst.</p> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Dmitry Timoshkov : gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: cf6546fb3b914dc1d87b23d6920526b7487cfd6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf6546fb3b914dc1d87b23d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:54 2020 +0800 gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 88 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62cd79fec6..eeeea8746a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -866,7 +866,7 @@ static void test_LockBits_UserBuf(void) struct BITMAPINFOWITHBITFIELDS { BITMAPINFOHEADER bmiHeader; - DWORD masks[3]; + DWORD masks[255]; }; union BITMAPINFOUNION @@ -882,7 +882,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) HPALETTE hpal = NULL; GpStatus stat; BYTE buff[1000]; - LOGPALETTE* LogPal = NULL; + char logpalette_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *LogPal = (LOGPALETTE *)logpalette_buf; + char colorpalette_buf[sizeof(ColorPalette) + sizeof(ARGB) * 255]; + ColorPalette *palette = (ColorPalette *)colorpalette_buf; REAL width, height; const REAL WIDTH1 = 5; const REAL HEIGHT1 = 15; @@ -892,6 +895,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) union BITMAPINFOUNION bmi; BYTE *bits; PixelFormat format; + int i; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -905,6 +909,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); DeleteObject(hbm); @@ -916,6 +923,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, FALSE); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH2, width); expectf(HEIGHT2, height); @@ -943,6 +954,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat24bppRGB, format); if (stat == Ok) { /* test whether writing to the bitmap affects the original */ @@ -954,21 +968,77 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipDisposeImage((GpImage*)gpbm); } - LogPal = GdipAlloc(sizeof(LOGPALETTE)); - ok(LogPal != NULL, "unable to allocate LOGPALETTE\n"); LogPal->palVersion = 0x300; - LogPal->palNumEntries = 1; + LogPal->palNumEntries = 8; + for (i = 0; i < 8; i++) + { + LogPal->palPalEntry[i].peRed = i; + LogPal->palPalEntry[i].peGreen = i; + LogPal->palPalEntry[i].peBlue = i; + LogPal->palPalEntry[i].peFlags = 0; + } + hpal = CreatePalette(LogPal); ok(hpal != NULL, "CreatePalette failed\n"); - GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); expect(Ok, stat); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(0, palette->Count); + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); - if (stat == Ok) - GdipDisposeImage((GpImage*)gpbm); + for (i = 0; i < 16; i++) + { + RGBQUAD *colors = bmi.bi.bmiColors; + BYTE clr = 255 - i; + colors[i].rgbBlue = clr; + colors[i].rgbGreen = clr; + colors[i].rgbRed = clr; + colors[i].rgbReserved = 0; + } + + bmi.bi.bmiHeader.biBitCount = 8; + bmi.bi.bmiHeader.biClrUsed = 16; + bmi.bi.bmiHeader.biClrImportant = 16; + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); DeleteObject(hpal); + + stat = GdipCreateBitmapFromHBITMAP(hbm, 0, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); /* 16-bit 555 dib, rgb */ @@ -999,7 +1069,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) DeleteObject(hbm); /* 16-bit 555 dib, with bitfields */ - bmi.bi.bmiHeader.biSize = sizeof(bmi); + bmi.bi.bmiHeader.biSize = sizeof(bmi.bi.bmiHeader); bmi.bi.bmiHeader.biCompression = BI_BITFIELDS; bmi.bf.masks[0] = 0x7c00; bmi.bf.masks[1] = 0x3e0;

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 506f3bf53df421e453549127c74f1af98ddfde56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506f3bf53df421e453549127… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:48 2020 +0800 gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bfa0c8afa7..9fa2aaee95 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1381,50 +1381,29 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, VOID *bits, GpBitmap **bitmap) { DWORD height, stride; - PixelFormat format; + HBITMAP hbm; + void *bmbits; + GpStatus status; - FIXME("(%p, %p, %p) - partially implemented\n", info, bits, bitmap); + TRACE("(%p, %p, %p)\n", info, bits, bitmap); if (!info || !bits || !bitmap) return InvalidParameter; + hbm = CreateDIBSection(0, info, DIB_RGB_COLORS, &bmbits, NULL, 0); + if (!hbm) + return InvalidParameter; + height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; + TRACE("height %u, stride %u, image size %u\n", height, stride, height * stride); - if(info->bmiHeader.biHeight > 0) /* bottom-up */ - { - bits = (BYTE*)bits + (height - 1) * stride; - stride = -stride; - } + memcpy(bmbits, bits, height * stride); - switch(info->bmiHeader.biBitCount) { - case 1: - format = PixelFormat1bppIndexed; - break; - case 4: - format = PixelFormat4bppIndexed; - break; - case 8: - format = PixelFormat8bppIndexed; - break; - case 16: - format = PixelFormat16bppRGB555; - break; - case 24: - format = PixelFormat24bppRGB; - break; - case 32: - format = PixelFormat32bppRGB; - break; - default: - FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount); - *bitmap = NULL; - return InvalidParameter; - } - - return GdipCreateBitmapFromScan0(info->bmiHeader.biWidth, height, stride, format, - bits, bitmap); + status = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + return status; } /* FIXME: no icm */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2020