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

Matteo Bruni : wined3d: Remove unused return values from the YUV shader generation helpers in the ARBfp blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 40496c9083a0b1aaa12159879bfa604ff5b3106b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40496c9083a0b1aaa1215987… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:26 2018 +0430 wined3d: Remove unused return values from the YUV shader generation helpers in the ARBfp blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b796cd..ea07c3b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6936,8 +6936,8 @@ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3 heap_free(arbfp_blitter); } -static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_planar_yuv_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { char chroma; const char *tex, *texinstr = "TXP"; @@ -6985,13 +6985,12 @@ static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const stru shader_addline(buffer, "FLR texcrd.x, texcrd.x;\n"); shader_addline(buffer, "ADD texcrd.x, texcrd.x, coef.y;\n"); - /* Divide the x coordinate by 0.5 and get the fraction. This gives 0.25 and 0.75 for the - * even and odd pixels respectively - */ + /* Multiply the x coordinate by 0.5 and get the fraction. This gives 0.25 + * and 0.75 for the even and odd pixels respectively. */ shader_addline(buffer, "MUL texcrd2, texcrd, coef.y;\n"); shader_addline(buffer, "FRC texcrd2, texcrd2;\n"); - /* Sample Pixel 1 */ + /* Sample Pixel 1. */ shader_addline(buffer, "%s luminance, texcrd, texture[0], %s;\n", texinstr, tex); /* Put the value into either of the chroma values */ @@ -7020,12 +7019,10 @@ static BOOL gen_planar_yuv_read(struct wined3d_string_buffer *buffer, const stru /* This gives the correctly filtered luminance value */ shader_addline(buffer, "TEX luminance, fragment.texcoord[0], texture[0], %s;\n", tex); - - return TRUE; } -static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_yv12_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float yv12_coef[] @@ -7087,7 +7084,6 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb */ if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { - shader_addline(buffer, "RCP chroma.w, size.y;\n"); shader_addline(buffer, "MUL texcrd2.y, texcrd.y, size.y;\n"); @@ -7095,7 +7091,7 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "FLR texcrd2.y, texcrd2.y;\n"); shader_addline(buffer, "MAD texcrd.y, texcrd.y, yv12_coef.y, yv12_coef.x;\n"); - /* Read odd lines from the right side(add size * 0.5 to the x coordinate */ + /* Read odd lines from the right side (add size * 0.5 to the x coordinate). */ shader_addline(buffer, "ADD texcrd2.x, texcrd2.y, yv12_coef.y;\n"); /* To avoid 0.5 == 0.5 comparisons */ shader_addline(buffer, "FRC texcrd2.x, texcrd2.x;\n"); shader_addline(buffer, "SGE texcrd2.x, texcrd2.x, coef.y;\n"); @@ -7109,11 +7105,11 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb } else { - /* Read from [size - size+size/4] */ + /* The y coordinate for V is in the range [size, size + size / 4). */ shader_addline(buffer, "FLR texcrd.y, texcrd.y;\n"); shader_addline(buffer, "MAD texcrd.y, texcrd.y, coef.w, size.y;\n"); - /* Read odd lines from the right side(add size * 0.5 to the x coordinate */ + /* Read odd lines from the right side (add size * 0.5 to the x coordinate). */ shader_addline(buffer, "ADD texcrd2.x, texcrd.y, yv12_coef.y;\n"); /* To avoid 0.5 == 0.5 comparisons */ shader_addline(buffer, "FRC texcrd2.x, texcrd2.x;\n"); shader_addline(buffer, "SGE texcrd2.x, texcrd2.x, coef.y;\n"); @@ -7169,12 +7165,10 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "TEX luminance, texcrd, texture[0], %s;\n", tex); } *luminance = 'a'; - - return TRUE; } -static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arbfp_blit_type *type, - char *luminance) +static void gen_nv12_read(struct wined3d_string_buffer *buffer, + const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float nv12_coef[] @@ -7250,7 +7244,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb } else { - /* Read from [size - size+size/2] */ + /* The y coordinate for chroma is in the range [size, size + size / 2). */ shader_addline(buffer, "MAD texcrd.y, texcrd.y, coef.y, size.y;\n"); shader_addline(buffer, "FLR texcrd.x, texcrd.x;\n"); @@ -7305,8 +7299,6 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb shader_addline(buffer, "TEX luminance, texcrd, texture[0], %s;\n", tex); } *luminance = 'a'; - - return TRUE; } /* Context activation is done by the caller. */ @@ -7472,27 +7464,15 @@ static GLuint gen_yuv_shader(const struct wined3d_gl_info *gl_info, const struct { case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YUY2: - if (!gen_planar_yuv_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_planar_yuv_read(&buffer, type, &luminance_component); break; case COMPLEX_FIXUP_YV12: - if (!gen_yv12_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_yv12_read(&buffer, type, &luminance_component); break; case COMPLEX_FIXUP_NV12: - if (!gen_nv12_read(&buffer, type, &luminance_component)) - { - string_buffer_free(&buffer); - return 0; - } + gen_nv12_read(&buffer, type, &luminance_component); break; default:

1 0

Matteo Bruni : wined3d: Implement source fixups in the GLSL blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: aa59d40a18b0754b6468c3dd71f8db8d02357d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa59d40a18b0754b6468c3dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:27 2018 +0430 wined3d: Implement source fixups in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e27b0ff..e839369 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12270,8 +12270,8 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter "\n" "void main()\n" "{\n"; + struct wined3d_string_buffer *buffer, *string; GLuint program, vshader_id, fshader_id; - struct wined3d_string_buffer *buffer; const char *tex_type, *swizzle, *ptr; unsigned int i; @@ -12314,9 +12314,14 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); if (!needs_legacy_glsl_syntax(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); + shader_addline(buffer, fshader_header); - shader_addline(buffer, " %s[0] = texture%s(sampler, out_texcoord.%s);\n", - get_fragment_output(gl_info), needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); + string = string_buffer_get(&blitter->string_buffers); + string_buffer_sprintf(string, "%s[0]", get_fragment_output(gl_info)); + shader_addline(buffer, " %s = texture%s(sampler, out_texcoord.%s);\n", + string->buffer, needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); + shader_glsl_color_correction_ext(buffer, string->buffer, WINED3DSP_WRITEMASK_ALL, args->fixup); + string_buffer_release(&blitter->string_buffers, string); shader_addline(buffer, "}\n"); ptr = buffer->buffer; @@ -12436,9 +12441,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } - if (!is_identity_fixup(src_format->color_fixup)) + if (is_complex_fixup(src_format->color_fixup)) { - TRACE("Source fixups are not supported.\n"); + TRACE("Complex source fixups are not supported.\n"); return FALSE; }

1 0

Matteo Bruni : wined3d: Use staging resources to blit from CPU resources in the GLSL blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 29d506939e485963694404313fb44020e0da5e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d506939e48596369440431… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:28 2018 +0430 wined3d: Use staging resources to blit from CPU resources in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 49 ++++++++++++++++++++++++++++---- dlls/wined3d/surface.c | 64 ++++++------------------------------------ dlls/wined3d/texture.c | 46 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 100 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29d506939e4859636944…

1 0

Matteo Bruni : wined3d: Use staging resources to blit from CPU resources in the ARBfp blitter.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 8e1451c51028eb919e5ffdbea4d7a92ea13085f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1451c51028eb919e5ffdbe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 16 18:17:29 2018 +0430 wined3d: Use staging resources to blit from CPU resources in the ARBfp blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 49 +++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ea07c3b..7d3f547 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7789,9 +7789,11 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_device *device = dst_texture->resource.device; + struct wined3d_texture *staging_texture = NULL; struct wined3d_arbfp_blitter *arbfp_blitter; struct wined3d_color_key alpha_test_key; struct wined3d_blitter *next; + unsigned int src_level; RECT s, d; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -7816,14 +7818,45 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); - /* Now load the surface */ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) + { + struct wined3d_resource_desc desc; + struct wined3d_box upload_box; + HRESULT hr; + + TRACE("Source texture is not GPU accessible, creating a staging texture.\n"); + + src_level = src_sub_resource_idx % src_texture->level_count; + desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; + desc.format = src_texture->resource.format->id; + desc.multisample_type = src_texture->resource.multisample_type; + desc.multisample_quality = src_texture->resource.multisample_quality; + desc.usage = WINED3DUSAGE_PRIVATE; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.width = wined3d_texture_get_level_width(src_texture, src_level); + desc.height = wined3d_texture_get_level_height(src_texture, src_level); + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, + NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) + { + ERR("Failed to create staging texture, hr %#x.\n", hr); + return dst_location; + } + + wined3d_box_set(&upload_box, 0, 0, desc.width, desc.height, 0, desc.depth); + wined3d_texture_upload_from_texture(staging_texture, 0, 0, 0, 0, + src_texture, src_sub_resource_idx, &upload_box); + + src_texture = staging_texture; + src_sub_resource_idx = 0; + } + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_texture->sub_resources[src_sub_resource_idx].locations - & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) - == WINED3D_LOCATION_DRAWABLE + & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) == WINED3D_LOCATION_DRAWABLE && !wined3d_resource_is_offscreen(&src_texture->resource)) { - unsigned int src_level = src_sub_resource_idx % src_texture->level_count; /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can @@ -7833,12 +7866,15 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); s = *src_rect; + src_level = src_sub_resource_idx % src_texture->level_count; s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; s.bottom = wined3d_texture_get_level_height(src_texture, src_level) - s.bottom; src_rect = &s; } else + { wined3d_texture_load(src_texture, context, FALSE); + } context_apply_ffp_blit_state(context, device); @@ -7889,6 +7925,9 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) context->gl_info->gl_ops.gl.p_glFlush(); + if (staging_texture) + wined3d_texture_decref(staging_texture); + return dst_location; }

