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

Matteo Bruni : wined3d: Introduce a get_pointsize_minmax() function.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 36520c3e9def099173be8bd90a328d54081ced08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36520c3e9def099173be8bd90… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:03 2015 +0200 wined3d: Introduce a get_pointsize_minmax() function. --- dlls/wined3d/state.c | 56 +++++++++++------------------------------- dlls/wined3d/utils.c | 19 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 40b04e7..c0a87d3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1419,67 +1419,39 @@ static void state_normalize(struct wined3d_context *context, const struct wined3 void state_psizemin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - union { - DWORD d; - float f; - } tmpvalue; + float min, max; - tmpvalue.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - if (tmpvalue.f != 1.0f) - { - FIXME("WINED3D_RS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f); - } - tmpvalue.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; - if (tmpvalue.f != 64.0f) - { - FIXME("WINED3D_RS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f); - } + get_pointsize_minmax(context, state, &min, &max); + if (min != 1.0f) + FIXME("WINED3D_RS_POINTSIZE_MIN value %.8e not supported on this OpenGL implementation.\n", min); + if (max != 64.0f) + FIXME("WINED3D_RS_POINTSIZE_MAX value %.8e not supported on this OpenGL implementation.\n", max); } void state_psizemin_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - union - { - DWORD d; - float f; - } min, max; + float min, max; - min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; + get_pointsize_minmax(context, state, &min, &max); - /* Max point size trumps min point size */ - if(min.f > max.f) { - min.f = max.f; - } - - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, min.f); + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, min); checkGLcall("glPointParameterfEXT(...)"); - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, max.f); + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, max); checkGLcall("glPointParameterfEXT(...)"); } void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - union - { - DWORD d; - float f; - } min, max; + float min, max; - min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; - max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; - - /* Max point size trumps min point size */ - if(min.f > max.f) { - min.f = max.f; - } + get_pointsize_minmax(context, state, &min, &max); - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, min.f); + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, min); checkGLcall("glPointParameterfARB(...)"); - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, max.f); + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, max); checkGLcall("glPointParameterfARB(...)"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd9b710..9084626 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3603,6 +3603,25 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine } } +void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_min, float *out_max) +{ + union + { + DWORD d; + float f; + } min, max; + + min.d = state->render_states[WINED3D_RS_POINTSIZE_MIN]; + max.d = state->render_states[WINED3D_RS_POINTSIZE_MAX]; + + if (min.f > max.f) + min.f = max.f; + + *out_min = min.f; + *out_max = max.f; +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8215eac..a79d8b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3070,6 +3070,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_texture_matrix(const struct wined3d_context *context, const struct wined3d_state *state, unsigned int tex, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; +void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_min, float *out_max) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Introduce a get_pointsize() function.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 953a45303c28d23d2edb9c3e96ce549d72590919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953a45303c28d23d2edb9c3e9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:04 2015 +0200 wined3d: Introduce a get_pointsize() function. --- dlls/wined3d/state.c | 31 ++++--------------------------- dlls/wined3d/utils.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c0a87d3..37f4498 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1458,33 +1458,10 @@ void state_psizemin_arb(struct wined3d_context *context, const struct wined3d_st void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - /* TODO: Group this with the viewport */ - /* - * POINTSCALEENABLE controls how point size value is treated. If set to - * true, the point size is scaled with respect to height of viewport. - * When set to false point size is in pixels. - */ - - /* Default values */ - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - union { - DWORD d; - float f; - } pointSize, A, B, C; + float att[3]; + float pointsize; - pointSize.d = state->render_states[WINED3D_RS_POINTSIZE]; - A.d = state->render_states[WINED3D_RS_POINTSCALE_A]; - B.d = state->render_states[WINED3D_RS_POINTSCALE_B]; - C.d = state->render_states[WINED3D_RS_POINTSCALE_C]; - - if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) - { - float scale_factor = state->viewport.height * state->viewport.height; - - att[0] = A.f / scale_factor; - att[1] = B.f / scale_factor; - att[2] = C.f / scale_factor; - } + get_pointsize(context, state, &pointsize, att); if (gl_info->supported[ARB_POINT_PARAMETERS]) { @@ -1501,7 +1478,7 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s WARN("POINT_PARAMETERS not supported in this version of opengl\n"); } - gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN)); + gl_info->gl_ops.gl.p_glPointSize(max(pointsize, FLT_MIN)); checkGLcall("glPointSize(...);"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9084626..5ad82bd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3622,6 +3622,38 @@ void get_pointsize_minmax(const struct wined3d_context *context, const struct wi *out_max = max.f; } +void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_pointsize, float *out_att) +{ + /* POINTSCALEENABLE controls how point size value is treated. If set to + * true, the point size is scaled with respect to height of viewport. + * When set to false point size is in pixels. */ + union + { + DWORD d; + float f; + } pointsize, a, b, c; + + out_att[0] = 1.0f; + out_att[1] = 0.0f; + out_att[2] = 0.0f; + + pointsize.d = state->render_states[WINED3D_RS_POINTSIZE]; + a.d = state->render_states[WINED3D_RS_POINTSCALE_A]; + b.d = state->render_states[WINED3D_RS_POINTSCALE_B]; + c.d = state->render_states[WINED3D_RS_POINTSCALE_C]; + + if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) + { + float scale_factor = state->viewport.height * state->viewport.height; + + out_att[0] = a.f / scale_factor; + out_att[1] = b.f / scale_factor; + out_att[2] = c.f / scale_factor; + } + *out_pointsize = pointsize.f; +} + /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79d8b0..7f85317 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3072,6 +3072,8 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, float *out_min, float *out_max) DECLSPEC_HIDDEN; +void get_pointsize(const struct wined3d_context *context, const struct wined3d_state *state, + float *out_pointsize, float *out_att) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Avoid the builtin uniforms for point size when using the fixed function vertex pipeline.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 90af08c3b148c37d074c38c2861a8672032c020b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90af08c3b148c37d074c38c28… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:05 2015 +0200 wined3d: Avoid the builtin uniforms for point size when using the fixed function vertex pipeline. --- dlls/wined3d/glsl_shader.c | 103 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 29 ++++++------ 2 files changed, 110 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90af08c3b148c37d074c3…

