wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : wined3d: dst_surface can't be NULL at this point (Coverity ).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 68fcf9d7cf4858d567ae5175fc34dce88e084524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fcf9d7cf4858d567ae5175f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 12:02:07 2015 +0300 wined3d: dst_surface can't be NULL at this point (Coverity). --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 97b4797..552a079 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2049,8 +2049,8 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co { surface->overlay_destrect.left = 0; surface->overlay_destrect.top = 0; - surface->overlay_destrect.right = dst_surface ? dst_surface->resource.width : 0; - surface->overlay_destrect.bottom = dst_surface ? dst_surface->resource.height : 0; + surface->overlay_destrect.right = dst_surface->resource.width; + surface->overlay_destrect.bottom = dst_surface->resource.height; } if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE))

1 0

Stefan Dösinger : wined3d: Keep track of renderbuffer capabilities.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: dc7cb59c3a6790959614f52cf2eb02ea6dab79ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7cb59c3a6790959614f52cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:54 2015 +0200 wined3d: Keep track of renderbuffer capabilities. --- dlls/wined3d/arb_program_shader.c | 8 +++ dlls/wined3d/directx.c | 4 +- dlls/wined3d/glsl_shader.c | 8 +++ dlls/wined3d/resource.c | 4 +- dlls/wined3d/utils.c | 107 ++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 98 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7cb59c3a6790959614f…

1 0

Stefan Dösinger : wined3d: Set the gl resource type in resource_init.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: c8d1a70804ee64cd947dd5d1437db825282a4bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1a70804ee64cd947dd5d14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:53 2015 +0200 wined3d: Set the gl resource type in resource_init. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/resource.c | 102 ++++++++++++++++++++++++++++++++--------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 48 ++++--------------- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 95 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8d1a70804ee64cd947dd…

1 0

