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

Austin English : include/winternl.h: Use ntdef.h where possible.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 33e9798f721587fc08232734d6743ea0afb4afdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e9798f721587fc08232734d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 12 15:48:02 2015 -0500 include/winternl.h: Use ntdef.h where possible. --- include/winternl.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 6dc8c74..f88001f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -21,6 +21,7 @@ #ifndef __WINE_WINTERNL_H #define __WINE_WINTERNL_H +#include <ntdef.h> #include <windef.h> #ifdef __cplusplus @@ -813,11 +814,6 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer -} TIMER_TYPE; - typedef enum _THREADINFOCLASS { ThreadBasicInformation, ThreadTimes, @@ -1762,11 +1758,6 @@ typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID); typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); -typedef enum _EVENT_TYPE { - NotificationEvent, - SynchronizationEvent -} EVENT_TYPE, *PEVENT_TYPE; - typedef enum _EVENT_INFORMATION_CLASS { EventBasicInformation } EVENT_INFORMATION_CLASS, *PEVENT_INFORMATION_CLASS;

1 0

Alexandre Julliard : ntoskrnl: Allow running user APC inside the device manager loop.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: c40239d989075cecb2a0f58dbe122f6db2d19cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40239d989075cecb2a0f58db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 17:02:35 2015 +0900 ntoskrnl: Allow running user APC inside the device manager loop. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0ba26b2..95dcdc9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -244,10 +244,15 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /* restart with larger buffer */ break; case STATUS_PENDING: - if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) + for (;;) { - HeapFree( GetProcessHeap(), 0, in_buff ); - return STATUS_SUCCESS; + DWORD ret = WaitForMultipleObjectsEx( 2, handles, FALSE, INFINITE, TRUE ); + if (ret == WAIT_OBJECT_0) + { + HeapFree( GetProcessHeap(), 0, in_buff ); + return STATUS_SUCCESS; + } + if (ret != WAIT_IO_COMPLETION) break; } break; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_SetPrivateData().
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: b0da585aeb89695dd619603d67a5aa3183e3c306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da585aeb89695dd619603d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:24 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3678a45..5d02cca 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -171,6 +171,7 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 3576e4a..1a1c3d2 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -913,6 +913,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe wined3d_shader_resource_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -944,10 +945,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, @@ -1032,6 +1035,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, return hr; } + wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_SetPrivateDataInterface().
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 171d61a06a77f26ad417e68d407d62a799dc3402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171d61a06a77f26ad417e68d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:25 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 1a1c3d2..68b460c 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -956,9 +956,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_GetPrivateData().
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 777ae5b7c5d05f22cfa164d0b2726dc46dee3771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ae5b7c5d05f22cfa164d0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:26 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 68b460c..3e72f34 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -936,10 +936,12 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface,

1 0

