April 2015 - Wine-commits - list.winehq.org

Marcus Meissner : d3drm: Avoid potential double free (Coverity).
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 369cf7118bc074b7bff449c62eaea0b82fa3b715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369cf7118bc074b7bff449c62… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 7 07:31:34 2015 +0200 d3drm: Avoid potential double free (Coverity). --- dlls/d3drm/meshbuilder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index b3c5dbf..e4d6d86 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -356,7 +356,9 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) } mesh_builder->nb_materials = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->materials); + mesh_builder->materials = NULL; HeapFree(GetProcessHeap(), 0, mesh_builder->material_indices); + mesh_builder->material_indices = NULL; } static HRESULT WINAPI d3drm_mesh_builder2_QueryInterface(IDirect3DRMMeshBuilder2 *iface, REFIID riid, void **out)

1 0

Nikolay Sivov : shell32: Fix allocation size (Valgrind).
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 47f8dbcb3669de7a04420b80737682ec0e69cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f8dbcb3669de7a04420b807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:01:17 2015 +0300 shell32: Fix allocation size (Valgrind). --- dlls/shell32/shellitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b1cae7e..f8b083f 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1314,7 +1314,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(cidl == 0) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellItem*)); + array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cidl*sizeof(IShellItem*)); if(!array) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : shell32: Cleanup item array creation code.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: d19790840fac1b587f7528bd51c4e0950a8a715a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19790840fac1b587f7528bd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:37:27 2015 +0300 shell32: Cleanup item array creation code. --- dlls/shell32/shellitem.c | 78 +++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 48 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index f8b083f..9eb675a 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1142,29 +1142,31 @@ static const IShellItemArrayVtbl vt_IShellItemArray = { IShellItemArray_fnEnumItems }; -static HRESULT IShellItemArray_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) +/* Caller is responsible to AddRef all items */ +static HRESULT create_shellitemarray(IShellItem **items, DWORD count, IShellItemArray **ret) { IShellItemArrayImpl *This; - HRESULT ret; - - TRACE("(%p, %s, %p)\n",pUnkOuter, debugstr_guid(riid), ppv); - if(pUnkOuter) - return CLASS_E_NOAGGREGATION; + TRACE("(%p, %d, %p)\n", items, count, ret); This = HeapAlloc(GetProcessHeap(), 0, sizeof(IShellItemArrayImpl)); if(!This) return E_OUTOFMEMORY; - This->ref = 1; This->IShellItemArray_iface.lpVtbl = &vt_IShellItemArray; - This->array = NULL; - This->item_count = 0; + This->ref = 1; - ret = IShellItemArray_QueryInterface(&This->IShellItemArray_iface, riid, ppv); - IShellItemArray_Release(&This->IShellItemArray_iface); + This->array = HeapAlloc(GetProcessHeap(), 0, count*sizeof(IShellItem*)); + if (!This->array) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + memcpy(This->array, items, count*sizeof(IShellItem*)); + This->item_count = count; - return ret; + *ret = &This->IShellItemArray_iface; + return S_OK; } HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, @@ -1173,13 +1175,14 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, PCUITEMID_CHILD_ARRAY ppidl, IShellItemArray **ppsiItemArray) { - IShellItemArrayImpl *This; IShellItem **array; HRESULT ret = E_FAIL; UINT i; TRACE("%p, %p, %d, %p, %p\n", pidlParent, psf, cidl, ppidl, ppsiItemArray); + *ppsiItemArray = NULL; + if(!pidlParent && !psf) return E_POINTER; @@ -1198,52 +1201,37 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { - ret = IShellItemArray_Constructor(NULL, &IID_IShellItemArray, (void**)&This); + ret = create_shellitemarray(array, cidl, ppsiItemArray); if(SUCCEEDED(ret)) - { - This->array = array; - This->item_count = cidl; - *ppsiItemArray = &This->IShellItemArray_iface; - return ret; - } } /* Something failed, clean up. */ for(i = 0; i < cidl; i++) if(array[i]) IShellItem_Release(array[i]); HeapFree(GetProcessHeap(), 0, array); - *ppsiItemArray = NULL; return ret; } -HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv) +HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *item, REFIID riid, void **ppv) { - IShellItemArrayImpl *This; - IShellItem **array; + IShellItemArray *array; HRESULT ret; - TRACE("%p, %s, %p\n", psi, shdebugstr_guid(riid), ppv); + TRACE("%p, %s, %p\n", item, shdebugstr_guid(riid), ppv); - array = HeapAlloc(GetProcessHeap(), 0, sizeof(IShellItem*)); - if(!array) - return E_OUTOFMEMORY; + *ppv = NULL; - ret = IShellItemArray_Constructor(NULL, riid, (void**)&This); - if(SUCCEEDED(ret)) - { - array[0] = psi; - IShellItem_AddRef(psi); - This->array = array; - This->item_count = 1; - *ppv = This; - } - else + IShellItem_AddRef(item); + ret = create_shellitemarray(&item, 1, &array); + if(FAILED(ret)) { - HeapFree(GetProcessHeap(), 0, array); - *ppv = NULL; + IShellItem_Release(item); + return ret; } + ret = IShellItemArray_QueryInterface(array, riid, ppv); + IShellItemArray_Release(array); return ret; } @@ -1303,7 +1291,6 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, PCIDLIST_ABSOLUTE_ARRAY pidl_array, IShellItemArray **psia) { - IShellItemArrayImpl *This; IShellItem **array; HRESULT ret; UINT i; @@ -1327,14 +1314,9 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(SUCCEEDED(ret)) { - ret = IShellItemArray_Constructor(NULL, &IID_IShellItemArray, (void**)psia); + ret = create_shellitemarray(array, cidl, psia); if(SUCCEEDED(ret)) - { - This = impl_from_IShellItemArray(*psia); - This->array = array; - This->item_count = cidl; - return S_OK; - } + return ret; } for(i = 0; i < cidl; i++)

1 0

Nikolay Sivov : shell32: Remove a couple of redundant lines.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 1d3d0865608e16f5cdd651462677601e9f42222f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3d0865608e16f5cdd651462… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:41:28 2015 +0300 shell32: Remove a couple of redundant lines. --- dlls/shell32/shellitem.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 9eb675a..d8cb6a8 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1121,12 +1121,8 @@ static HRESULT WINAPI IShellItemArray_fnEnumItems(IShellItemArray *iface, IEnumShellItems **ppenumShellItems) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); - HRESULT hr; TRACE("%p (%p)\n", This, ppenumShellItems); - - hr = IEnumShellItems_Constructor(iface, ppenumShellItems); - - return hr; + return IEnumShellItems_Constructor(iface, ppenumShellItems); } static const IShellItemArrayVtbl vt_IShellItemArray = {

1 0

Stefan Dösinger : wined3d: Use a shader for unconverted blits.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: f260c17b347460baf198e9b8a82e8ae001168815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f260c17b347460baf198e9b8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:51 2015 +0200 wined3d: Use a shader for unconverted blits. --- dlls/wined3d/arb_program_shader.c | 74 ++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 719e8e5..e648cc8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7558,6 +7558,54 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ +static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, + const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) +{ + GLenum shader; + struct wined3d_shader_buffer buffer; + GLint pos; + + /* Shader header */ + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + + GL_EXTCALL(glGenProgramsARB(1, &shader)); + if (!shader) + { + shader_buffer_free(&buffer); + return 0; + } + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); + + shader_addline(&buffer, "!!ARBfp1.0\n"); + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], RECT;\n"); + else + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], 2D;\n"); + + shader_addline(&buffer, "END\n"); + + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { + FIXME("Fragment program error at position %d: %s\n\n", pos, + debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + shader_arb_dump_program_source(buffer.buffer); + } + + shader_buffer_free(&buffer); + + return shader; +} + +/* Context activation is done by the caller. */ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; @@ -7577,17 +7625,10 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, return WINED3D_OK; } - if (!is_complex_fixup(surface->resource.format->color_fixup)) - { - TRACE("Fixup:\n"); - dump_color_fixup_desc(surface->resource.format->color_fixup); - /* Don't bother setting up a shader for unconverted formats */ - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - - fixup = get_complex_fixup(surface->resource.format->color_fixup); + if (is_complex_fixup(surface->resource.format->color_fixup)) + fixup = get_complex_fixup(surface->resource.format->color_fixup); + else + fixup = COMPLEX_FIXUP_NONE; switch (gl_texture_type) { @@ -7628,11 +7669,20 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, { switch (fixup) { + case COMPLEX_FIXUP_NONE: + if (!is_identity_fixup(surface->resource.format->color_fixup)) + FIXME("Implement support for sign or swizzle fixups.\n"); + shader = arbfp_gen_plain_shader(priv, gl_info, &type); + break; + case COMPLEX_FIXUP_P8: shader = gen_p8_shader(priv, gl_info, &type); break; - default: + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: shader = gen_yuv_shader(priv, gl_info, &type); break; }

1 0

Stefan Dösinger : wined3d: Add a function for wined3d_gl_resource_type to texture target conversion.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 8a101bc1f5a7ee563d68d6029231e51bea18ead4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a101bc1f5a7ee563d68d6029… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:52 2015 +0200 wined3d: Add a function for wined3d_gl_resource_type to texture target conversion. --- dlls/wined3d/arb_program_shader.c | 106 +++++++++++--------------------------- 1 file changed, 30 insertions(+), 76 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e648cc8..0d4d5e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6199,6 +6199,25 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", dstreg, dstmask, dstreg); } +static const char *arbfp_texture_target(enum wined3d_gl_resource_type type) +{ + switch(type) + { + case WINED3D_GL_RES_TYPE_TEX_1D: + return "1D"; + case WINED3D_GL_RES_TYPE_TEX_2D: + return "2D"; + case WINED3D_GL_RES_TYPE_TEX_3D: + return "3D"; + case WINED3D_GL_RES_TYPE_TEX_CUBE: + return "CUBE"; + case WINED3D_GL_RES_TYPE_TEX_RECT: + return "RECT"; + default: + return "unexpected_resource_type"; + } +} + static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { unsigned int stage; @@ -6345,27 +6364,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (!tex_read[stage]) continue; - switch(settings->op[stage].tex_type) - { - case WINED3D_GL_RES_TYPE_TEX_1D: - textype = "1D"; - break; - case WINED3D_GL_RES_TYPE_TEX_2D: - textype = "2D"; - break; - case WINED3D_GL_RES_TYPE_TEX_3D: - textype = "3D"; - break; - case WINED3D_GL_RES_TYPE_TEX_CUBE: - textype = "CUBE"; - break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - textype = "RECT"; - break; - default: - textype = "unexpected_textype"; - break; - } + textype = arbfp_texture_target(settings->op[stage].tex_type); if(settings->op[stage].projected == proj_none) { instr = "TEX"; @@ -6910,7 +6909,7 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const stru char *luminance) { char chroma; - const char *tex, *texinstr; + const char *tex, *texinstr = "TXP"; if (type->fixup == COMPLEX_FIXUP_UYVY) { @@ -6923,25 +6922,9 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const stru *luminance = 'x'; } - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - texinstr = "TXP"; - break; - - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - texinstr = "TEX"; - break; - - default: - /* This is more tricky than just replacing the texture type - we have to navigate - * properly in the texture to find the correct chroma values - */ - FIXME("Implement yuv correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + texinstr = "TEX"; /* First we have to read the chroma values. This means we need at least two pixels(no filtering), * or 4 pixels(with filtering). To get the unmodified chromas, we have to rid ourselves of the @@ -7017,20 +7000,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, const struct arb static const float yv12_coef[] = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - break; - - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - break; - - default: - FIXME("Implement yv12 correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); /* YV12 surfaces contain a WxH sized luminance plane, followed by a (W/2)x(H/2) * V and a (W/2)x(H/2) U plane, each with 8 bit per pixel. So the effective @@ -7179,18 +7149,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, const struct arb static const float nv12_coef[] = {2.0f / 3.0f, 1.0f / 3.0f, 1.0f, 1.0f}; - switch (type->res_type) - { - case WINED3D_GL_RES_TYPE_TEX_2D: - tex = "2D"; - break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - tex = "RECT"; - break; - default: - FIXME("Implement nv12 correction for non-2d, non-rect textures\n"); - return FALSE; - } + tex = arbfp_texture_target(type->res_type); /* NV12 surfaces contain a WxH sized luminance plane, followed by a (W/2)x(H/2) * sized plane where each component is an UV pair. So the effective @@ -7326,6 +7285,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, GLenum shader; struct wined3d_shader_buffer buffer; GLint pos; + const char *tex_target = arbfp_texture_target(type->res_type); /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7349,10 +7309,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, shader_addline(&buffer, "PARAM constants = { 0.996, 0.00195, 0, 0 };\n"); /* The alpha-component contains the palette index */ - if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) - shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], RECT;\n"); - else - shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], 2D;\n"); + shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], %s;\n", tex_target); /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ shader_addline(&buffer, "MAD index.a, index.a, constants.x, constants.y;\n"); @@ -7564,6 +7521,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, GLenum shader; struct wined3d_shader_buffer buffer; GLint pos; + const char *tex_target = arbfp_texture_target(type->res_type); /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7581,11 +7539,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); shader_addline(&buffer, "!!ARBfp1.0\n"); - if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) - shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], RECT;\n"); - else - shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], 2D;\n"); - + shader_addline(&buffer, "TEX result.color, fragment.texcoord[0], texture[0], %s;\n", tex_target); shader_addline(&buffer, "END\n"); GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,