1 0

Nikolay Sivov : dwrite: Implement GetGlyphOrientationTransform().
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: a921941a171a6194c92242a1c0b9af9aa2fe190b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921941a171a6194c92242a1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 19:12:03 2015 +0300 dwrite: Implement GetGlyphOrientationTransform(). --- dlls/dwrite/analyzer.c | 66 ++++++++++++++++++-- dlls/dwrite/tests/analyzer.c | 145 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b4be9f7..a1beeb3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1320,8 +1320,8 @@ static HRESULT WINAPI dwritetextanalyzer1_AnalyzeVerticalGlyphOrientation(IDWrit static HRESULT WINAPI dwritetextanalyzer1_GetGlyphOrientationTransform(IDWriteTextAnalyzer2 *iface, DWRITE_GLYPH_ORIENTATION_ANGLE angle, BOOL is_sideways, DWRITE_MATRIX *transform) { - FIXME("(%d %d %p): stub\n", angle, is_sideways, transform); - return E_NOTIMPL; + TRACE("(%d %d %p)\n", angle, is_sideways, transform); + return IDWriteTextAnalyzer2_GetGlyphOrientationTransform(iface, angle, is_sideways, 0.0, 0.0, transform); } static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyzer2 *iface, DWRITE_SCRIPT_ANALYSIS sa, @@ -1425,10 +1425,66 @@ static HRESULT WINAPI dwritetextanalyzer1_GetJustifiedGlyphs(IDWriteTextAnalyzer } static HRESULT WINAPI dwritetextanalyzer2_GetGlyphOrientationTransform(IDWriteTextAnalyzer2 *iface, - DWRITE_GLYPH_ORIENTATION_ANGLE angle, BOOL is_sideways, FLOAT originX, FLOAT originY, DWRITE_MATRIX *transform) + DWRITE_GLYPH_ORIENTATION_ANGLE angle, BOOL is_sideways, FLOAT originX, FLOAT originY, DWRITE_MATRIX *m) { - FIXME("(%d %d %.2f %.2f %p): stub\n", angle, is_sideways, originX, originY, transform); - return E_NOTIMPL; + static const DWRITE_MATRIX transforms[] = { + { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, + { 0.0, 1.0, -1.0, 0.0, 0.0, 0.0 }, + { -1.0, 0.0, 0.0, -1.0, 0.0, 0.0 }, + { 0.0, -1.0, 1.0, 0.0, 0.0, 0.0 } + }; + + TRACE("(%d %d %.2f %.2f %p)\n", angle, is_sideways, originX, originY, m); + + if ((UINT32)angle > DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES) { + memset(m, 0, sizeof(*m)); + return E_INVALIDARG; + } + + /* for sideways case simply rotate 90 degrees more */ + if (is_sideways) { + switch (angle) { + case DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES; + break; + default: + ; + } + } + + *m = transforms[angle]; + + /* shift components represent transform necessary to get from original point to + rotated one in new coordinate system */ + if ((originX != 0.0 || originY != 0.0) && angle != DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES) { + const DWRITE_MATRIX *p; + + switch (angle) { + case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; + break; + default: + ; + } + + p = &transforms[angle]; + m->dx = originX - (p->m11 * originX + p->m12 * originY); + m->dy = originY - (p->m21 * originX + p->m22 * originY); + } + + return S_OK; } static HRESULT WINAPI dwritetextanalyzer2_GetTypographicFeatures(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index ffa4aed..15814c0 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -21,6 +21,7 @@ #define COBJMACROS #include <assert.h> +#include <stdio.h> #include "initguid.h" #include "windows.h" @@ -1669,6 +1670,149 @@ static void test_ApplyCharacterSpacing(void) IDWriteTextAnalyzer1_Release(analyzer1); } +struct orientation_transf_test { + DWRITE_GLYPH_ORIENTATION_ANGLE angle; + BOOL is_sideways; + DWRITE_MATRIX m; +}; + +static const struct orientation_transf_test ot_tests[] = { + { DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES, FALSE, { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES, FALSE, { 0.0, 1.0, -1.0, 0.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES, FALSE, { -1.0, 0.0, 0.0, -1.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES, FALSE, { 0.0, -1.0, 1.0, 0.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES, TRUE, { 0.0, 1.0, -1.0, 0.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES, TRUE, { -1.0, 0.0, 0.0, -1.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES, TRUE, { 0.0, -1.0, 1.0, 0.0, 0.0, 0.0 } }, + { DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES, TRUE, { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 } } +}; + +static inline const char *dbgstr_matrix(const DWRITE_MATRIX *m) +{ + static char buff[64]; + sprintf(buff, "{%.2f, %.2f, %.2f, %.2f, %.2f, %.2f}", m->m11, m->m12, + m->m21, m->m22, m->dx, m->dy); + return buff; +} + +static void test_GetGlyphOrientationTransform(void) +{ + IDWriteTextAnalyzer2 *analyzer2; + IDWriteTextAnalyzer1 *analyzer1; + IDWriteTextAnalyzer *analyzer; + FLOAT originx, originy; + DWRITE_MATRIX m; + HRESULT hr; + int i; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); + IDWriteTextAnalyzer_Release(analyzer); + if (hr != S_OK) { + win_skip("GetGlyphOrientationTransform() is not supported.\n"); + return; + } + + /* invalid angle value */ + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteTextAnalyzer1_GetGlyphOrientationTransform(analyzer1, + DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES + 1, FALSE, &m); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(m.m11 == 0.0, "got %.2f\n", m.m11); + + for (i = 0; i < sizeof(ot_tests)/sizeof(ot_tests[0]); i++) { + memset(&m, 0, sizeof(m)); + hr = IDWriteTextAnalyzer1_GetGlyphOrientationTransform(analyzer1, ot_tests[i].angle, + ot_tests[i].is_sideways, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(&ot_tests[i].m, &m, sizeof(m)), "%d: wrong matrix %s\n", i, dbgstr_matrix(&m)); + } + + hr = IDWriteTextAnalyzer1_QueryInterface(analyzer1, &IID_IDWriteTextAnalyzer2, (void**)&analyzer2); + IDWriteTextAnalyzer1_Release(analyzer1); + if (hr != S_OK) { + win_skip("IDWriteTextAnalyzer2::GetGlyphOrientationTransform() is not supported.\n"); + return; + } + + /* invalid angle value */ + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteTextAnalyzer2_GetGlyphOrientationTransform(analyzer2, + DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES + 1, FALSE, 0.0, 0.0, &m); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(m.m11 == 0.0, "got %.2f\n", m.m11); + + originx = 50.0; + originy = 60.0; + for (i = 0; i < sizeof(ot_tests)/sizeof(ot_tests[0]); i++) { + DWRITE_GLYPH_ORIENTATION_ANGLE angle = DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES; + DWRITE_MATRIX m_exp; + + memset(&m, 0, sizeof(m)); + + /* zero offset gives same result as a call from IDWriteTextAnalyzer1 */ + hr = IDWriteTextAnalyzer2_GetGlyphOrientationTransform(analyzer2, ot_tests[i].angle, + ot_tests[i].is_sideways, 0.0, 0.0, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(&ot_tests[i].m, &m, sizeof(m)), "%d: wrong matrix %s\n", i, dbgstr_matrix(&m)); + + m_exp = ot_tests[i].m; + hr = IDWriteTextAnalyzer2_GetGlyphOrientationTransform(analyzer2, ot_tests[i].angle, + ot_tests[i].is_sideways, originx, originy, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* 90 degrees more for sideways */ + if (ot_tests[i].is_sideways) { + switch (ot_tests[i].angle) + { + case DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: + angle = DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES; + break; + default: + ; + } + } + else + angle = ot_tests[i].angle; + + /* set expected offsets */ + switch (angle) + { + case DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES: + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: + m_exp.dx = originx + originy; + m_exp.dy = originy - originx; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_180_DEGREES: + m_exp.dx = originx + originx; + m_exp.dy = originy + originy; + break; + case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: + m_exp.dx = originx - originy; + m_exp.dy = originy + originx; + break; + default: + ; + } + + ok(!memcmp(&m_exp, &m, sizeof(m)), "%d: wrong matrix %s\n", i, dbgstr_matrix(&m)); + } + + IDWriteTextAnalyzer2_Release(analyzer2); +} + START_TEST(analyzer) { HRESULT hr; @@ -1693,6 +1837,7 @@ START_TEST(analyzer) test_GetTypographicFeatures(); test_GetGlyphPlacements(); test_ApplyCharacterSpacing(); + test_GetGlyphOrientationTransform(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : riched20: Convert from twips to points when tomUsePoints is used.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: eecb757248c0383464a0338271054f9b0d28cf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecb757248c0383464a033827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 23:52:05 2015 +0300 riched20: Convert from twips to points when tomUsePoints is used. --- dlls/riched20/richole.c | 11 ++++++++--- dlls/riched20/tests/richole.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 63926e2..008c124 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -416,6 +416,11 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo } } +static inline FLOAT twips_to_points(LONG value) +{ + return value * 72.0 / 1440; +} + static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, textfont_prop_val *value) { @@ -459,7 +464,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, value->l = fmt.dwEffects & CFE_AUTOCOLOR ? GetSysColor(COLOR_WINDOWTEXT) : fmt.crTextColor; break; case FONT_KERNING: - value->f = fmt.wKerning; + value->f = twips_to_points(fmt.wKerning); break; case FONT_LANGID: value->l = fmt.lcid; @@ -471,10 +476,10 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, return E_OUTOFMEMORY; break; case FONT_POSITION: - value->f = fmt.yOffset; + value->f = twips_to_points(fmt.yOffset); break; case FONT_SIZE: - value->f = fmt.yHeight; + value->f = twips_to_points(fmt.yHeight); break; case FONT_SPACING: value->f = fmt.sSpacing; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3e41ede..327b3ac 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2111,11 +2111,17 @@ static void test_textfont_undefined(ITextFont *font) ok(value == tomUndefined, "got %d\n", value); } +static inline FLOAT twips_to_points(LONG value) +{ + return value * 72.0 / 1440; +} + static void test_ITextFont(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const CHAR test_text1[] = "TestSomeText"; ITextFont *font, *font2, *font3; + FLOAT size, position, kerning; IRichEditOle *reOle = NULL; ITextDocument *doc = NULL; ITextRange *range = NULL; @@ -2138,6 +2144,38 @@ static void test_ITextFont(void) hr = ITextFont_GetName(font, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* default font size unit is point */ + size = 0.0; + hr = ITextFont_GetSize(font, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* set to some non-zero values */ + hr = ITextFont_SetPosition(font, 20.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_SetKerning(font, 10.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + position = 0.0; + hr = ITextFont_GetPosition(font, &position); + ok(hr == S_OK, "got 0x%08x\n", hr); + + kerning = 0.0; + hr = ITextFont_GetKerning(font, &kerning); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&cf, 0, sizeof(cf)); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE|CFM_OFFSET|CFM_KERNING; + + /* CHARFORMAT members are in twips */ + SendMessageA(hwnd, EM_SETSEL, 0, 10); + ret = SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + ok(size == twips_to_points(cf.yHeight), "got yHeight %d, size %.2f\n", cf.yHeight, size); + ok(position == twips_to_points(cf.yOffset), "got yOffset %d, position %.2f\n", cf.yOffset, position); + ok(kerning == twips_to_points(cf.wKerning), "got wKerning %d, kerning %.2f\n", cf.wKerning, kerning); + /* default font name */ str = NULL; hr = ITextFont_GetName(font, &str);

1 0

Nikolay Sivov : riched20: Switch font unit is not allowed.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: b4959154caa0908b30673841d7b4f48f66f44080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4959154caa0908b30673841d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 00:11:49 2015 +0300 riched20: Switch font unit is not allowed. --- dlls/riched20/richole.c | 6 ++++++ dlls/riched20/tests/richole.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 008c124..5b0c7fc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2445,6 +2445,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) This->set_cache_enabled = FALSE; textfont_apply_range_props(This); break; + case tomUsePoints: + case tomUseTwips: + return E_INVALIDARG; default: FIXME("reset mode %d not supported\n", value); } @@ -2467,6 +2470,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) case tomTrackParms: case tomCacheParms: return S_OK; + case tomUsePoints: + case tomUseTwips: + return E_INVALIDARG; } } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 327b3ac..f2ad6e2 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2141,6 +2141,12 @@ static void test_ITextFont(void) hr = ITextRange_GetFont(range, &font); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextFont_Reset(font, tomUseTwips); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextFont_Reset(font, tomUsePoints); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ITextFont_GetName(font, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -2176,6 +2182,23 @@ static void test_ITextFont(void) ok(position == twips_to_points(cf.yOffset), "got yOffset %d, position %.2f\n", cf.yOffset, position); ok(kerning == twips_to_points(cf.wKerning), "got wKerning %d, kerning %.2f\n", cf.wKerning, kerning); + hr = ITextFont_Reset(font, tomUseTwips); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextFont_Reset(font, tomUsePoints); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextFont_GetDuplicate(font, &font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextFont_Reset(font2, tomUseTwips); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextFont_Reset(font2, tomUsePoints); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + ITextFont_Release(font2); + /* default font name */ str = NULL; hr = ITextFont_GetName(font, &str);

1 0

Nikolay Sivov : riched20: Added GetStoryType().
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: d178e7ba68b721a513bea994cb5b84cb00cf01b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d178e7ba68b721a513bea994c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 09:59:02 2015 +0300 riched20: Added GetStoryType(). --- dlls/riched20/riched_tom.idl | 2 ++ dlls/riched20/richole.c | 24 +++++++++++++----- dlls/riched20/tests/richole.c | 57 +++++++++++++++++++++++++++++++++++++++++++ include/tom.idl | 2 ++ 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/riched_tom.idl b/dlls/riched20/riched_tom.idl index 7aab8bb..cd03339 100644 --- a/dlls/riched20/riched_tom.idl +++ b/dlls/riched20/riched_tom.idl @@ -147,6 +147,8 @@ typedef enum tagTomConstants tomMatchWord = 2, tomMatchCase = 4, tomMatchPattern = 8, + + /* ITextRange story type values */ tomUnknownStory = 0, tomMainTextStory = 1, tomFootnotesStory = 2, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b0c7fc..e35f561 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1683,14 +1683,20 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch) return E_NOTIMPL; } -static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue) +static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *value) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)->(%p)\n", This, value); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!value) + return E_INVALIDARG; + + *value = tomUnknownStory; + return S_OK; } static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) @@ -4125,14 +4131,20 @@ static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG * return E_NOTIMPL; } -static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *pValue) +static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *value) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%p)\n", This, value); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!value) + return E_INVALIDARG; + + *value = tomUnknownStory; + return S_OK; } static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f2ad6e2..35fd59c 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2867,6 +2867,62 @@ static void test_Select(void) ITextSelection_Release(selection); } +static void test_GetStoryType(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range; + 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 = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_GetStoryType(range, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + value = tomTextFrameStory; + hr = ITextRange_GetStoryType(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomUnknownStory, "got %d\n", value); + + hr = ITextSelection_GetStoryType(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + value = tomTextFrameStory; + hr = ITextSelection_GetStoryType(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomUnknownStory, "got %d\n", value); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_GetStoryType(range, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = 123; + hr = ITextRange_GetStoryType(range, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == 123, "got %d\n", value); + + hr = ITextSelection_GetStoryType(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + value = 123; + hr = ITextSelection_GetStoryType(selection, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + ok(value == 123, "got %d\n", value); + + ITextRange_Release(range); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2897,4 +2953,5 @@ START_TEST(richole) test_InRange(); test_ITextRange_IsEqual(); test_Select(); + test_GetStoryType(); } diff --git a/include/tom.idl b/include/tom.idl index 245a41b..64209b3 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -134,6 +134,8 @@ typedef enum tagTomConstants tomMatchWord = 2, tomMatchCase = 4, tomMatchPattern = 8, + + /* ITextRange story type values */ tomUnknownStory = 0, tomMainTextStory = 1, tomFootnotesStory = 2,

1 0

Nikolay Sivov : riched20: Implement SetFont().
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 054eecb2bf3f3a2f2eb80252df468e4ad20ff4b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054eecb2bf3f3a2f2eb80252d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 12:36:23 2015 +0300 riched20: Implement SetFont(). --- dlls/riched20/richole.c | 189 ++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 88 ++++++++++++++++++++ 2 files changed, 271 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index e35f561..5b8cad5 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -421,6 +421,11 @@ static inline FLOAT twips_to_points(LONG value) return value * 72.0 / 1440; } +static inline FLOAT points_to_twips(FLOAT value) +{ + return value * 1440 / 72.0; +} + static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, textfont_prop_val *value) { @@ -502,6 +507,166 @@ static inline const IRichEditOleImpl *get_range_reole(ITextRange *range) return reole; } +static void textrange_set_font(ITextRange *range, ITextFont *font) +{ + CHARFORMAT2W fmt; + LONG value; + BSTR str; + FLOAT f; + +#define CHARFORMAT_SET_B_FIELD(mask, value) \ + if (value != tomUndefined) { \ + fmt.dwMask |= CFM_##mask; \ + if (value == tomTrue) fmt.dwEffects |= CFE_##mask; \ + } \ + + /* fill format data from font */ + memset(&fmt, 0, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + + value = tomUndefined; + ITextFont_GetAllCaps(font, &value); + CHARFORMAT_SET_B_FIELD(ALLCAPS, value); + + value = tomUndefined; + ITextFont_GetBold(font, &value); + CHARFORMAT_SET_B_FIELD(BOLD, value); + + value = tomUndefined; + ITextFont_GetEmboss(font, &value); + CHARFORMAT_SET_B_FIELD(EMBOSS, value); + + value = tomUndefined; + ITextFont_GetHidden(font, &value); + CHARFORMAT_SET_B_FIELD(HIDDEN, value); + + value = tomUndefined; + ITextFont_GetEngrave(font, &value); + CHARFORMAT_SET_B_FIELD(IMPRINT, value); + + value = tomUndefined; + ITextFont_GetItalic(font, &value); + CHARFORMAT_SET_B_FIELD(ITALIC, value); + + value = tomUndefined; + ITextFont_GetOutline(font, &value); + CHARFORMAT_SET_B_FIELD(OUTLINE, value); + + value = tomUndefined; + ITextFont_GetProtected(font, &value); + CHARFORMAT_SET_B_FIELD(PROTECTED, value); + + value = tomUndefined; + ITextFont_GetShadow(font, &value); + CHARFORMAT_SET_B_FIELD(SHADOW, value); + + value = tomUndefined; + ITextFont_GetSmallCaps(font, &value); + CHARFORMAT_SET_B_FIELD(SMALLCAPS, value); + + value = tomUndefined; + ITextFont_GetStrikeThrough(font, &value); + CHARFORMAT_SET_B_FIELD(STRIKEOUT, value); + + value = tomUndefined; + ITextFont_GetSubscript(font, &value); + CHARFORMAT_SET_B_FIELD(SUBSCRIPT, value); + + value = tomUndefined; + ITextFont_GetSuperscript(font, &value); + CHARFORMAT_SET_B_FIELD(SUPERSCRIPT, value); + + value = tomUndefined; + ITextFont_GetUnderline(font, &value); + CHARFORMAT_SET_B_FIELD(UNDERLINE, value); + +#undef CHARFORMAT_SET_B_FIELD + + value = tomUndefined; + ITextFont_GetAnimation(font, &value); + if (value != tomUndefined) { + fmt.dwMask |= CFM_ANIMATION; + fmt.bAnimation = value; + } + + value = tomUndefined; + ITextFont_GetBackColor(font, &value); + if (value != tomUndefined) { + fmt.dwMask |= CFM_BACKCOLOR; + if (value == tomAutoColor) + fmt.dwEffects |= CFE_AUTOBACKCOLOR; + else + fmt.crBackColor = value; + } + + value = tomUndefined; + ITextFont_GetForeColor(font, &value); + if (value != tomUndefined) { + fmt.dwMask |= CFM_COLOR; + if (value == tomAutoColor) + fmt.dwEffects |= CFE_AUTOCOLOR; + else + fmt.crTextColor = value; + } + + value = tomUndefined; + ITextFont_GetKerning(font, &f); + if (f != tomUndefined) { + fmt.dwMask |= CFM_KERNING; + fmt.wKerning = points_to_twips(f); + } + + value = tomUndefined; + ITextFont_GetLanguageID(font, &value); + if (value != tomUndefined) { + fmt.dwMask |= CFM_LCID; + fmt.lcid = value; + } + + if (ITextFont_GetName(font, &str) == S_OK) { + fmt.dwMask |= CFM_FACE; + lstrcpynW(fmt.szFaceName, str, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + SysFreeString(str); + } + + ITextFont_GetPosition(font, &f); + if (f != tomUndefined) { + fmt.dwMask |= CFM_OFFSET; + fmt.yOffset = points_to_twips(f); + } + + ITextFont_GetSize(font, &f); + if (f != tomUndefined) { + fmt.dwMask |= CFM_SIZE; + fmt.yHeight = points_to_twips(f); + } + + ITextFont_GetSpacing(font, &f); + if (f != tomUndefined) { + fmt.dwMask |= CFM_SPACING; + fmt.sSpacing = f; + } + + ITextFont_GetWeight(font, &value); + if (value != tomUndefined) { + fmt.dwMask |= CFM_WEIGHT; + fmt.wWeight = value; + } + + if (fmt.dwMask) { + const IRichEditOleImpl *reole = get_range_reole(range); + ME_Cursor from, to; + LONG start, end; + + ITextRange_GetStart(range, &start); + ITextRange_GetEnd(range, &end); + + ME_CursorFromCharOfs(reole->editor, start, &from); + ME_CursorFromCharOfs(reole->editor, end, &to); + ME_SetCharFormat(reole->editor, &from, &to, &fmt); + } +} + static HRESULT get_textfont_prop(const ITextFontImpl *font, enum textfont_prop_id propid, textfont_prop_val *value) { const IRichEditOleImpl *reole; @@ -1638,14 +1803,20 @@ static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **font) return create_textfont(me, NULL, font); } -static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont) +static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *font) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)->(%p)\n", This, font); + + if (!font) + return E_INVALIDARG; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + textrange_set_font(me, font); + return S_OK; } static HRESULT WINAPI ITextRange_fnGetPara(ITextRange *me, ITextPara **para) @@ -4086,14 +4257,20 @@ static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **f return create_textfont((ITextRange*)me, NULL, font); } -static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pFont) +static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *font) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%p)\n", This, font); + + if (!font) + return E_INVALIDARG; + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + textrange_set_font((ITextRange*)me, font); + return S_OK; } static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **para) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 35fd59c..09ab939 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2923,6 +2923,93 @@ static void test_GetStoryType(void) ITextSelection_Release(selection); } +static void test_SetFont(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + IRichEditOle *reOle = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range, *range2; + ITextFont *font, *font2; + 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 = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextDocument_Range(doc, 5, 2, &range2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(range, 1); + hr = ITextRange_GetFont(range, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(range, 2); + + EXPECT_REF(range2, 1); + hr = ITextRange_GetFont(range2, &font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(range2, 2); + + hr = ITextRange_SetFont(range, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* setting same font, no-op */ + EXPECT_REF(range, 2); + hr = ITextRange_SetFont(range, font); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(range, 2); + + EXPECT_REF(range2, 2); + EXPECT_REF(range, 2); + hr = ITextRange_SetFont(range, font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(range2, 2); + EXPECT_REF(range, 2); + + /* originaly range 0-4 is non-italic */ + value = tomTrue; + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + /* set range 5-2 to italic, then set this font to range 0-4 */ + hr = ITextFont_SetItalic(font2, tomTrue); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_SetFont(range, font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = tomFalse; + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomTrue, "got %d\n", value); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_SetFont(range, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextRange_SetFont(range, font); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_SetFont(selection, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITextSelection_SetFont(selection, font); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextFont_Release(font); + ITextFont_Release(font2); + ITextRange_Release(range); + ITextRange_Release(range2); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2954,4 +3041,5 @@ START_TEST(richole) test_ITextRange_IsEqual(); test_Select(); test_GetStoryType(); + test_SetFont(); }

1 0

Nikolay Sivov : riched20/tests: Test more return values and released cases.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: dd8287e9e8ebf34f492792d18f2841f47207cc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8287e9e8ebf34f492792d18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 12:54:46 2015 +0300 riched20/tests: Test more return values and released cases. --- dlls/riched20/tests/richole.c | 137 +++++++++++++++++++++++++++++++----------- 1 file changed, 102 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd8287e9e8ebf34f49279…

1 0

André Hentschel : ntdll: Add stub for __chkstk on ARM.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: a18f84c0b122a324cc050cf23a0b3d0622c7de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18f84c0b122a324cc050cf23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 28 22:38:53 2015 +0200 ntdll: Add stub for __chkstk on ARM. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8f6a13e..d5e95c1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1629,7 +1629,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6d86157..191115b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1271,7 +1271,7 @@ @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=x86_64 -norelay __chkstk() +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private __isascii(long) NTDLL___isascii @ cdecl -private __iscsym(long) NTDLL___iscsym @ cdecl -private __iscsymf(long) NTDLL___iscsymf diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bdb27af..113139f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -247,6 +247,12 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) FIXME("not implemented\n"); } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Should check if we can decrement SP by the value provided in r4, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "bx lr" ) /*********************************************************************** * RtlCaptureContext (NTDLL.@)

1 0