Nikolay Sivov : dwrite: Store pair kerning range attribute.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 672aae654ee687affb11d5a43fe4e1fc549894ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=672aae654ee687affb11d5a43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:25:18 2015 +0300 dwrite: Store pair kerning range attribute. --- dlls/dwrite/layout.c | 35 ++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2665664..d26751e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -67,6 +67,7 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, + LAYOUT_RANGE_ATTR_PAIR_KERNING, LAYOUT_RANGE_ATTR_FONTCOLL, LAYOUT_RANGE_ATTR_LOCALE, LAYOUT_RANGE_ATTR_FONTFAMILY @@ -83,6 +84,7 @@ struct layout_range_attr_value { IUnknown *effect; BOOL underline; BOOL strikethrough; + BOOL pair_kerning; IDWriteFontCollection *collection; const WCHAR *locale; const WCHAR *fontfamily; @@ -100,6 +102,7 @@ struct layout_range { IUnknown *effect; BOOL underline; BOOL strikethrough; + BOOL pair_kerning; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; WCHAR *fontfamily; @@ -628,6 +631,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->underline == value->u.underline; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: return range->strikethrough == value->u.strikethrough; + case LAYOUT_RANGE_ATTR_PAIR_KERNING: + return range->pair_kerning == value->u.pair_kerning; case LAYOUT_RANGE_ATTR_FONTCOLL: return range->collection == value->u.collection; case LAYOUT_RANGE_ATTR_LOCALE: @@ -651,6 +656,7 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st left->effect == right->effect && left->underline == right->underline && left->strikethrough == right->strikethrough && + left->pair_kerning == right->pair_kerning && left->collection == right->collection && !strcmpW(left->locale, right->locale) && !strcmpW(left->fontfamily, right->fontfamily); @@ -678,6 +684,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->effect = NULL; range->underline = FALSE; range->strikethrough = FALSE; + range->pair_kerning = FALSE; range->fontfamily = heap_strdupW(layout->format.family_name); if (!range->fontfamily) { @@ -823,6 +830,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang changed = dest->strikethrough != value->u.strikethrough; dest->strikethrough = value->u.strikethrough; break; + case LAYOUT_RANGE_ATTR_PAIR_KERNING: + changed = dest->pair_kerning != value->u.pair_kerning; + dest->pair_kerning = value->u.pair_kerning; + break; case LAYOUT_RANGE_ATTR_FONTCOLL: changed = set_layout_range_iface_attr((IUnknown**)&dest->collection, (IUnknown*)value->u.collection); break; @@ -1758,16 +1769,30 @@ static HRESULT WINAPI dwritetextlayout1_SetPairKerning(IDWriteTextLayout2 *iface DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d %s): stub\n", This, is_pairkerning_enabled, debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%d %s)\n", This, is_pairkerning_enabled, debugstr_range(&range)); + + value.range = range; + value.u.pair_kerning = !!is_pairkerning_enabled; + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_PAIR_KERNING, &value); } static HRESULT WINAPI dwritetextlayout1_GetPairKerning(IDWriteTextLayout2 *iface, UINT32 position, BOOL *is_pairkerning_enabled, - DWRITE_TEXT_RANGE *range) + DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p %p): stub\n", This, is_pairkerning_enabled, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, is_pairkerning_enabled, r); + + if (position >= This->len) + return S_OK; + + range = get_layout_range_by_pos(This, position); + *is_pairkerning_enabled = range->pair_kerning; + + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout1_SetCharacterSpacing(IDWriteTextLayout2 *iface, FLOAT leading_spacing, FLOAT trailing_spacing, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 89c96e4..c796c12 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1035,6 +1035,60 @@ if (0) /* crashes on native */ IDWriteTextFormat_Release(format); } +static void test_SetPairKerning(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextLayout1 *layout1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + BOOL kerning; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void**)&layout1); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("SetPairKerning() is not supported.\n"); + return; + } + +if (0) { /* crashes on native */ + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, NULL); + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, &range); +} + + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 0; + kerning = TRUE; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!kerning, "got %d\n", kerning); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout1_SetPairKerning(layout1, 2, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + kerning = FALSE; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(kerning == TRUE, "got %d\n", kerning); + + IDWriteTextLayout1_Release(layout1); +} + START_TEST(layout) { HRESULT hr; @@ -1061,6 +1115,7 @@ START_TEST(layout) test_typography(); test_GetClusterMetrics(); test_SetLocaleName(); + test_SetPairKerning(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store vertical orientation property.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 8a46a01008cd890276b993410cecc4d2597f90c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a46a01008cd890276b993410… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:58:32 2015 +0300 dwrite: Store vertical orientation property. --- dlls/dwrite/layout.c | 39 +++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d26751e..26d84a3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -47,6 +47,7 @@ struct dwrite_textformat_data { DWRITE_TEXT_ALIGNMENT textalignment; DWRITE_FLOW_DIRECTION flow; DWRITE_LINE_SPACING_METHOD spacingmethod; + DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; FLOAT spacing; FLOAT baseline; @@ -1821,15 +1822,21 @@ static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout2 *iface, DW static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout2 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d): stub\n", This, orientation); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, orientation); + + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + This->format.vertical_orientation = orientation; + return S_OK; } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGlyphOrientation(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p): stub\n", This); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("(%p)\n", This); + return This->format.vertical_orientation; } static HRESULT WINAPI dwritetextlayout2_SetLastLineWrapping(IDWriteTextLayout2 *iface, BOOL lastline_wrapping_enabled) @@ -2174,6 +2181,7 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = { static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) { + IDWriteTextFormat1 *format1; UINT32 len; HRESULT hr; @@ -2217,6 +2225,14 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I return hr; layout->format.family_len = len; + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); + if (hr == S_OK) { + layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + IDWriteTextFormat1_Release(format1); + } + else + layout->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -2674,15 +2690,21 @@ static HRESULT WINAPI dwritetextformat_GetLocaleName(IDWriteTextFormat1 *iface, static HRESULT WINAPI dwritetextformat1_SetVerticalGlyphOrientation(IDWriteTextFormat1 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, orientation); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, orientation); + + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + This->format.vertical_orientation = orientation; + return S_OK; } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGlyphOrientation(IDWriteTextFormat1 *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("(%p)\n", This); + return This->format.vertical_orientation; } static HRESULT WINAPI dwritetextformat1_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled) @@ -2792,6 +2814,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.readingdir = DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; This->format.flow = DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; This->format.spacingmethod = DWRITE_LINE_SPACING_METHOD_DEFAULT; + This->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; This->format.spacing = 0.0; This->format.baseline = 0.0; This->format.trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c796c12..eb00e53 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1089,6 +1089,40 @@ if (0) { /* crashes on native */ IDWriteTextLayout1_Release(layout1); } +static void test_SetVerticalGlyphOrientation(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("SetVerticalGlyphOrientation() is not supported.\n"); + return; + } + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "got %d\n", orientation); + + hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDWriteTextLayout2_Release(layout2); +} + START_TEST(layout) { HRESULT hr; @@ -1116,6 +1150,7 @@ START_TEST(layout) test_GetClusterMetrics(); test_SetLocaleName(); test_SetPairKerning(); + test_SetVerticalGlyphOrientation(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Fix GetClusterMetrics() return value.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: e6ce0e9f26d563b4f3c2eb5aed7527419e093432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ce0e9f26d563b4f3c2eb5ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:59:26 2015 +0300 dwrite: Fix GetClusterMetrics() return value. --- dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 26d84a3..24fb580 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1730,7 +1730,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); *count = This->clusters_count; - return max_count < This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; + return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eb00e53..a0de75e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -947,7 +947,6 @@ static void test_GetClusterMetrics(void) count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); -todo_wine ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 4, "got %u\n", count); @@ -962,10 +961,10 @@ todo_wine /* inline object takes a separate cluster, replaced codepoints number doesn't matter */ count = 0; hr = IDWriteTextLayout_GetClusterMetrics(layout, NULL, 0, &count); -todo_wine { ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); +todo_wine ok(count == 3, "got %u\n", count); -} + IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Francois Gouget : localspl: Remove uneeded NONAMELESSUNION directives.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: dc9684b6632024dda96e06c6ddfad18737b48235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9684b6632024dda96e06c6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:31:58 2015 +0100 localspl: Remove uneeded NONAMELESSUNION directives. --- dlls/localspl/localmon.c | 1 - dlls/localspl/localspl_main.c | 1 - dlls/localspl/provider.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 8737a06..4ee3efb 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index d4a3c33..48db9c3 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8256c5c..b5fcdb1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : mshtml: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: ff983cc36a23e5c4149e7122f5d7867130a4e3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff983cc36a23e5c4149e7122f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:10 2015 +0100 mshtml: Remove unneeded NONAMELESSXXX directives. --- dlls/mshtml/navigate.c | 1 - dlls/mshtml/persist.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 39e2733..e1516d2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 1263f43..20f3191 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -22,8 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0