1 0

Henri Verbeet : wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 70c5dc64fc02408c6f7233c996e0ffdc5dc4a5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c5dc64fc02408c6f7233c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 18:17:30 2018 +0430 wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 +--- dlls/wined3d/wined3d_private.h | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5a37fad..5bcd244 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4346,10 +4346,9 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat && !use_vs(state) && !context->use_immediate_mode_draw; if (isStateDirty(context, STATE_VDECL)) return; - if (context->numberedArraysLoaded && !load_numbered) + if (context->numbered_array_mask && !load_numbered) { unload_numbered_arrays(context); - context->numberedArraysLoaded = FALSE; context->numbered_array_mask = 0; } else if (context->namedArraysLoaded) @@ -4362,7 +4361,6 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat { TRACE("Loading numbered arrays\n"); load_numbered_arrays(context, &context->stream_info, state); - context->numberedArraysLoaded = TRUE; } else if (load_named) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24d9232..7e6a87f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1883,7 +1883,7 @@ struct wined3d_context DWORD last_was_vshader : 1; DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; - DWORD numberedArraysLoaded : 1; + DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; DWORD fog_coord : 1; @@ -1892,6 +1892,7 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; + DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ @@ -1900,6 +1901,7 @@ struct wined3d_context DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; + DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; @@ -1911,11 +1913,10 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD last_was_ffp_blit : 1; - DWORD padding : 8; + DWORD padding : 9; DWORD constant_update_mask; - DWORD numbered_array_mask; + DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ GLenum untracked_materials[2]; UINT blit_w, blit_h;

