wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

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

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: 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: 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: 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 : 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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 22983f2b65dc40bfa90a73e3e3bd2e13cc90e22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22983f2b65dc40bfa90a73e3e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 28 16:32:13 2015 +0300 po: Update Finnish translation. --- po/fi.po | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/po/fi.po b/po/fi.po index 22c792d..3d4d03e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7442,10 +7442,8 @@ msgid "Add Control" msgstr "Lisää kontrolli" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Fontti..." +msgstr "&Muunna..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8879,16 +8877,12 @@ msgstr "" "verkkoyhteys toimii." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Annettua laitetta ei löydy. Tarkista, että se on asennettu tai sen nimi on " -"kirjoitettu oikein." +"Annettua laitetta ei löydy. Tarkista, että se on asennettu ja että sen nimi " +"on kirjoitettu oikein." #: winmm.rc:87 msgid "" @@ -9184,24 +9178,20 @@ msgstr "" "riittävästi tai verkkoyhteys on toiminnassa." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine Mono -asennusohjelma" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "sarake" +msgstr "Äänenvoimakkuus" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Pää-äänenvoimakkuus" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Mykistä" #: winspool.rc:37 msgid "Print to File"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 28 May '15

28 May '15

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

Huw Davies : winex11: Fix ctrl-<symbol> to generate codes below 0x20 where necessary.
by Alexandre Julliard 28 May '15

28 May '15