1 0

Stefan Dösinger : wined3d: Move surface_convert_color_to_float to utils.c.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: fa0a9232e05fd2e9d66bc3face95df85c5819f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0a9232e05fd2e9d66bc3fac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:53 2015 +0200 wined3d: Move surface_convert_color_to_float to utils.c. --- dlls/wined3d/surface.c | 60 +++--------------------------------------- dlls/wined3d/utils.c | 51 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 56 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d27339b..e3601a2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1013,62 +1013,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, - DWORD color, struct wined3d_color *float_color) -{ - const struct wined3d_format *format = surface->resource.format; - const struct wined3d_palette *palette; - - switch (format->id) - { - case WINED3DFMT_P8_UINT: - palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL; - - if (palette) - { - float_color->r = palette->colors[color].rgbRed / 255.0f; - float_color->g = palette->colors[color].rgbGreen / 255.0f; - float_color->b = palette->colors[color].rgbBlue / 255.0f; - } - else - { - float_color->r = 0.0f; - float_color->g = 0.0f; - float_color->b = 0.0f; - } - float_color->a = color / 255.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; - - default: - ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); - return FALSE; - } - - return TRUE; -} - static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format; @@ -5333,10 +5277,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC if (flags & WINEDDBLT_COLORFILL) { struct wined3d_color color; + const struct wined3d_palette *palette = dst_swapchain ? dst_swapchain->palette : NULL; TRACE("Color fill.\n"); - if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + if (!wined3d_format_convert_color_to_float(dst_surface->resource.format, + palette, fx->u5.dwFillColor, &color)) goto fallback; if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1cb928e..f3c84ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3511,6 +3511,57 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c return 0; } +BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, + const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) +{ + switch (format->id) + { + case WINED3DFMT_P8_UINT: + if (palette) + { + float_color->r = palette->colors[color].rgbRed / 255.0f; + float_color->g = palette->colors[color].rgbGreen / 255.0f; + float_color->b = palette->colors[color].rgbBlue / 255.0f; + } + else + { + float_color->r = 0.0f; + float_color->g = 0.0f; + float_color->b = 0.0f; + } + float_color->a = color / 255.0f; + break; + + case WINED3DFMT_B5G6R5_UNORM: + float_color->r = ((color >> 11) & 0x1f) / 31.0f; + float_color->g = ((color >> 5) & 0x3f) / 63.0f; + float_color->b = (color & 0x1f) / 31.0f; + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8A8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = D3DCOLOR_A(color); + break; + + default: + ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); + return FALSE; + } + + return TRUE; +} + /* DirectDraw stuff */ enum wined3d_format_id pixelformat_for_depth(DWORD depth) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e401b8a..5d736dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3167,6 +3167,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) DECLSPEC_HIDDEN; +BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, + const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Add more formats to wined3d_format_convert_color_to_float.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: b413a4e202de70ada3d753323f55f12489ecddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b413a4e202de70ada3d753323… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 00:28:54 2015 +0200 wined3d: Add more formats to wined3d_format_convert_color_to_float. --- dlls/wined3d/utils.c | 63 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f3c84ac..215ddd8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3511,11 +3511,48 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c return 0; } +static float color_to_float(DWORD color, DWORD size, DWORD offset) +{ + DWORD mask = (1 << size) - 1; + + if (!size) + return 1.0f; + + color >>= offset; + color &= mask; + + return (float)color / (float)mask; +} + BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) { switch (format->id) { + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8A8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + case WINED3DFMT_B5G6R5_UNORM: + case WINED3DFMT_B5G5R5X1_UNORM: + case WINED3DFMT_B5G5R5A1_UNORM: + case WINED3DFMT_B4G4R4A4_UNORM: + case WINED3DFMT_B2G3R3_UNORM: + case WINED3DFMT_R8_UNORM: + case WINED3DFMT_A8_UNORM: + case WINED3DFMT_B2G3R3A8_UNORM: + case WINED3DFMT_B4G4R4X4_UNORM: + case WINED3DFMT_R10G10B10A2_UNORM: + case WINED3DFMT_R10G10B10A2_SNORM: + case WINED3DFMT_R8G8B8A8_UNORM: + case WINED3DFMT_R8G8B8X8_UNORM: + case WINED3DFMT_R16G16_UNORM: + case WINED3DFMT_B10G10R10A2_UNORM: + float_color->r = color_to_float(color, format->red_size, format->red_offset); + float_color->g = color_to_float(color, format->green_size, format->green_size); + float_color->b = color_to_float(color, format->blue_size, format->blue_offset); + float_color->a = color_to_float(color, format->alpha_size, format->alpha_offset); + return TRUE; + case WINED3DFMT_P8_UINT: if (palette) { @@ -3530,36 +3567,12 @@ BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, float_color->b = 0.0f; } float_color->a = color / 255.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; + return TRUE; default: ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); return FALSE; } - - return TRUE; } /* DirectDraw stuff */