1 0

Jactry Zeng : riched20: Check para before use in ME_PrevRun.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: ea7186348f48a749ab28ecc405fb56601c56e4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7186348f48a749ab28ecc4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:56:44 2018 +0800 riched20: Check para before use in ME_PrevRun. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 58b64e8..8c4f0de 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -97,7 +97,7 @@ BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) { if (p->type == diParagraph) { if (!all_para) return FALSE; - if (p->member.para.prev_para->type == diParagraph) + if (para && p->member.para.prev_para->type == diParagraph) *para = p->member.para.prev_para; } else if (p->type == diRun) { *run = p;

1 0

Jactry Zeng : riched20: Save reobj in linked list.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 0154b59c7eb28613342def98dc580083695d8833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0154b59c7eb28613342def98… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:56:54 2018 +0800 riched20: Save reobj in linked list. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 32 ++++++++++++++++++++++++++++++-- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 9 ++++++++- dlls/riched20/list.c | 6 +++++- dlls/riched20/richole.c | 30 +++++++++++++++--------------- dlls/riched20/run.c | 2 +- dlls/riched20/writer.c | 6 +++--- 8 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d676a1b..1d35696 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -471,12 +471,26 @@ ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor, return ME_InsertRunAtCursor(editor, p, style, str, len, flags); } +static struct re_object* create_re_object(const REOBJECT *reo) +{ + struct re_object *reobj = heap_alloc(sizeof(*reobj)); + + if (!reobj) + { + WARN("Fail to allocate re_object.\n"); + return NULL; + } + ME_CopyReObject(&reobj->obj, reo); + return reobj; +} void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); ME_DisplayItem *di; WCHAR space = ' '; + ME_DisplayItem *di_prev = NULL; + struct re_object *reobj_prev = NULL; /* FIXME no no no */ if (ME_IsSelection(editor)) @@ -484,8 +498,22 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, MERF_GRAPHICS); - di->member.run.ole_obj = heap_alloc(sizeof(*reo)); - ME_CopyReObject(di->member.run.ole_obj, reo); + di->member.run.reobj = create_re_object(reo); + + di_prev = di; + while (ME_PrevRun(NULL, &di_prev, TRUE)) + { + if (di_prev->member.run.reobj) + { + reobj_prev = di_prev->member.run.reobj; + break; + } + } + if (reobj_prev) + list_add_after(&reobj_prev->entry, &di->member.run.reobj->entry); + else + list_add_head(&editor->reobj_list, &di->member.run.reobj->entry); + ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c442512..c57d3ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3113,6 +3113,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; list_init( &ed->style_list ); + list_init( &ed->reobj_list ); OleInitialize(NULL); return ed; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0db5326..1a9bec3 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -232,7 +232,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; -void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; +void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a37c4de..206ce85 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -153,6 +153,12 @@ typedef enum { struct tagME_DisplayItem; +struct re_object +{ + struct list entry; + REOBJECT obj; +}; + typedef struct tagME_Run { ME_Style *style; @@ -163,7 +169,7 @@ typedef struct tagME_Run int nFlags; int nAscent, nDescent; /* pixels above/below baseline */ POINT pt; /* relative to para's position */ - REOBJECT *ole_obj; /* FIXME: should be a union with strText (at least) */ + struct re_object *reobj; /* FIXME: should be a union with strText (at least) */ SCRIPT_ANALYSIS script_analysis; int num_glyphs, max_glyphs; @@ -436,6 +442,7 @@ typedef struct tagME_TextEditor BOOL bMouseCaptured; int wheel_remain; struct list style_list; + struct list reobj_list; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 8c4f0de..ba35a90 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -169,7 +169,11 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) if (item->type==diRun) { - if (item->member.run.ole_obj) ME_DeleteReObject(item->member.run.ole_obj); + if (item->member.run.reobj) + { + list_remove(&item->member.run.reobj->entry); + ME_DeleteReObject(item->member.run.reobj); + } heap_free( item->member.run.glyphs ); heap_free( item->member.run.clusters ); ME_ReleaseStyle(item->member.run.style); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c19a2e7..ef985fe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5284,11 +5284,11 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) ENHMETAHEADER emh; assert(run->nFlags & MERF_GRAPHICS); - assert(run->ole_obj); + assert(run->reobj); - if (run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0) + if (run->reobj->obj.sizel.cx != 0 || run->reobj->obj.sizel.cy != 0) { - convert_sizel(c, &run->ole_obj->sizel, pSize); + convert_sizel(c, &run->reobj->obj.sizel, pSize); if (c->editor->nZoomNumerator != 0) { pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); @@ -5297,13 +5297,13 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } - if (!run->ole_obj->poleobj) + if (!run->reobj->obj.poleobj) { pSize->cx = pSize->cy = 0; return; } - if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); pSize->cx = pSize->cy = 0; @@ -5366,13 +5366,13 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) RECT rc; assert(run->nFlags & MERF_GRAPHICS); - assert(run->ole_obj); - if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) + assert(run->reobj); + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Couldn't get interface\n"); return; } - has_size = run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0; + has_size = run->reobj->obj.sizel.cx != 0 || run->reobj->obj.sizel.cy != 0; fmt.cfFormat = CF_BITMAP; fmt.ptd = NULL; fmt.dwAspect = DVASPECT_CONTENT; @@ -5399,7 +5399,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) old_bm = SelectObject(hMemDC, stgm.u.hBitmap); if (has_size) { - convert_sizel(c, &run->ole_obj->sizel, &sz); + convert_sizel(c, &run->reobj->obj.sizel, &sz); } else { sz.cx = dibsect.dsBm.bmWidth; sz.cy = dibsect.dsBm.bmHeight; @@ -5419,7 +5419,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); if (has_size) { - convert_sizel(c, &run->ole_obj->sizel, &sz); + convert_sizel(c, &run->reobj->obj.sizel, &sz); } else { sz.cx = emh.rclBounds.right - emh.rclBounds.left; sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; @@ -5447,12 +5447,12 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); } -void ME_DeleteReObject(REOBJECT* reo) +void ME_DeleteReObject(struct re_object *reobj) { - if (reo->poleobj) IOleObject_Release(reo->poleobj); - if (reo->pstg) IStorage_Release(reo->pstg); - if (reo->polesite) IOleClientSite_Release(reo->polesite); - heap_free(reo); + if (reobj->obj.poleobj) IOleObject_Release(reobj->obj.poleobj); + if (reobj->obj.pstg) IStorage_Release(reobj->obj.pstg); + if (reobj->obj.polesite) IOleClientSite_Release(reobj->obj.polesite); + heap_free(reobj); } void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 098c4f8..73adc7e 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -290,7 +290,7 @@ ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) { ME_DisplayItem *item = ME_MakeDI(diRun); item->member.run.style = s; - item->member.run.ole_obj = NULL; + item->member.run.reobj = NULL; item->member.run.nFlags = nFlags; item->member.run.nCharOfs = -1; item->member.run.len = 0; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index aad2e44..b1e99d6 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -947,7 +947,7 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, SIZE goal, pic; ME_Context c; - hr = IOleObject_QueryInterface( run->ole_obj->poleobj, &IID_IDataObject, (void **)&data ); + hr = IOleObject_QueryInterface( run->reobj->obj.poleobj, &IID_IDataObject, (void **)&data ); if (FAILED(hr)) return FALSE; ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); @@ -975,8 +975,8 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, emf_bits->szlMillimeters.cy * c.dpi.cy * 10 ); /* convert goal size to twips */ - goal.cx = MulDiv( run->ole_obj->sizel.cx, 144, 254 ); - goal.cy = MulDiv( run->ole_obj->sizel.cy, 144, 254 ); + goal.cx = MulDiv( run->reobj->obj.sizel.cx, 144, 254 ); + goal.cy = MulDiv( run->reobj->obj.sizel.cy, 144, 254 ); if (!ME_StreamOutPrint( stream, "{\\*\\shppict{\\pict\\emfblip\\picw%d\\pich%d\\picwgoal%d\\pichgoal%d\n", pic.cx, pic.cy, goal.cx, goal.cy ))

