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

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

May 29, 2015

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 : dwrite: Implement GetGlyphOrientationTransform().
by Alexandre Julliard May 29, 2015

May 29, 2015

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

Damjan Jovanovic : qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: 6bc6b0bf71bd23fef8962c4e6be936454cd1ecab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc6b0bf71bd23fef8962c4e6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:03:03 2015 +0200 qcap/tests: Fix SmartTeeFilter reference leaks from the pins in its test. --- dlls/qcap/tests/qcap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 19177bd..39737f4 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -127,6 +127,7 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { PIN_INFO pinInfo; + memset(&pinInfo, 0, sizeof(pinInfo)); hr = IPin_QueryPinInfo(pin, &pinInfo); ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=%08x\n", hr); if (FAILED(hr)) @@ -154,6 +155,8 @@ static void test_smart_tee_filter(void) ok(0, "pin %d isn't supposed to exist\n", pinNumber); endwhile: + if (pinInfo.pFilter) + IBaseFilter_Release(pinInfo.pFilter); IPin_Release(pin); pinNumber++; }

1 0

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

May 29, 2015

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

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

May 29, 2015

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

Damjan Jovanovic : qcap/tests: Add media tests for the SmartTee filter.
by Alexandre Julliard May 29, 2015

May 29, 2015

Module: wine Branch: master Commit: d126fd53f7e2427071a70784178206eff0e21e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d126fd53f7e2427071a707841… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:18 2015 +0200 qcap/tests: Add media tests for the SmartTee filter. --- dlls/qcap/tests/smartteefilter.c | 772 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 758 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d126fd53f7e2427071a70…

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard May 28, 2015

May 28, 2015

Module: wine Branch: master Commit: 809127a2da31aa8eb12e7e905404bc416aeb4e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809127a2da31aa8eb12e7e905… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 28 15:58:47 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/uk.po b/po/uk.po index ccbd5c8..0c2b8ad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-08 13:50+0200\n" +"PO-Revision-Date: 2015-05-28 15:57+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -2553,7 +2553,7 @@ msgstr "Властивості сертифікату" #: cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "Будь-ласка, введіть OID в формі 1.2.3.4" +msgstr "Будь ласка, введіть OID в формі 1.2.3.4" #: cryptui.rc:68 msgid "The OID you entered already exists." @@ -2561,7 +2561,7 @@ msgstr "OID, який ви ввели, вже існує." #: cryptui.rc:70 msgid "Please select a certificate store." -msgstr "Будь-ласка, виберіть сховище сертифікатів." +msgstr "Будь ласка, виберіть сховище сертифікатів." #: cryptui.rc:72 msgid "" @@ -6709,7 +6709,7 @@ msgstr "Введіть Мережний Пароль" #: mpr.rc:38 wininet.rc:40 wininet.rc:60 msgid "Please enter your username and password:" -msgstr "Будь-ласка, введіть Ваші ім'я та пароль:" +msgstr "Будь ласка, введіть Ваші ім'я та пароль:" #: mpr.rc:39 wininet.rc:41 msgid "Proxy" @@ -8652,10 +8652,8 @@ msgid "Duplex:" msgstr "Дуплекс:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "Властивості" +msgstr "Налаштування" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -12998,7 +12996,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Оновлення конфігурації Wine в %s, будь-ласка, зачекайте..." +msgstr "Оновлення конфігурації Wine в %s, будь ласка, зачекайте..." #: winecfg.rc:141 msgid "" @@ -13260,7 +13258,7 @@ msgstr "Диски" #: winecfg.rc:36 msgid "Select the Unix target directory, please." -msgstr "Будь-ласка, виберіть цільову теку Unix." +msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 msgid "Hide &Advanced"

1 0

Nikolay Sivov : riched20: Implement GetPara() for selection range.
by Alexandre Julliard May 28, 2015

May 28, 2015

Module: wine Branch: master Commit: c1ce95dc961a16b8640151e856b92dbb36a52c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ce95dc961a16b8640151e85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 01:42:04 2015 +0300 riched20: Implement GetPara() for selection range. --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 14c4c8e..4d4ca89 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4031,11 +4031,16 @@ static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pF static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **para) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%p)\n", This, para); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!para) + return E_INVALIDARG; + + return create_textpara((ITextRange*)me, para); } static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *pPara) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7d90a98..0e08758 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1650,12 +1650,13 @@ static void test_GetPara(void) static const CHAR test_text1[] = "TestSomeText"; IRichEditOle *reOle = NULL; ITextDocument *doc = NULL; + ITextSelection *selection; ITextRange *range = NULL; ITextPara *para, *para2; HRESULT hr; HWND hwnd; - create_interfaces(&hwnd, &reOle, &doc, NULL); + create_interfaces(&hwnd, &reOle, &doc, &selection); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); EXPECT_REF(reOle, 3); @@ -1691,8 +1692,41 @@ static void test_GetPara(void) ITextPara_Release(para); ITextPara_Release(para2); - ITextRange_Release(range); + + EXPECT_REF(reOle, 3); + EXPECT_REF(doc, 3); + EXPECT_REF(selection, 2); + + hr = ITextSelection_GetPara(selection, &para); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(reOle, 3); + EXPECT_REF(doc, 3); + EXPECT_REF(selection, 3); + EXPECT_REF(para, 1); + + hr = ITextSelection_GetPara(selection, &para2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(para != para2, "got %p, %p\n", para, para2); + + ITextPara_Release(para); + ITextPara_Release(para2); release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_GetPara(range, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_GetPara(range, &para); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetPara(selection, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_GetPara(selection, &para); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); } static void test_dispatch(void)