1 0

Andrew Cook : server: Implement TerminateJobObject.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 1d359a5827159fb0572d598ed02054ff3d700f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d359a5827159fb0572d598ed… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Apr 3 17:19:45 2015 +1100 server: Implement TerminateJobObject. --- dlls/kernel32/tests/process.c | 2 -- dlls/ntdll/sync.c | 15 +++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 39 ++++++++++++++++++++++++++++++++++++++- server/process.h | 1 + server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 91 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 11c9253..d981ec9 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2255,13 +2255,11 @@ static void test_TerminateJobObject(void) ok(ret, "TerminateJobObject error %u\n", GetLastError()); dwret = WaitForSingleObject(pi.hProcess, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); ret = GetExitCodeProcess(pi.hProcess, &dwret); ok(ret, "GetExitCodeProcess error %u\n", GetLastError()); - todo_wine ok(dwret == 123 || broken(dwret == 0) /* randomly fails on Win 2000 / XP */, "wrong exitcode %u\n", dwret); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 5db736e..04c6de30 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -613,8 +613,19 @@ NTSTATUS WINAPI NtOpenJobObject( PHANDLE handle, ACCESS_MASK access, const OBJEC */ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) { - FIXME( "stub: %p %x\n", handle, status ); - return STATUS_SUCCESS; + NTSTATUS ret; + + TRACE( "(%p, %d)\n", handle, status ); + + SERVER_START_REQ( terminate_job ) + { + req->handle = wine_server_obj_handle( handle ); + req->status = status; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index de6302c..d27914a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5156,6 +5156,20 @@ struct set_job_completion_port_reply }; + +struct terminate_job_request +{ + struct request_header __header; + obj_handle_t handle; + int status; + char __pad_20[4]; +}; +struct terminate_job_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5419,6 +5433,7 @@ enum request REQ_process_in_job, REQ_set_job_limits, REQ_set_job_completion_port, + REQ_terminate_job, REQ_NB_REQUESTS }; @@ -5687,6 +5702,7 @@ union generic_request struct process_in_job_request process_in_job_request; struct set_job_limits_request set_job_limits_request; struct set_job_completion_port_request set_job_completion_port_request; + struct terminate_job_request terminate_job_request; }; union generic_reply { @@ -5953,8 +5969,9 @@ union generic_reply struct process_in_job_reply process_in_job_reply; struct set_job_limits_reply set_job_limits_reply; struct set_job_completion_port_reply set_job_completion_port_reply; + struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 466 +#define SERVER_PROTOCOL_VERSION 467 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index eba47f7..d912739 100644 --- a/server/process.c +++ b/server/process.c @@ -64,6 +64,7 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); +static void terminate_process( struct process *process, struct thread *skip, int exit_code ); static const struct object_ops process_ops = { @@ -147,6 +148,7 @@ struct job struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ unsigned int limit_flags; /* limit flags */ + int terminating; /* job is terminating */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ }; @@ -188,6 +190,7 @@ static struct job *create_job_object( struct directory *root, const struct unico list_init( &job->process_list ); job->num_processes = 0; job->limit_flags = 0; + job->terminating = 0; job->completion_port = NULL; job->completion_key = 0; } @@ -251,12 +254,35 @@ static void release_job_process( struct process *process ) assert( job->num_processes ); job->num_processes--; - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); if (!job->num_processes) add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); } +static void terminate_job( struct job *job, int exit_code ) +{ + /* don't report completion events for terminated processes */ + job->terminating = 1; + + for (;;) /* restart from the beginning of the list every time */ + { + struct process *process; + + /* find the first process associated with this job and still running */ + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->running_threads) break; + } + if (&process->job_entry == &job->process_list) break; /* no process found */ + assert( process->job == job ); + terminate_process( process, NULL, exit_code ); + } + + job->terminating = 0; +} + static void job_destroy( struct object *obj ) { struct job *job = (struct job *)obj; @@ -1543,6 +1569,17 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* terminate all processes associated with the job */ +DECL_HANDLER(terminate_job) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_TERMINATE ); + + if (!job) return; + + terminate_job( job, req->status ); + release_object( job ); +} + /* update limits of the job object */ DECL_HANDLER(set_job_limits) { diff --git a/server/process.h b/server/process.h index 58c313a..59625f0 100644 --- a/server/process.h +++ b/server/process.h @@ -26,6 +26,7 @@ struct atom_table; struct handle_table; struct startup_info; +struct job; /* process startup state */ enum startup_state { STARTUP_IN_PROGRESS, STARTUP_DONE, STARTUP_ABORTED }; diff --git a/server/protocol.def b/server/protocol.def index 625b3c9..54501e8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3544,3 +3544,10 @@ enum coords_relative obj_handle_t port; /* handle to the completion port */ client_ptr_t key; /* key to send with completion messages */ @END + + +/* Terminate all processes associated with the job */ +(a)REQ(terminate_job) + obj_handle_t handle; /* handle to the job */ + int status; /* process exit code */ +(a)END diff --git a/server/request.h b/server/request.h index dd6e4e2..f94235f 100644 --- a/server/request.h +++ b/server/request.h @@ -367,6 +367,7 @@ DECL_HANDLER(assign_job); DECL_HANDLER(process_in_job); DECL_HANDLER(set_job_limits); DECL_HANDLER(set_job_completion_port); +DECL_HANDLER(terminate_job); #ifdef WANT_REQUEST_HANDLERS @@ -634,6 +635,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_process_in_job, (req_handler)req_set_job_limits, (req_handler)req_set_job_completion_port, + (req_handler)req_terminate_job, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2233,6 +2235,9 @@ C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, port) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_job_completion_port_request, key) == 24 ); C_ASSERT( sizeof(struct set_job_completion_port_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct terminate_job_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 ); +C_ASSERT( sizeof(struct terminate_job_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 0e2e7e2..236c9ab 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4133,6 +4133,12 @@ static void dump_set_job_completion_port_request( const struct set_job_completio dump_uint64( ", key=", &req->key ); } +static void dump_terminate_job_request( const struct terminate_job_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", status=%d", req->status ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4395,6 +4401,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_process_in_job_request, (dump_func)dump_set_job_limits_request, (dump_func)dump_set_job_completion_port_request, + (dump_func)dump_terminate_job_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4659,6 +4666,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4923,6 +4931,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "process_in_job", "set_job_limits", "set_job_completion_port", + "terminate_job", }; static const struct

1 0

Sebastian Lackner : kernel32/tests: Add tests for waiting on an job object.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 7984fb9fbe881b596d58c6dfa10d853ab0d06b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7984fb9fbe881b596d58c6dfa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 3 17:20:05 2015 +1100 kernel32/tests: Add tests for waiting on an job object. --- dlls/kernel32/tests/process.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d981ec9..0bd14dc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2443,6 +2443,90 @@ static void test_KillOnJobClose(void) CloseHandle(pi.hThread); } +static void test_WaitForJobObject(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD dwret; + + /* test waiting for a job object when the process is killed */ + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 500); + todo_wine + ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT), + "WaitForSingleObject returned %u\n", dwret); + + if (dwret == WAIT_TIMEOUT) /* Win 2000/XP */ + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); + todo_wine + win_skip("TerminateJobObject doesn't signal job, skipping tests\n"); + return; + } + + /* the object is not reset immediately */ + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + /* creating a new process doesn't reset the signalled state */ + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + CloseHandle(job); + + /* repeat the test, but this time the process terminates properly */ + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + create_process("exit", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(job, 100); + ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + static HANDLE test_AddSelfToJob(void) { HANDLE job; @@ -2625,6 +2709,7 @@ START_TEST(process) test_QueryInformationJobObject(); test_CompletionPort(); test_KillOnJobClose(); + test_WaitForJobObject(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job);

1 0