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

Austin English : dbghelp: Ignore some more symbol ids.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: f832f85c80ef69f182790a9183d50d53826cac85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f832f85c80ef69f182790a918… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 19 21:28:18 2015 -0500 dbghelp: Ignore some more symbol ids. These are from MSVC 2013. --- dlls/dbghelp/msc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 3b12a3a..1554414 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1992,6 +1992,12 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case 0x1142: case 0x1143: case 0x1144: + case 0x114c: + case 0x114d: + case 0x114e: + case 0x1145: + case 0x115a: + case 0x1153: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Nikolay Sivov : oleaut32: Added missing IPersistMemory proxy/stub methods.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 1d91c844dacd78157f43f88933f1b1236dd5d27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d91c844dacd78157f43f8893… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 09:13:37 2015 +0300 oleaut32: Added missing IPersistMemory proxy/stub methods. --- dlls/oleaut32/usrmarshal.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 32c089c..e86b577 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2268,8 +2268,12 @@ HRESULT CALLBACK IPersistMemory_Load_Proxy( LPVOID pMem, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %u)\n", pMem, cbSize); + + if (!pMem) + return E_POINTER; + + return IPersistMemory_RemoteLoad_Proxy(This, pMem, cbSize); } HRESULT __RPC_STUB IPersistMemory_Load_Stub( @@ -2277,8 +2281,8 @@ HRESULT __RPC_STUB IPersistMemory_Load_Stub( BYTE *pMem, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %u)\n", pMem, cbSize); + return IPersistMemory_Load(This, pMem, cbSize); } HRESULT CALLBACK IPersistMemory_Save_Proxy( @@ -2287,8 +2291,12 @@ HRESULT CALLBACK IPersistMemory_Save_Proxy( BOOL fClearDirty, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + + if (!pMem) + return E_POINTER; + + return IPersistMemory_RemoteSave_Proxy(This, pMem, fClearDirty, cbSize); } HRESULT __RPC_STUB IPersistMemory_Save_Stub( @@ -2297,8 +2305,8 @@ HRESULT __RPC_STUB IPersistMemory_Save_Stub( BOOL fClearDirty, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + return IPersistMemory_Save(This, pMem, fClearDirty, cbSize); } void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy(

1 0

Sebastian Lackner : wineconsole: Allocate fake hwnds for curses backend.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 2100d3e1ec3e47194fb7076de30f1acfe2b60bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2100d3e1ec3e47194fb7076de… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 13 19:06:23 2015 +0200 wineconsole: Allocate fake hwnds for curses backend. Based on a patch by Qian Hong. --- programs/wineconsole/curses.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 24aab88..2903b80 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1001,6 +1001,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) #endif endwin(); + if (data->hWnd) DestroyWindow(data->hWnd); HeapFree(GetProcessHeap(), 0, PRIVATE(data)->line); HeapFree(GetProcessHeap(), 0, PRIVATE(data)); data->private = NULL; @@ -1042,6 +1043,8 @@ static int WCCURSES_MainLoop(struct inner_data* data) */ enum init_return WCCURSES_InitBackend(struct inner_data* data) { + static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + if( !WCCURSES_bind_libcurses() ) return init_not_supported; @@ -1058,7 +1061,8 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) data->fnScroll = WCCURSES_Scroll; data->fnSetFont = WCCURSES_SetFont; data->fnDeleteBackend = WCCURSES_DeleteBackend; - data->hWnd = NULL; + data->hWnd = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, + GetModuleHandleW(0), NULL); /* FIXME: should find a good way to enable buffer scrolling * For the time being, setting this to 1 will allow scrolling up/down

1 0

Jiaxing Wang : regedit: Avoid appending '\0' to string value of imported key.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: a53371497f62ee4ff5a379941cc2cd58ac5cbb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53371497f62ee4ff5a379941… Author: Jiaxing Wang <hello.wjx(a)gmail.com> Date: Thu Nov 20 15:29:07 2014 +0800 regedit: Avoid appending '\0' to string value of imported key. --- programs/regedit/regproc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 80beb21..643b559 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -376,7 +376,6 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) return ERROR_INVALID_DATA; val_data[dwLen-1] = '\0'; /* remove last quotes */ lpbData = (BYTE*) val_data; - dwLen++; /* include terminating null */ dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */

1 0

Nikolay Sivov : riched20: Implement GetSize().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: c48e0519ac63ff6dae155dda22be46d44d7902ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48e0519ac63ff6dae155dda2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:26:21 2015 +0300 riched20: Implement GetSize(). --- dlls/riched20/richole.c | 98 ++++++++++++++++++++++++++++++++++++------- dlls/riched20/tests/richole.c | 17 +++++++- 2 files changed, 98 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index aa2a6e3..95a92fe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -208,7 +208,47 @@ static const DWORD textfont_prop_masks[] = { CFM_WEIGHT }; -static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, LONG *value) +typedef union { + FLOAT f; + LONG l; +} textfont_prop_val; + +static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, textfont_prop_val *left, + textfont_prop_val *right) +{ + switch (propid) + { + case FONT_BOLD: + case FONT_ITALIC: + return left->l == right->l; + case FONT_SIZE: + return left->f == right->f; + default: + FIXME("unhandled font property %d\n", propid); + return FALSE; + } +} + +static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfont_prop_val *v) +{ + switch (propid) + { + case FONT_BOLD: + case FONT_ITALIC: + v->l = tomUndefined; + return; + case FONT_SIZE: + v->f = tomUndefined; + return; + default: + FIXME("unhandled font property %d\n", propid); + v->l = tomUndefined; + return; + } +} + +static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, + textfont_prop_val *value) { ME_Cursor from, to; CHARFORMAT2W fmt; @@ -225,10 +265,13 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, switch (propid) { case FONT_BOLD: - *value = fmt.dwEffects & CFE_BOLD ? tomTrue : tomFalse; + value->l = fmt.dwEffects & CFE_BOLD ? tomTrue : tomFalse; break; case FONT_ITALIC: - *value = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; + value->l = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; + break; + case FONT_SIZE: + value->f = fmt.yHeight; break; default: FIXME("unhandled font property %d\n", propid); @@ -238,34 +281,31 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, return S_OK; } -static HRESULT get_textfont_prop(ITextRange *range, enum textfont_prop_id propid, LONG *value) +static HRESULT get_textfont_prop(ITextRange *range, enum textfont_prop_id propid, textfont_prop_val *value) { ITextRangeImpl *rng = impl_from_ITextRange(range); + textfont_prop_val v; HRESULT hr; - LONG v; int i; - if (!value) - return E_INVALIDARG; - - *value = tomUndefined; - if (!rng->reOle) return CO_E_RELEASED; + init_textfont_prop_value(propid, value); + /* iterate trough a range to see if property value is consistent */ hr = get_textfont_prop_for_pos(rng->reOle, rng->start, propid, &v); if (FAILED(hr)) return hr; for (i = rng->start + 1; i < rng->end; i++) { - LONG cur; + textfont_prop_val cur; hr = get_textfont_prop_for_pos(rng->reOle, i, propid, &cur); if (FAILED(hr)) return hr; - if (cur != v) + if (!is_equal_textfont_prop_value(propid, &v, &cur)) return S_OK; } @@ -273,6 +313,32 @@ static HRESULT get_textfont_prop(ITextRange *range, enum textfont_prop_id propid return S_OK; } +static HRESULT get_textfont_propf(ITextRange *range, enum textfont_prop_id propid, FLOAT *value) +{ + textfont_prop_val v; + HRESULT hr; + + if (!value) + return E_INVALIDARG; + + hr = get_textfont_prop(range, propid, &v); + *value = v.f; + return hr; +} + +static HRESULT get_textfont_propl(ITextRange *range, enum textfont_prop_id propid, LONG *value) +{ + textfont_prop_val v; + HRESULT hr; + + if (!value) + return E_INVALIDARG; + + hr = get_textfont_prop(range, propid, &v); + *value = v.l; + return hr; +} + static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { IRichEditOleImpl *This = impl_from_IUnknown(iface); @@ -1770,7 +1836,7 @@ static HRESULT WINAPI TextFont_GetBold(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); TRACE("(%p)->(%p)\n", This, value); - return get_textfont_prop(This->range, FONT_BOLD, value); + return get_textfont_propl(This->range, FONT_BOLD, value); } static HRESULT WINAPI TextFont_SetBold(ITextFont *iface, LONG value) @@ -1840,7 +1906,7 @@ static HRESULT WINAPI TextFont_GetItalic(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); TRACE("(%p)->(%p)\n", This, value); - return get_textfont_prop(This->range, FONT_ITALIC, value); + return get_textfont_propl(This->range, FONT_ITALIC, value); } static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value) @@ -1951,8 +2017,8 @@ static HRESULT WINAPI TextFont_SetShadow(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetSize(ITextFont *iface, FLOAT *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propf(This->range, FONT_SIZE, value); } static HRESULT WINAPI TextFont_SetSize(ITextFont *iface, FLOAT value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 6e80fd9..a85f485 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1219,6 +1219,7 @@ static void test_GetFont(void) ITextFont *font, *font2; CHARFORMAT2A cf; LONG value; + float size; HRESULT hr; HWND hwnd; BOOL ret; @@ -1263,6 +1264,14 @@ static void test_GetFont(void) hr = ITextFont_GetItalic(font, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ITextFont_GetSize(font, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + size = 0.0; + hr = ITextFont_GetSize(font, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size > 0.0, "size %.2f\n", size); + /* range is non-italic */ value = tomTrue; hr = ITextFont_GetItalic(font, &value); @@ -1270,8 +1279,9 @@ static void test_GetFont(void) ok(value == tomFalse, "got %d\n", value); cf.cbSize = sizeof(CHARFORMAT2A); - cf.dwMask = CFM_ITALIC; + cf.dwMask = CFM_ITALIC|CFM_SIZE; cf.dwEffects = CFE_ITALIC; + cf.yHeight = 24.0; SendMessageA(hwnd, EM_SETSEL, 2, 3); ret = SendMessageA(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); @@ -1283,6 +1293,11 @@ static void test_GetFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(value == tomUndefined, "got %d\n", value); + size = 0.0; + hr = ITextFont_GetSize(font, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size == tomUndefined, "size %.2f\n", size); + ITextFont_Release(font); ITextRange_Release(range); release_interfaces(&hwnd, &reOle, &doc, NULL);

1 0

Nikolay Sivov : riched20: Implement GetUnderline().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: d7a1700a29a52c8548847888faddaeb1c7660f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a1700a29a52c8548847888f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:30:06 2015 +0300 riched20: Implement GetUnderline(). --- dlls/riched20/richole.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 95a92fe..8fecc8c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -220,6 +220,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te { case FONT_BOLD: case FONT_ITALIC: + case FONT_UNDERLINE: return left->l == right->l; case FONT_SIZE: return left->f == right->f; @@ -235,6 +236,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo { case FONT_BOLD: case FONT_ITALIC: + case FONT_UNDERLINE: v->l = tomUndefined; return; case FONT_SIZE: @@ -273,6 +275,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_SIZE: value->f = fmt.yHeight; break; + case FONT_UNDERLINE: + value->l = fmt.dwEffects & CFE_UNDERLINE ? tomTrue : tomFalse; + break; default: FIXME("unhandled font property %d\n", propid); return E_FAIL; @@ -2101,8 +2106,8 @@ static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetUnderline(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_UNDERLINE, value); } static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value)

1 0

Nikolay Sivov : riched20: Implement GetForeColor().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: f875c804bd1dd72c970f639db530c2571f9d1e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f875c804bd1dd72c970f639db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:35:44 2015 +0300 riched20: Implement GetForeColor(). --- dlls/riched20/richole.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8fecc8c..9f8bc17 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -219,6 +219,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te switch (propid) { case FONT_BOLD: + case FONT_FORECOLOR: case FONT_ITALIC: case FONT_UNDERLINE: return left->l == right->l; @@ -235,6 +236,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo switch (propid) { case FONT_BOLD: + case FONT_FORECOLOR: case FONT_ITALIC: case FONT_UNDERLINE: v->l = tomUndefined; @@ -269,6 +271,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_BOLD: value->l = fmt.dwEffects & CFE_BOLD ? tomTrue : tomFalse; break; + case FONT_FORECOLOR: + value->l = fmt.dwEffects & CFE_AUTOCOLOR ? GetSysColor(COLOR_WINDOWTEXT) : fmt.crTextColor; + break; case FONT_ITALIC: value->l = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; break; @@ -1868,8 +1873,8 @@ static HRESULT WINAPI TextFont_SetEmboss(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetForeColor(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_FORECOLOR, value); } static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value)

1 0

Nikolay Sivov : riched20: Implement GetStrikeThrough().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 0f53b87367736fc40bdf6d1a604039d0a864f9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f53b87367736fc40bdf6d1a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:43:19 2015 +0300 riched20: Implement GetStrikeThrough(). --- dlls/riched20/richole.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9f8bc17..b2e78f2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -221,6 +221,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_STRIKETHROUGH: case FONT_UNDERLINE: return left->l == right->l; case FONT_SIZE: @@ -238,6 +239,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_STRIKETHROUGH: case FONT_UNDERLINE: v->l = tomUndefined; return; @@ -280,6 +282,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_SIZE: value->f = fmt.yHeight; break; + case FONT_STRIKETHROUGH: + value->l = fmt.dwEffects & CFE_STRIKEOUT ? tomTrue : tomFalse; + break; case FONT_UNDERLINE: value->l = fmt.dwEffects & CFE_UNDERLINE ? tomTrue : tomFalse; break; @@ -2069,8 +2074,8 @@ static HRESULT WINAPI TextFont_SetSpacing(ITextFont *iface, FLOAT value) static HRESULT WINAPI TextFont_GetStrikeThrough(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_STRIKETHROUGH, value); } static HRESULT WINAPI TextFont_SetStrikeThrough(ITextFont *iface, LONG value)

1 0

Nikolay Sivov : riched20: Implement GetSubscript()/GetSuperscript().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 1e68433d784950fee5df68a5dd6dc52a6b0079c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e68433d784950fee5df68a5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:46:11 2015 +0300 riched20: Implement GetSubscript()/GetSuperscript(). --- dlls/riched20/richole.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b2e78f2..e4136b0 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -222,6 +222,8 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_FORECOLOR: case FONT_ITALIC: case FONT_STRIKETHROUGH: + case FONT_SUBSCRIPT: + case FONT_SUPERSCRIPT: case FONT_UNDERLINE: return left->l == right->l; case FONT_SIZE: @@ -240,6 +242,8 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo case FONT_FORECOLOR: case FONT_ITALIC: case FONT_STRIKETHROUGH: + case FONT_SUBSCRIPT: + case FONT_SUPERSCRIPT: case FONT_UNDERLINE: v->l = tomUndefined; return; @@ -285,6 +289,12 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_STRIKETHROUGH: value->l = fmt.dwEffects & CFE_STRIKEOUT ? tomTrue : tomFalse; break; + case FONT_SUBSCRIPT: + value->l = fmt.dwEffects & CFE_SUBSCRIPT ? tomTrue : tomFalse; + break; + case FONT_SUPERSCRIPT: + value->l = fmt.dwEffects & CFE_SUPERSCRIPT ? tomTrue : tomFalse; + break; case FONT_UNDERLINE: value->l = fmt.dwEffects & CFE_UNDERLINE ? tomTrue : tomFalse; break; @@ -2088,8 +2098,8 @@ static HRESULT WINAPI TextFont_SetStrikeThrough(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetSubscript(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_SUBSCRIPT, value); } static HRESULT WINAPI TextFont_SetSubscript(ITextFont *iface, LONG value) @@ -2102,8 +2112,8 @@ static HRESULT WINAPI TextFont_SetSubscript(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetSuperscript(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_SUPERSCRIPT, value); } static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value)

1 0

Nikolay Sivov : riched20: Implement GetLanguageID().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 72ef367992e4c9c39bdd9b13fb019a2ad9ec544c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ef367992e4c9c39bdd9b13f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 11:18:52 2015 +0300 riched20: Implement GetLanguageID(). --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index e4136b0..1fbbc0a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -221,6 +221,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_LANGID: case FONT_STRIKETHROUGH: case FONT_SUBSCRIPT: case FONT_SUPERSCRIPT: @@ -241,6 +242,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_LANGID: case FONT_STRIKETHROUGH: case FONT_SUBSCRIPT: case FONT_SUPERSCRIPT: @@ -283,6 +285,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_ITALIC: value->l = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; break; + case FONT_LANGID: + value->l = fmt.lcid; + break; case FONT_SIZE: value->f = fmt.yHeight; break; @@ -1958,8 +1963,8 @@ static HRESULT WINAPI TextFont_SetKerning(ITextFont *iface, FLOAT value) static HRESULT WINAPI TextFont_GetLanguageID(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_LANGID, value); } static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a85f485..6ff2fe3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1272,6 +1272,13 @@ static void test_GetFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(size > 0.0, "size %.2f\n", size); + value = 0; + hr = ITextFont_GetLanguageID(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == GetUserDefaultLCID(), "got lcid %x, user lcid %x\n", value, + GetUserDefaultLCID()); + /* range is non-italic */ value = tomTrue; hr = ITextFont_GetItalic(font, &value);

1 0