Module: wine Branch: master Commit: 10556c25e468768d1422e872f16dbc1ae85ef968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10556c25e468768d1422e872f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 28 11:35:05 2015 +0100 winex11: Fix ctrl-<symbol> to generate codes below 0x20 where necessary. --- dlls/user32/tests/input.c | 94 +++++++++++++++++++++++++++++++++++---------- dlls/winex11.drv/keyboard.c | 16 ++++++-- 2 files changed, 85 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 29b655c..cb130e8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1587,6 +1587,56 @@ static void test_key_map(void) } } +#define shift 1 +#define ctrl 2 + +static const struct tounicode_tests +{ + UINT vk; + DWORD modifiers; + WCHAR chr; /* if vk is 0, lookup vk using this char */ + int expect_ret; + WCHAR expect_buf[4]; +} utests[] = +{ + { 'A', 0, 0, 1, {'a',0}}, + { 'A', ctrl, 0, 1, {1, 0}}, + { 'A', shift|ctrl, 0, 1, {1, 0}}, + { VK_TAB, ctrl, 0, 0, {}}, + { VK_TAB, shift|ctrl, 0, 0, {}}, + { VK_RETURN, ctrl, 0, 1, {'\n', 0}}, + { VK_RETURN, shift|ctrl, 0, 0, {}}, + { '4', ctrl, 0, 0, {}}, + { '4', shift|ctrl, 0, 0, {}}, + { 0, ctrl, '!', 0, {}}, + { 0, ctrl, '\"', 0, {}}, + { 0, ctrl, '#', 0, {}}, + { 0, ctrl, '$', 0, {}}, + { 0, ctrl, '%', 0, {}}, + { 0, ctrl, '\'', 0, {}}, + { 0, ctrl, '(', 0, {}}, + { 0, ctrl, ')', 0, {}}, + { 0, ctrl, '*', 0, {}}, + { 0, ctrl, '+', 0, {}}, + { 0, ctrl, ',', 0, {}}, + { 0, ctrl, '-', 0, {}}, + { 0, ctrl, '.', 0, {}}, + { 0, ctrl, '/', 0, {}}, + { 0, ctrl, ':', 0, {}}, + { 0, ctrl, ';', 0, {}}, + { 0, ctrl, '<', 0, {}}, + { 0, ctrl, '=', 0, {}}, + { 0, ctrl, '>', 0, {}}, + { 0, ctrl, '?', 0, {}}, + { 0, ctrl, '@', 1, {0}}, + { 0, ctrl, '[', 1, {0x1b}}, + { 0, ctrl, '\\', 1, {0x1c}}, + { 0, ctrl, ']', 1, {0x1d}}, + { 0, ctrl, '^', 1, {0x1e}}, + { 0, ctrl, '_', 1, {0x1f}}, + { 0, ctrl, '`', 0, {}}, +}; + static void test_ToUnicode(void) { WCHAR wStr[4]; @@ -1614,30 +1664,32 @@ static void test_ToUnicode(void) "ToUnicode didn't null-terminate the buffer when there was room.\n"); } - ret = ToUnicode('A', SC_A, state, wStr, 4, 0); - ok(ret == 1, "ToUnicode for character A didn't return 1 (was %i)\n", ret); - ok(wStr[0] == 'a', "ToUnicode for character 'A' was %i (expected %i)\n", wStr[0], 'a'); + for (i = 0; i < sizeof(utests) / sizeof(utests[0]); i++) + { + UINT vk = utests[i].vk, mod = utests[i].modifiers, scan; - state[VK_CONTROL] |= HIGHEST_BIT; - state[VK_LCONTROL] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + if(!vk) + { + short vk_ret = VkKeyScanW(utests[i].chr); + if (vk_ret == -1) continue; + vk = vk_ret & 0xff; + if (vk_ret & 0x100) mod |= shift; + if (vk_ret & 0x200) mod |= ctrl; + } + scan = MapVirtualKeyW(vk, MAPVK_VK_TO_VSC); - ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); - if(ret == 1) - ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]); + state[VK_SHIFT] = state[VK_LSHIFT] = (mod & shift) ? HIGHEST_BIT : 0; + state[VK_CONTROL] = state[VK_LCONTROL] = (mod & ctrl) ? HIGHEST_BIT : 0; - ret = ToUnicode('A', SC_A, state, wStr, 4, 0); - ok(ret == 1, "ToUnicode for CTRL + character A didn't return 1 (was %i)\n", ret); - ok(wStr[0] == 1, "ToUnicode for CTRL + character 'A' was %i (expected 1)\n", wStr[0]); + ret = ToUnicode(vk, scan, state, wStr, 4, 0); + ok(ret == utests[i].expect_ret, "%d: got %d expected %d\n", i, ret, utests[i].expect_ret); + if (ret) + ok(!lstrcmpW(wStr, utests[i].expect_buf), "%d: got %s expected %s\n", i, wine_dbgstr_w(wStr), + wine_dbgstr_w(utests[i].expect_buf)); - state[VK_SHIFT] |= HIGHEST_BIT; - state[VK_LSHIFT] |= HIGHEST_BIT; - ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - ok(ret == 0, "ToUnicode for CTRL + SHIFT + Tab didn't return 0 (was %i)\n", ret); - ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); + } + state[VK_SHIFT] = state[VK_LSHIFT] = 0; + state[VK_CONTROL] = state[VK_LCONTROL] = 0; ret = ToUnicode(VK_TAB, SC_TAB, NULL, wStr, 4, 0); ok(ret == 0, "ToUnicode with NULL keystate didn't return 0 (was %i)\n", ret); @@ -1688,7 +1740,7 @@ static void test_ToAscii(void) state[VK_SHIFT] |= HIGHEST_BIT; state[VK_LSHIFT] |= HIGHEST_BIT; ret = ToAscii(VK_RETURN, SC_RETURN, state, &character, 0); - todo_wine ok(ret == 0, "ToAscii for CTRL + Shift + Return key didn't return 0 (was %i)\n", ret); + ok(ret == 0, "ToAscii for CTRL + Shift + Return key didn't return 0 (was %i)\n", ret); ret = ToAscii(VK_RETURN, SC_RETURN, NULL, &character, 0); ok(ret == 0, "ToAscii for NULL keystate didn't return 0 (was %i)\n", ret); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 1323e19..b0f5b95 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2664,8 +2664,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState CTRL + number or CTRL + symbol */ if (e.state & ControlMask) { - if (((keysym>=33) && (keysym < 'A')) || - ((keysym > 'Z') && (keysym < 'a')) || + if (((keysym>=33) && (keysym < '@')) || + (keysym == '`') || (keysym == XK_Tab)) { lpChar[0] = 0; @@ -2689,8 +2689,16 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */ && (keysym == XK_Return || keysym == XK_KP_Enter)) { - lpChar[0] = '\n'; - ret = 1; + if (lpKeyState[VK_SHIFT] & 0x80) + { + lpChar[0] = 0; + ret = 0; + } + else + { + lpChar[0] = '\n'; + ret = 1; + } } /* Hack to detect an XLookupString hard-coded to Latin1 */

1 0

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

28 May '15

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015