1 0

Jactry Zeng : riched20: Implement IRichEditOle::GetObjectCount.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 2ab2c51df331de1e0796eb0b37b5a6d02b3d7a7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ab2c51df331de1e0796eb0b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:57:07 2018 +0800 riched20: Implement IRichEditOle::GetObjectCount. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index ef985fe..6b2ef41 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1379,8 +1379,8 @@ static LONG WINAPI IRichEditOle_fnGetObjectCount(IRichEditOle *me) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); - return 0; + TRACE("(%p)\n",This); + return list_count(&This->editor->reobj_list); } static HRESULT WINAPI

1 0

Jactry Zeng : riched20: Implement IRichEditOle::GetObject.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 7409454345e5d0e1a6bae33525754c7687ba1e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7409454345e5d0e1a6bae335… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:57:15 2018 +0800 riched20: Implement IRichEditOle::GetObject. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1d35696..4664f0c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -480,7 +480,7 @@ static struct re_object* create_re_object(const REOBJECT *reo) WARN("Fail to allocate re_object.\n"); return NULL; } - ME_CopyReObject(&reobj->obj, reo); + ME_CopyReObject(&reobj->obj, reo, REO_GETOBJ_ALL_INTERFACES); return reobj; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1a9bec3..0f0e56e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -231,7 +231,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; -void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; +void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6b2ef41..5c7be5e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1371,8 +1371,38 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, REOBJECT *lpreobject, DWORD dwFlags) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); - return E_NOTIMPL; + struct re_object *reobj = NULL; + LONG count = 0; + + TRACE("(%p)->(%x, %p, %x)\n", This, iob, lpreobject, dwFlags); + + if (!lpreobject || !lpreobject->cbStruct) + return E_INVALIDARG; + + if (iob == REO_IOB_USE_CP) + { + ME_Cursor cursor; + + TRACE("character offset: %d\n", lpreobject->cp); + ME_CursorFromCharOfs(This->editor, lpreobject->cp, &cursor); + if (!cursor.pRun->member.run.reobj) + return E_INVALIDARG; + else + reobj = cursor.pRun->member.run.reobj; + } + else + { + if (iob > IRichEditOle_GetObjectCount(me)) + return E_INVALIDARG; + LIST_FOR_EACH_ENTRY(reobj, &This->editor->reobj_list, struct re_object, entry) + { + if (count == iob) + break; + count++; + } + } + ME_CopyReObject(lpreobject, &reobj->obj, dwFlags); + return S_OK; } static LONG WINAPI @@ -5455,13 +5485,28 @@ void ME_DeleteReObject(struct re_object *reobj) heap_free(reobj); } -void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) +void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) { *dst = *src; + dst->poleobj = NULL; + dst->pstg = NULL; + dst->polesite = NULL; - if (dst->poleobj) IOleObject_AddRef(dst->poleobj); - if (dst->pstg) IStorage_AddRef(dst->pstg); - if (dst->polesite) IOleClientSite_AddRef(dst->polesite); + if ((flags & REO_GETOBJ_POLEOBJ) && src->poleobj) + { + dst->poleobj = src->poleobj; + IOleObject_AddRef(dst->poleobj); + } + if ((flags & REO_GETOBJ_PSTG) && src->pstg) + { + dst->pstg = src->pstg; + IStorage_AddRef(dst->pstg); + } + if ((flags & REO_GETOBJ_POLESITE) && src->polesite) + { + dst->polesite = src->polesite; + IOleClientSite_AddRef(dst->polesite); + } } void ME_GetITextDocumentInterface(IRichEditOle *iface, LPVOID *ppvObj)