Stefan Dösinger : wined3d: Read format flags from the surface container.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: ec25ca7832406da874ece0ae006cbe809cd04690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec25ca7832406da874ece0ae0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:52 2015 +0200 wined3d: Read format flags from the surface container. --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/surface.c | 36 +++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 059503b..27ce1bf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -128,7 +128,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (depth_stencil) { - DWORD format_flags = depth_stencil->resource.format_flags; + DWORD format_flags = depth_stencil->container->resource.format_flags; if (depth_stencil->current_renderbuffer) { @@ -3186,12 +3186,12 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d { /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) - || !(target->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + || !(target->container->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context->current_rt->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (target->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) + if ((context->current_rt->container->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) + != (target->container->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 359db9b..f4b69e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -359,7 +359,7 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) static HRESULT surface_create_dib_section(struct wined3d_surface *surface) { const struct wined3d_format *format = surface->resource.format; - unsigned int format_flags = surface->resource.format_flags; + unsigned int format_flags = surface->container->resource.format_flags; SYSTEM_INFO sysInfo; BITMAPINFO *b_info; int extraline = 0; @@ -665,7 +665,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) + if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); @@ -752,7 +752,7 @@ static void surface_unmap(struct wined3d_surface *surface) if (surface->container->swapchain && surface->container->swapchain->front_buffer == surface->container) surface_load_location(surface, surface->container->resource.draw_binding); - else if (surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + else if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) FIXME("Depth / stencil buffer locking is not implemented.\n"); } @@ -780,8 +780,8 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = src_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_mask = dst_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_mask != dst_mask) { @@ -1279,7 +1279,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct surface_get_memory(surface, &data, dst_location); - if (surface->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (surface->container->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); @@ -1568,8 +1568,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P src_format = src_surface->resource.format; dst_format = dst_surface->resource.format; - src_fmt_flags = src_surface->resource.format_flags; - dst_fmt_flags = dst_surface->resource.format_flags; + src_fmt_flags = src_surface->container->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; if (src_format->id != dst_format->id) { @@ -2513,7 +2513,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; - unsigned int fmt_flags = surface->resource.format_flags; + unsigned int fmt_flags = surface->container->resource.format_flags; struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; @@ -3988,7 +3988,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) - && (surface->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) + && (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -4004,7 +4004,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (surface->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) + && (!srgb || (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -4578,13 +4578,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * src_map = dst_map; src_format = dst_surface->resource.format; dst_format = src_format; - dst_fmt_flags = dst_surface->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; src_fmt_flags = dst_fmt_flags; } else { dst_format = dst_surface->resource.format; - dst_fmt_flags = dst_surface->resource.format_flags; + dst_fmt_flags = dst_surface->container->resource.format_flags; if (src_surface) { if (dst_surface->resource.format->id != src_surface->resource.format->id) @@ -4599,7 +4599,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * } wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_surface->resource.format; - src_fmt_flags = src_surface->resource.format_flags; + src_fmt_flags = src_surface->container->resource.format_flags; } else { @@ -5238,9 +5238,11 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC || src_rect.bottom - src_rect.top != dst_rect.bottom - dst_rect.top); convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; - dst_ds_flags = dst_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds_flags = dst_surface->container->resource.format_flags + & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) - src_ds_flags = src_surface->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_ds_flags = src_surface->container->resource.format_flags + & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); else src_ds_flags = 0; @@ -5457,7 +5459,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text else surface->surface_ops = &surface_ops; - if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, container->resource.gl_type, + if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, WINED3D_GL_RES_TYPE_COUNT, format, desc->multisample_type, multisample_quality, desc->usage, desc->pool, desc->width, desc->height, 1, resource_size, NULL, &wined3d_null_parent_ops, &surface_resource_ops))) {

1 0

Stefan Dösinger : wined3d: Read format flags from the volume container.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 4451bf477a56cd35b582bf0ed39f27d3818bff80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4451bf477a56cd35b582bf0ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 6 17:53:51 2015 +0200 wined3d: Read format flags from the volume container. --- dlls/wined3d/resource.c | 5 +++-- dlls/wined3d/volume.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2bc1cc1..d5a0041 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -87,7 +87,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->type = type; resource->gl_type = gl_type; resource->format = format; - resource->format_flags = format->flags[gl_type]; + if (gl_type < WINED3D_GL_RES_TYPE_COUNT) + resource->format_flags = format->flags[gl_type]; resource->multisample_type = multisample_type; resource->multisample_quality = multisample_quality; resource->usage = usage; @@ -105,7 +106,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER) + if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER && gl_type < WINED3D_GL_RES_TYPE_COUNT) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(resource->format_flags & WINED3DFMT_FLAG_RENDERTARGET)) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 5241286..0f02f34 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -44,7 +44,7 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit { const struct wined3d_format *format = volume->resource.format; - if (volume->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -89,7 +89,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine if (data->buffer_object) ERR("Loading a converted volume from a PBO.\n"); - if (volume->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; @@ -551,7 +551,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info; BYTE *base_memory; const struct wined3d_format *format = volume->resource.format; - const unsigned int fmt_flags = volume->resource.format_flags; + const unsigned int fmt_flags = volume->container->resource.format_flags; TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); @@ -759,7 +759,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); - if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, container->resource.gl_type, + if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, WINED3D_GL_RES_TYPE_COUNT, format, WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->pool, desc->width, desc->height, desc->depth, size, NULL, &wined3d_null_parent_ops, &volume_resource_ops))) {

1 0

Sebastian Lackner : winedbg: Also output system information to the terminal, not only to dialog.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 766154975507e7c118c34a807a58432808db0dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=766154975507e7c118c34a807… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 30 01:25:47 2015 +0200 winedbg: Also output system information to the terminal, not only to dialog. --- programs/winedbg/tgt_active.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8cfce32..989e433 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -836,10 +836,10 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) dbg_interactiveP = TRUE; parser_handle(input); + output_system_info(); if (output != INVALID_HANDLE_VALUE) { - output_system_info(); SetEvent( event ); WaitForSingleObject( thread, INFINITE ); CloseHandle( output );

1 0

Nikolay Sivov : riched20: Improve error handling in SetFont (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 3681a59c298fdedfe0cfc13d1fbd42fb1d9d3b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3681a59c298fdedfe0cfc13d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:47:37 2015 +0300 riched20: Improve error handling in SetFont (Coverity). --- dlls/riched20/richole.c | 67 +++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1cb6589..d39bce7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -523,12 +523,13 @@ static inline const IRichEditOleImpl *get_range_reole(ITextRange *range) static void textrange_set_font(ITextRange *range, ITextFont *font) { CHARFORMAT2W fmt; + HRESULT hr; LONG value; BSTR str; FLOAT f; #define CHARFORMAT_SET_B_FIELD(mask, value) \ - if (value != tomUndefined) { \ + if (hr == S_OK && value != tomUndefined) { \ fmt.dwMask |= CFM_##mask; \ if (value == tomTrue) fmt.dwEffects |= CFE_##mask; \ } \ @@ -538,73 +539,73 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) fmt.cbSize = sizeof(fmt); value = tomUndefined; - ITextFont_GetAllCaps(font, &value); + hr = ITextFont_GetAllCaps(font, &value); CHARFORMAT_SET_B_FIELD(ALLCAPS, value); value = tomUndefined; - ITextFont_GetBold(font, &value); + hr = ITextFont_GetBold(font, &value); CHARFORMAT_SET_B_FIELD(BOLD, value); value = tomUndefined; - ITextFont_GetEmboss(font, &value); + hr = ITextFont_GetEmboss(font, &value); CHARFORMAT_SET_B_FIELD(EMBOSS, value); value = tomUndefined; - ITextFont_GetHidden(font, &value); + hr = ITextFont_GetHidden(font, &value); CHARFORMAT_SET_B_FIELD(HIDDEN, value); value = tomUndefined; - ITextFont_GetEngrave(font, &value); + hr = ITextFont_GetEngrave(font, &value); CHARFORMAT_SET_B_FIELD(IMPRINT, value); value = tomUndefined; - ITextFont_GetItalic(font, &value); + hr = ITextFont_GetItalic(font, &value); CHARFORMAT_SET_B_FIELD(ITALIC, value); value = tomUndefined; - ITextFont_GetOutline(font, &value); + hr = ITextFont_GetOutline(font, &value); CHARFORMAT_SET_B_FIELD(OUTLINE, value); value = tomUndefined; - ITextFont_GetProtected(font, &value); + hr = ITextFont_GetProtected(font, &value); CHARFORMAT_SET_B_FIELD(PROTECTED, value); value = tomUndefined; - ITextFont_GetShadow(font, &value); + hr = ITextFont_GetShadow(font, &value); CHARFORMAT_SET_B_FIELD(SHADOW, value); value = tomUndefined; - ITextFont_GetSmallCaps(font, &value); + hr = ITextFont_GetSmallCaps(font, &value); CHARFORMAT_SET_B_FIELD(SMALLCAPS, value); value = tomUndefined; - ITextFont_GetStrikeThrough(font, &value); + hr = ITextFont_GetStrikeThrough(font, &value); CHARFORMAT_SET_B_FIELD(STRIKEOUT, value); value = tomUndefined; - ITextFont_GetSubscript(font, &value); + hr = ITextFont_GetSubscript(font, &value); CHARFORMAT_SET_B_FIELD(SUBSCRIPT, value); value = tomUndefined; - ITextFont_GetSuperscript(font, &value); + hr = ITextFont_GetSuperscript(font, &value); CHARFORMAT_SET_B_FIELD(SUPERSCRIPT, value); value = tomUndefined; - ITextFont_GetUnderline(font, &value); + hr = ITextFont_GetUnderline(font, &value); CHARFORMAT_SET_B_FIELD(UNDERLINE, value); #undef CHARFORMAT_SET_B_FIELD value = tomUndefined; - ITextFont_GetAnimation(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetAnimation(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_ANIMATION; fmt.bAnimation = value; } value = tomUndefined; - ITextFont_GetBackColor(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetBackColor(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_BACKCOLOR; if (value == tomAutoColor) fmt.dwEffects |= CFE_AUTOBACKCOLOR; @@ -613,8 +614,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) } value = tomUndefined; - ITextFont_GetForeColor(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetForeColor(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_COLOR; if (value == tomAutoColor) fmt.dwEffects |= CFE_AUTOCOLOR; @@ -623,15 +624,15 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) } value = tomUndefined; - ITextFont_GetKerning(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetKerning(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_KERNING; fmt.wKerning = points_to_twips(f); } value = tomUndefined; - ITextFont_GetLanguageID(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetLanguageID(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_LCID; fmt.lcid = value; } @@ -642,26 +643,26 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) SysFreeString(str); } - ITextFont_GetPosition(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetPosition(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_OFFSET; fmt.yOffset = points_to_twips(f); } - ITextFont_GetSize(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetSize(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_SIZE; fmt.yHeight = points_to_twips(f); } - ITextFont_GetSpacing(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetSpacing(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_SPACING; fmt.sSpacing = f; } - ITextFont_GetWeight(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetWeight(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_WEIGHT; fmt.wWeight = value; }

1 0

Nikolay Sivov : riched20: Handle range method failures in InRange ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 26883637141441d88c3865b42d61f67a3668a489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26883637141441d88c3865b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:41:12 2015 +0300 riched20: Handle range method failures in InRange (Coverity). --- dlls/riched20/richole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 198061d..1cb6589 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2006,10 +2006,11 @@ static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG * if (!ret) ret = &v; - ITextRange_GetStart(range, &from); - ITextRange_GetEnd(range, &to); - - *ret = (start >= from && end <= to) ? tomTrue : tomFalse; + if (FAILED(ITextRange_GetStart(range, &from)) || FAILED(ITextRange_GetEnd(range, &to))) { + *ret = tomFalse; + } + else + *ret = (start >= from && end <= to) ? tomTrue : tomFalse; return *ret == tomTrue ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : riched20: Handle range method failures in IsEqual ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 3889dadcca1c5a0638168a3750cf566bb9d26543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3889dadcca1c5a0638168a375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:26:50 2015 +0300 riched20: Handle range method failures in IsEqual (Coverity). --- dlls/riched20/richole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b7f0298..198061d 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2048,10 +2048,11 @@ static HRESULT textrange_isequal(LONG start, LONG end, ITextRange *range, LONG * if (!ret) ret = &v; - ITextRange_GetStart(range, &from); - ITextRange_GetEnd(range, &to); - - *ret = (start == from && end == to) ? tomTrue : tomFalse; + if (FAILED(ITextRange_GetStart(range, &from)) || FAILED(ITextRange_GetEnd(range, &to))) { + *ret = tomFalse; + } + else + *ret = (start == from && end == to) ? tomTrue : tomFalse; return *ret == tomTrue ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : riched20: Implement GetDuplicate() for selection.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 5f933018a289125c180b83002f4a355ca3d20daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f933018a289125c180b83002… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 21:32:00 2015 +0300 riched20: Implement GetDuplicate() for selection. --- dlls/riched20/richole.c | 14 ++++++-- dlls/riched20/tests/richole.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 019a25f..b7f0298 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4223,14 +4223,22 @@ static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **ppRange) +static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **range) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG start, end; + + TRACE("(%p)->(%p)\n", This, range); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!range) + return E_INVALIDARG; + + ITextSelection_GetStart(me, &start); + ITextSelection_GetEnd(me, &end); + return CreateITextRange(This->reOle, start, end, range); } static HRESULT WINAPI ITextSelection_fnGetFormattedText(ITextSelection *me, ITextRange **ppRange) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 515b9ad..fd4d9e8 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3177,6 +3177,80 @@ static void test_GetStoryLength(void) ITextRange_Release(range); } +static void test_ITextSelection_GetDuplicate(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection, *sel2; + ITextRange *range, *range2; + ITextFont *font; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reOle, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + EXPECT_REF(selection, 2); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(range != range2, "got %p, %p\n", range, range2); + + EXPECT_REF(selection, 2); + EXPECT_REF(range, 1); + EXPECT_REF(range2, 1); + + ITextRange_Release(range2); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + + value = 0; + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 1, "got %d\n", value); + + value = 0; + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 2, "got %d\n", value); + + hr = ITextRange_QueryInterface(range, &IID_ITextSelection, (void**)&sel2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextSelection_GetDuplicate(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetDuplicate(selection, &range); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_GetFont(range, &font); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3211,4 +3285,5 @@ START_TEST(richole) test_SetFont(); test_InsertObject(); test_GetStoryLength(); + test_ITextSelection_GetDuplicate(); }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
61
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 June 2015