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

Damjan Jovanovic : qcap: Implement a stubbed SmartTee filter.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: cdd40604693e81334de167b52562782e53a820c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd40604693e81334de167b52… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:29 2015 +0200 qcap: Implement a stubbed SmartTee filter. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/qcap_main.c | 2 +- dlls/qcap/smartteefilter.c | 497 +++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 26 +- 4 files changed, 512 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd40604693e81334de16…

1 0

Iván Matellanes : msvcirt: Share exceptions implementation with msvcp.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: e35e107e5eda2c64c2da8265a4b7ca5eceecaeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e107e5eda2c64c2da8265a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue May 26 13:08:39 2015 +0200 msvcirt: Share exceptions implementation with msvcp. --- dlls/msvcirt/Makefile.in | 3 ++ dlls/msvcirt/msvcirt.c | 40 ++++++++--------- dlls/msvcirt/msvcirt.h | 25 +++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++++++++++----------- dlls/msvcp90/exception.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt40/msvcrt40.spec | 22 ++++----- 6 files changed, 181 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35e107e5eda2c64c2da8…

1 0

Matteo Bruni : wined3d: Remove point size scaling hack.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: b551da8eef4aaeea27207969c6f9065882f3f6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b551da8eef4aaeea27207969c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:02 2015 +0200 wined3d: Remove point size scaling hack. Not sure how this was supposed to work, according to the GL spec the clamping to POINT_SIZE_RANGE happens after the scaling is applied. --- dlls/wined3d/state.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 28e26ab..40b04e7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1507,40 +1507,11 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) { - DWORD h = state->viewport.height; - GLfloat scaleFactor; + float scale_factor = state->viewport.height * state->viewport.height; - if (pointSize.f < gl_info->limits.pointsize_min) - { - /* Minimum valid point size for OpenGL is driver specific. For Direct3D it is - * 0.0f. This means that OpenGL will clamp really small point sizes to the - * driver minimum. To correct for this we need to multiply by the scale factor when sizes - * are less than 1.0f. scale_factor = 1.0f / point_size. - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_min; - /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size - * is 1.0, but then accepts points below that and draws too small points - */ - pointSize.f = gl_info->limits.pointsize_min; - } - else if(pointSize.f > gl_info->limits.pointsize_max) - { - /* gl already scales the input to glPointSize, - * d3d scales the result after the point size scale. - * If the point size is bigger than the max size, use the - * scaling to scale it bigger, and set the gl point size to max - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_max; - TRACE("scale: %f\n", scaleFactor); - pointSize.f = gl_info->limits.pointsize_max; - } else { - scaleFactor = 1.0f; - } - scaleFactor = powf(h * scaleFactor, 2); - - att[0] = A.f / scaleFactor; - att[1] = B.f / scaleFactor; - att[2] = C.f / scaleFactor; + att[0] = A.f / scale_factor; + att[1] = B.f / scale_factor; + att[2] = C.f / scale_factor; } if (gl_info->supported[ARB_POINT_PARAMETERS]) @@ -1558,7 +1529,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(pointSize.f); + gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN)); checkGLcall("glPointSize(...);"); }

1 0

Damjan Jovanovic : qcap/tests: Test SmartTee filter aggregation.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: e6307f1a4ba827b5f06fbe9c59013bb60e6cf276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6307f1a4ba827b5f06fbe9c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:24 2015 +0200 qcap/tests: Test SmartTee filter aggregation. --- dlls/qcap/tests/smartteefilter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 126d798..83bcff9 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1532,12 +1532,28 @@ end: IEnumMediaTypes_Release(enumMediaTypes); } +static void test_smart_tee_filter_aggregation(void) +{ + SourceFilter *sourceFilter = create_SourceFilter(); + if (sourceFilter) { + IUnknown *unknown = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, (IUnknown*)&sourceFilter->IBaseFilter_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unknown); + todo_wine ok(SUCCEEDED(hr), "SmartTee filter doesn't support aggregation, hr=0x%08x\n", hr); + if (unknown) + IUnknown_Release(unknown); + IBaseFilter_Release(&sourceFilter->IBaseFilter_iface); + } else + ok(0, "out of memory allocating SourceFilter for test\n"); +} + START_TEST(smartteefilter) { if (SUCCEEDED(CoInitialize(NULL))) { event = CreateEventW(NULL, FALSE, FALSE, NULL); if (event) { + test_smart_tee_filter_aggregation(); test_smart_tee_filter(); CloseHandle(event); } else

1 0

Damjan Jovanovic : qcap/tests: Add many more SmartTee filter tests.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: 5405c0feebd1e94e9812dc8d7cc71a2720c65449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5405c0feebd1e94e9812dc8d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:07 2015 +0200 qcap/tests: Add many more SmartTee filter tests. --- dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/qcap.c | 73 ---- dlls/qcap/tests/smartteefilter.c | 806 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 808 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5405c0feebd1e94e9812d…

1 0

André Hentschel : ntdll: Fix returning from various ARM assembler functions.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: c13be7446e52f2bc8d4779a00d32f7952451be5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13be7446e52f2bc8d4779a00… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 28 22:39:01 2015 +0200 ntdll: Fix returning from various ARM assembler functions. --- dlls/ntdll/signal_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 113139f..0c51c49 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,7 +283,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "str PC, [r0, #0x40]\n\t" /* context->Pc */ "mrs r1, CPSR\n\t" "str r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "mov PC, LR\n" + "bx lr" ) @@ -920,7 +920,7 @@ void signal_free_thread( TEB *teb ) extern void set_tpidrurw( TEB *teb ); __ASM_GLOBAL_FUNC( set_tpidrurw, "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ - "blx lr" ) + "bx lr" ) #else void set_tpidrurw( TEB *teb ) {

1 0

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

May 29, 2015

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

Nikolay Sivov : riched20: Added GetStoryType().
by Alexandre Julliard May 29, 2015

May 29, 2015

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

Alexandre Julliard : krnl386.exe: Release the Win16 lock when loading a 32-bit dll.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: 3a2e7d1a3dbf42a0385e5c0f64d79e9ea054252e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2e7d1a3dbf42a0385e5c0f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:02:45 2015 +0900 krnl386.exe: Release the Win16 lock when loading a 32-bit dll. --- dlls/krnl386.exe16/ne_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index c0e1a98..70f8a46 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -981,8 +981,11 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + DWORD count; char *q; + ReleaseThunkLock( &count ); + strcpy( dllname, basename ); q = strrchr( dllname, '.' ); if (!q) strcat( dllname, ".dll" ); @@ -1011,6 +1014,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ { WARN( "couldn't load owner %s for 16-bit dll %s\n", main_module, dllname ); FreeLibrary( mod32 ); + RestoreThunkLock( count ); return ERROR_FILE_NOT_FOUND; } /* check if module was loaded native */ @@ -1023,6 +1027,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ } } } + RestoreThunkLock( count ); /* loading the 32-bit library can have the side effect of loading the module */ /* if so, simply incr the ref count and return the module */

1 0

Nikolay Sivov : riched20: Implement SetFont().
by Alexandre Julliard May 29, 2015

May 29, 2015

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