1 0

Indrek Altpere : winex11: Fix uninitialized memory access appearing in multiple tests (Valgrind).
by Alexandre Julliard May 28, 2015

May 28, 2015

Module: wine Branch: master Commit: 68e1fdf99954c0f66f9a536d8f8a384033104bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e1fdf99954c0f66f9a536d8… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Thu May 28 12:13:41 2015 +0300 winex11: Fix uninitialized memory access appearing in multiple tests (Valgrind). --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 06e2294..7146cfc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -725,6 +725,8 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s data->hwnd, mwm_hints.decorations, mwm_hints.functions, style, ex_style ); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + mwm_hints.input_mode = 0; + mwm_hints.status = 0; XChangeProperty( data->display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) );

1 0

Nikolay Sivov : riched20: Implement Select().
by Alexandre Julliard May 28, 2015

May 28, 2015

Module: wine Branch: master Commit: cb095a82a25b3b296227de5c3e3de588d801d1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb095a82a25b3b296227de5c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 27 02:36:49 2015 +0300 riched20: Implement Select(). --- dlls/riched20/richole.c | 14 ++++++++++---- dlls/riched20/tests/richole.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index db002a9..e25f2ea 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1825,11 +1825,14 @@ static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *range, LO static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) { ITextRangeImpl *This = impl_from_ITextRange(me); + + TRACE("(%p)\n", This); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + ME_SetSelection(This->reOle->editor, This->start, This->end); + return S_OK; } static HRESULT WINAPI ITextRange_fnStartOf(ITextRange *me, LONG Unit, LONG Extend, @@ -4240,11 +4243,14 @@ static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *r static HRESULT WINAPI ITextSelection_fnSelect(ITextSelection *me) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)\n", This); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + /* nothing to do */ + return S_OK; } static HRESULT WINAPI ITextSelection_fnStartOf(ITextSelection *me, LONG Unit, LONG Extend, diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f4bf6f9..33a433a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2746,6 +2746,50 @@ static void test_ITextRange_IsEqual(void) ITextSelection_Release(selection); } +static void test_Select(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_Select(range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 1; + hr = ITextSelection_GetStart(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + + hr = ITextRange_Select(range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_Select(selection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + release_interfaces(&hwnd, &reOle, &doc, NULL); + + hr = ITextRange_Select(range); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_Select(selection); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextRange_Release(range); + ITextSelection_Release(selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -2775,4 +2819,5 @@ START_TEST(richole) test_SetText(); test_InRange(); test_ITextRange_IsEqual(); + test_Select(); }

1 0