1 0

Jactry Zeng : riched20/tests: Add tests for IRichEditOle::{GetObject, GetObjectCount}.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: c964674e82fac57c9cbdd8e986c67111e7fbef9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c964674e82fac57c9cbdd8e9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Apr 13 15:57:21 2018 +0800 riched20/tests: Add tests for IRichEditOle::{GetObject,GetObjectCount}. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 145 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 129 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 97f8e46..c4fe425 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3132,39 +3132,152 @@ static void test_SetFont(void) ITextSelection_Release(selection); } +static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, + LPSTORAGE pstg, LPOLECLIENTSITE polesite, LONG sizel_cx, + LONG sizel_cy, DWORD aspect, DWORD flags, DWORD user) +{ + reobj->cbStruct = sizeof(*reobj); + reobj->clsid = CLSID_NULL; + reobj->cp = cp; + reobj->poleobj = poleobj; + reobj->pstg = pstg; + reobj->polesite = polesite; + reobj->sizel.cx = sizel_cx; + reobj->sizel.cy = sizel_cy; + reobj->dvaspect = aspect; + reobj->dwFlags = flags; + reobj->dwUser = user; +} + +#define CHECK_REOBJECT_STRUCT(reobj,poleobj,pstg,polesite,user) \ + _check_reobject_struct(reobj, poleobj, pstg, polesite, user, __LINE__) +static void _check_reobject_struct(REOBJECT reobj, LPOLEOBJECT poleobj, LPSTORAGE pstg, + LPOLECLIENTSITE polesite, DWORD user, int line) +{ + ok_(__FILE__,line)(reobj.poleobj == poleobj, "got wrong object interface.\n"); + ok_(__FILE__,line)(reobj.pstg == pstg, "got wrong storage interface.\n"); + ok_(__FILE__,line)(reobj.polesite == polesite, "got wrong site interface.\n"); + ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); +} + static void test_InsertObject(void) { + static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; ITextDocument *doc = NULL; IOleClientSite *clientsite; - REOBJECT reo; + REOBJECT reo1, reo2, reo3, received_reo1, received_reo2, received_reo3, received_reo4; HRESULT hr; HWND hwnd; + LONG count; create_interfaces(&hwnd, &reole, &doc, NULL); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* insert object1 in (0, 1)*/ + SendMessageA(hwnd, EM_SETSEL, 0, 1); hr = IRichEditOle_GetClientSite(reole, &clientsite); - ok(hr == S_OK, "got 0x%08x\n", hr); - - reo.cbStruct = sizeof(reo); - reo.cp = 0; - memset(&reo.clsid, 0, sizeof(reo.clsid)); - reo.poleobj = NULL; - reo.pstg = NULL; - reo.polesite = clientsite; - reo.sizel.cx = 10; - reo.sizel.cy = 10; - reo.dvaspect = DVASPECT_CONTENT; - reo.dwFlags = 0; - reo.dwUser = 0; + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo1, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 1); + hr = IRichEditOle_InsertObject(reole, &reo1); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + count = IRichEditOle_GetObjectCount(reole); + ok(count == 1, "got wrong object count: %d\n", count); + IOleClientSite_Release(clientsite); - hr = IRichEditOle_InsertObject(reole, &reo); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* insert object2 in (2, 3)*/ + SendMessageA(hwnd, EM_SETSEL, 2, 3); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo2, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 2); + hr = IRichEditOle_InsertObject(reole, &reo2); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + count = IRichEditOle_GetObjectCount(reole); + ok(count == 2, "got wrong object count: %d\n", count); + IOleClientSite_Release(clientsite); + /* insert object3 in (1, 2)*/ + SendMessageA(hwnd, EM_SETSEL, 1, 2); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo3, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 3); + hr = IRichEditOle_InsertObject(reole, &reo3); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + count = IRichEditOle_GetObjectCount(reole); + ok(count == 3, "got wrong object count: %d\n", count); IOleClientSite_Release(clientsite); + + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ + received_reo1.cbStruct = sizeof(received_reo1); + hr = IRichEditOle_GetObject(reole, 0, &received_reo1, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo1, NULL, NULL, reo1.polesite, 1); + + received_reo2.cbStruct = sizeof(received_reo2); + hr = IRichEditOle_GetObject(reole, 1, &received_reo2, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo2, NULL, NULL, reo3.polesite, 3); + + received_reo3.cbStruct = sizeof(received_reo3); + hr = IRichEditOle_GetObject(reole, 2, &received_reo3, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo3, NULL, NULL, reo2.polesite, 2); + + hr = IRichEditOle_GetObject(reole, 2, NULL, REO_GETOBJ_ALL_INTERFACES); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + + received_reo4.cbStruct = 0; + hr = IRichEditOle_GetObject(reole, 2, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + + received_reo4.cbStruct = sizeof(received_reo4); + hr = IRichEditOle_GetObject(reole, 2, &received_reo4, REO_GETOBJ_PSTG); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, NULL, 2); + + hr = IRichEditOle_GetObject(reole, 2, &received_reo4, REO_GETOBJ_POLESITE); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo2.polesite, 2); + + hr = IRichEditOle_GetObject(reole, 4, &received_reo4, REO_GETOBJ_POLESITE); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + + hr = IRichEditOle_GetObject(reole, 1024, &received_reo4, REO_GETOBJ_POLESITE); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + + /* received_reo4 will be zeroed before be used */ + hr = IRichEditOle_GetObject(reole, 2, &received_reo4, REO_GETOBJ_NO_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, NULL, 2); + + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_USE_CP, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo1.polesite, 1); + + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 1; + hr = IRichEditOle_GetObject(reole, REO_IOB_USE_CP, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo3.polesite, 3); + + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 2; + hr = IRichEditOle_GetObject(reole, REO_IOB_USE_CP, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo2.polesite, 2); + + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 4; + hr = IRichEditOle_GetObject(reole, REO_IOB_USE_CP, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + /* received_reo4 didn't be zeroed in E_INVALIDARG case */ + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo2.polesite, 2); + release_interfaces(&hwnd, &reole, &doc, NULL); }

1 0