August 2014 - Wine-Commits - list.winehq.org

Aric Stewart : dwrite: Make gdiinterop an allocated object.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 4c81231e29f5964850f7400b25285e42029b7921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c81231e29f5964850f7400b2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 13 13:47:13 2014 -0500 dwrite: Make gdiinterop an allocated object. --- dlls/dwrite/gdiinterop.c | 61 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 73da1d2..329bcdb 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -32,6 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct gdiinterop { + IDWriteGdiInterop IDWriteGdiInterop_iface; + LONG ref; +}; + struct rendertarget { IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; LONG ref; @@ -68,6 +73,11 @@ static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBi return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface); } +static inline struct gdiinterop *impl_from_IDWriteGdiInterop(IDWriteGdiInterop *iface) +{ + return CONTAINING_RECORD(iface, struct gdiinterop, IDWriteGdiInterop_iface); +} + static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget *iface, REFIID riid, void **obj) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); @@ -228,33 +238,48 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj) { - TRACE("(%s %p)\n", debugstr_guid(riid), obj); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteGdiInterop)) { *obj = iface; + IDWriteGdiInterop_AddRef(iface); return S_OK; } *obj = NULL; - return E_NOINTERFACE; } static ULONG WINAPI gdiinterop_AddRef(IDWriteGdiInterop *iface) { - return 2; + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop *iface) { - return 1; + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; } static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, LOGFONTW const *logfont, IDWriteFont **font) { - TRACE("(%p %p)\n", logfont, font); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + TRACE("(%p)->(%p %p)\n", This, logfont, font); if (!logfont) return E_INVALIDARG; @@ -264,28 +289,32 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { - FIXME("(%p %p %p): stub\n", font, logfont, is_systemfont); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + FIXME("(%p)->(%p %p %p): stub\n", This, font, logfont, is_systemfont); return E_NOTIMPL; } static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { - TRACE("(%p %p)\n", fontface, logfont); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + TRACE("(%p)->(%p %p)\n", This, fontface, logfont); return convert_fontface_to_logfont(fontface, logfont); } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, HDC hdc, IDWriteFontFace **fontface) { - FIXME("(%p %p): stub\n", hdc, fontface); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + FIXME("(%p)->(%p %p): stub\n", This, hdc, fontface); return E_NOTIMPL; } static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - TRACE("(%p %u %u %p)\n", hdc, width, height, target); + struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); return create_rendertarget(hdc, width, height, target); } @@ -300,10 +329,18 @@ static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = { gdiinterop_CreateBitmapRenderTarget }; -static IDWriteGdiInterop gdiinterop = { &gdiinteropvtbl }; - HRESULT get_gdiinterop(IDWriteGdiInterop **ret) { - *ret = &gdiinterop; + struct gdiinterop *This; + + *ret = NULL; + + This = heap_alloc(sizeof(struct gdiinterop)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteGdiInterop_iface.lpVtbl = &gdiinteropvtbl; + This->ref = 1; + + *ret= &This->IDWriteGdiInterop_iface; return S_OK; }

1 0

Nikolay Sivov : strmbase: Remove noop assignment (PVS-Studio).
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 5bbc402826801f0f05195bb62020355dc84d5caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bbc402826801f0f05195bb62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 25 10:37:43 2014 +0400 strmbase: Remove noop assignment (PVS-Studio). --- dlls/strmbase/pin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 02af5b3..958fbf8 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -81,7 +81,6 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info );

1 0

Nikolay Sivov : dwrite: Support getting/setting per range font size value.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 8448bcc833d78f7cc7022873ab012b554eb40727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8448bcc833d78f7cc7022873a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 24 20:46:16 2014 +0400 dwrite: Support getting/setting per range font size value. --- dlls/dwrite/layout.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ad9d2e4..a2da73b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -50,7 +50,7 @@ struct dwrite_textformat_data { FLOAT spacing; FLOAT baseline; - FLOAT size; + FLOAT fontsize; DWRITE_TRIMMING trimming; IDWriteInlineObject *trimmingsign; @@ -62,6 +62,7 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_WEIGHT, LAYOUT_RANGE_ATTR_STYLE, LAYOUT_RANGE_ATTR_STRETCH, + LAYOUT_RANGE_ATTR_FONTSIZE, LAYOUT_RANGE_ATTR_EFFECT, LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, @@ -75,6 +76,7 @@ struct layout_range_attr_value { DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; + FLOAT fontsize; IDWriteInlineObject *object; IUnknown *effect; BOOL underline; @@ -88,6 +90,7 @@ struct layout_range { DWRITE_TEXT_RANGE range; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; + FLOAT fontsize; DWRITE_FONT_STRETCH stretch; IDWriteInlineObject *object; IUnknown *effect; @@ -170,6 +173,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->style == value->u.style; case LAYOUT_RANGE_ATTR_STRETCH: return range->stretch == value->u.stretch; + case LAYOUT_RANGE_ATTR_FONTSIZE: + return range->fontsize == value->u.fontsize; case LAYOUT_RANGE_ATTR_INLINE: return range->object == value->u.object; case LAYOUT_RANGE_ATTR_EFFECT: @@ -192,6 +197,7 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st return left->weight == right->weight && left->style == right->style && left->stretch == right->stretch && + left->fontsize == right->fontsize && left->object == right->object && left->effect == right->effect && left->underline == right->underline && @@ -216,6 +222,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->weight = layout->format.weight; range->style = layout->format.style; range->stretch = layout->format.stretch; + range->fontsize = layout->format.fontsize; range->object = NULL; range->effect = NULL; range->underline = FALSE; @@ -317,6 +324,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang changed = dest->stretch != value->u.stretch; dest->stretch = value->u.stretch; break; + case LAYOUT_RANGE_ATTR_FONTSIZE: + changed = dest->fontsize != value->u.fontsize; + dest->fontsize = value->u.fontsize; + break; case LAYOUT_RANGE_ATTR_INLINE: changed = dest->object != value->u.object; if (changed && dest->object) @@ -719,7 +730,7 @@ static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); TRACE("(%p)\n", This); - return This->format.size; + return This->format.fontsize; } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout *iface) @@ -826,8 +837,16 @@ static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout *iface, static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout *iface, FLOAT size, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%f %s): stub\n", This, size, debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%.2f %s)\n", This, size, debugstr_range(&range)); + + if (!validate_text_range(This, &range)) + return S_OK; + + value.range = range; + value.u.fontsize = size; + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTSIZE, &value); } static HRESULT WINAPI dwritetextlayout_SetUnderline(IDWriteTextLayout *iface, BOOL underline, DWRITE_TEXT_RANGE range) @@ -1003,11 +1022,20 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontStretch(IDWriteTextLayout * } static HRESULT WINAPI dwritetextlayout_layout_GetFontSize(IDWriteTextLayout *iface, - UINT32 position, FLOAT *size, DWRITE_TEXT_RANGE *range) + UINT32 position, FLOAT *size, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, position, size, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, size, r); + + if (position >= This->len) + return S_OK; + + range = get_layout_range_by_pos(This, position); + *size = range->fontsize; + + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout *iface, @@ -1265,7 +1293,7 @@ static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWr layout->format.weight = IDWriteTextFormat_GetFontWeight(format); layout->format.style = IDWriteTextFormat_GetFontStyle(format); layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); - layout->format.size = IDWriteTextFormat_GetFontSize(format); + layout->format.fontsize= IDWriteTextFormat_GetFontSize(format); layout->format.textalignment = IDWriteTextFormat_GetTextAlignment(format); layout->format.paralign = IDWriteTextFormat_GetParagraphAlignment(format); layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); @@ -1662,7 +1690,7 @@ static FLOAT WINAPI dwritetextformat_GetFontSize(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); TRACE("(%p)\n", This); - return This->format.size; + return This->format.fontsize; } static UINT32 WINAPI dwritetextformat_GetLocaleNameLength(IDWriteTextFormat *iface) @@ -1732,7 +1760,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.locale_len = strlenW(locale); This->format.weight = weight; This->format.style = style; - This->format.size = size; + This->format.fontsize = size; This->format.stretch = stretch; This->format.textalignment = DWRITE_TEXT_ALIGNMENT_LEADING; This->format.paralign = DWRITE_PARAGRAPH_ALIGNMENT_NEAR;

1 0

Nikolay Sivov : dwrite: Support a few more range attributes.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 5547e8e081e80a58af80180506adabfc9db8993b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5547e8e081e80a58af8018050… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 24 19:24:18 2014 +0400 dwrite: Support a few more range attributes. --- dlls/dwrite/layout.c | 91 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 18bafed..ad9d2e4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -61,10 +61,12 @@ struct dwrite_textformat_data { enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_WEIGHT, LAYOUT_RANGE_ATTR_STYLE, + LAYOUT_RANGE_ATTR_STRETCH, LAYOUT_RANGE_ATTR_EFFECT, LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, - LAYOUT_RANGE_ATTR_STRIKETHROUGH + LAYOUT_RANGE_ATTR_STRIKETHROUGH, + LAYOUT_RANGE_ATTR_FONTCOLL }; struct layout_range_attr_value { @@ -72,10 +74,12 @@ struct layout_range_attr_value { union { DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; IDWriteInlineObject *object; IUnknown *effect; BOOL underline; BOOL strikethrough; + IDWriteFontCollection *collection; } u; }; @@ -84,10 +88,12 @@ struct layout_range { DWRITE_TEXT_RANGE range; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; IDWriteInlineObject *object; IUnknown *effect; BOOL underline; BOOL strikethrough; + IDWriteFontCollection *collection; }; struct dwrite_textlayout { @@ -162,6 +168,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->weight == value->u.weight; case LAYOUT_RANGE_ATTR_STYLE: return range->style == value->u.style; + case LAYOUT_RANGE_ATTR_STRETCH: + return range->stretch == value->u.stretch; case LAYOUT_RANGE_ATTR_INLINE: return range->object == value->u.object; case LAYOUT_RANGE_ATTR_EFFECT: @@ -170,6 +178,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_FONTCOLL: + return range->collection == value->u.collection; default: ; } @@ -181,10 +191,12 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st { return left->weight == right->weight && left->style == right->style && + left->stretch == right->stretch && left->object == right->object && left->effect == right->effect && left->underline == right->underline && - left->strikethrough == right->strikethrough; + left->strikethrough == right->strikethrough && + left->collection == right->collection; } static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right) @@ -203,10 +215,14 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->range = *r; range->weight = layout->format.weight; range->style = layout->format.style; + range->stretch = layout->format.stretch; range->object = NULL; range->effect = NULL; range->underline = FALSE; range->strikethrough = FALSE; + range->collection = layout->format.collection; + if (range->collection) + IDWriteFontCollection_Release(range->collection); return range; } @@ -226,6 +242,8 @@ static struct layout_range *alloc_layout_range_from(struct layout_range *from, c IDWriteInlineObject_AddRef(range->object); if (range->effect) IUnknown_AddRef(range->effect); + if (range->collection) + IDWriteFontCollection_AddRef(range->collection); return range; } @@ -236,6 +254,8 @@ static void free_layout_range(struct layout_range *range) IDWriteInlineObject_Release(range->object); if (range->effect) IUnknown_Release(range->effect); + if (range->collection) + IDWriteFontCollection_Release(range->collection); heap_free(range); } @@ -293,6 +313,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang changed = dest->style != value->u.style; dest->style = value->u.style; break; + case LAYOUT_RANGE_ATTR_STRETCH: + changed = dest->stretch != value->u.stretch; + dest->stretch = value->u.stretch; + break; case LAYOUT_RANGE_ATTR_INLINE: changed = dest->object != value->u.object; if (changed && dest->object) @@ -317,6 +341,14 @@ 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_FONTCOLL: + changed = dest->collection != value->u.collection; + if (changed && dest->collection) + IDWriteFontCollection_Release(dest->collection); + dest->collection = value->u.collection; + if (dest->collection) + IDWriteFontCollection_AddRef(dest->collection); + break; default: ; } @@ -727,8 +759,16 @@ static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout *iface, FL static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout *iface, IDWriteFontCollection* collection, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %s): stub\n", This, collection, debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%p %s)\n", This, collection, debugstr_range(&range)); + + if (!validate_text_range(This, &range)) + return S_OK; + + value.range = range; + value.u.collection = collection; + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTCOLL, &value); } static HRESULT WINAPI dwritetextlayout_SetFontFamilyName(IDWriteTextLayout *iface, WCHAR const *name, DWRITE_TEXT_RANGE range) @@ -771,8 +811,16 @@ static HRESULT WINAPI dwritetextlayout_SetFontStyle(IDWriteTextLayout *iface, DW static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout *iface, DWRITE_FONT_STRETCH stretch, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%d %s): stub\n", This, stretch, debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%d %s)\n", This, stretch, debugstr_range(&range)); + + if (!validate_text_range(This, &range)) + return S_OK; + + value.range = range; + value.u.stretch = stretch; + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRETCH, &value); } static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout *iface, FLOAT size, DWRITE_TEXT_RANGE range) @@ -871,12 +919,20 @@ static FLOAT WINAPI dwritetextlayout_GetMaxHeight(IDWriteTextLayout *iface) return This->maxheight; } -static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayout *iface, UINT32 pos, - IDWriteFontCollection** collection, DWRITE_TEXT_RANGE *range) +static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayout *iface, UINT32 position, + IDWriteFontCollection** collection, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %p): stub\n", This, collection, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, collection, r); + + range = get_layout_range_by_pos(This, position); + *collection = range ? range->collection : NULL; + if (*collection) + IDWriteFontCollection_AddRef(*collection); + + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontFamilyNameLength(IDWriteTextLayout *iface, @@ -930,11 +986,20 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontStyle(IDWriteTextLayout *if } static HRESULT WINAPI dwritetextlayout_layout_GetFontStretch(IDWriteTextLayout *iface, - UINT32 position, DWRITE_FONT_STRETCH *stretch, DWRITE_TEXT_RANGE *range) + UINT32 position, DWRITE_FONT_STRETCH *stretch, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, position, stretch, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, stretch, r); + + if (position >= This->len) + return S_OK; + + range = get_layout_range_by_pos(This, position); + *stretch = range->stretch; + + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontSize(IDWriteTextLayout *iface,

1 0

Nikolay Sivov : advapi32: Use heap* helpers in service code.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 65a468ef740479c058f03d57addb1134e50d4e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a468ef740479c058f03d57a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 11:18:13 2014 +0400 advapi32: Use heap* helpers in service code. --- dlls/advapi32/advapi32_misc.h | 6 ++ dlls/advapi32/service.c | 141 +++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65a468ef740479c058f03…

1 0

Gerald Pfeifer : crypt32: Remove unused bin58.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: f9de50ac8a1012c51a38a7717e9c5565903a5774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9de50ac8a1012c51a38a7717… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:18:15 2014 +0200 crypt32: Remove unused bin58. --- dlls/crypt32/tests/encode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 532c322..16b3532 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2055,7 +2055,6 @@ static const unsigned char bin54[] = { 0x03,0x03,0x01,0xff,0xfe }; static const unsigned char bin55[] = { 0xff,0xfe }; static const unsigned char bin56[] = { 0x03,0x02,0x01,0xfe }; static const unsigned char bin57[] = { 0xfe }; -static const unsigned char bin58[] = { 0x03,0x01,0x00 }; static const struct encodedBits bits[] = { /* normal test cases */

1 0

Matteo Bruni : d3dcompiler/tests: Add a test for an include path containing '/'.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 67a6caa1c1e6fd8c88c8cae9ef50af17731a52f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a6caa1c1e6fd8c88c8cae9e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:53 2014 +0200 d3dcompiler/tests: Add a test for an include path containing '/'. --- dlls/d3dcompiler_43/tests/asm.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 618a541..69dca59 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1432,11 +1432,11 @@ static void failure_test(void) { static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, UINT *bytes) { + static const char include[] = "#define REGISTER r0\nvs.1.1\n"; + static const char include2[] = "#include \"incl3.vsh\"\n"; + static const char include3[] = "vs.1.1\n"; + static const char include4[] = "#include <incl3.vsh>\n"; char *buffer; - char include[] = "#define REGISTER r0\nvs.1.1\n"; - char include2[] = "#include \"incl3.vsh\"\n"; - char include3[] = "vs.1.1\n"; - char include4[] = "#include <incl3.vsh>\n"; trace("include_type = %d, filename %s\n", include_type, filename); trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); @@ -1475,6 +1475,13 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i ok(parent_data == NULL, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_SYSTEM, "Wrong include type %d.\n", include_type); } + else if (!strcmp(filename, "includes/incl.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + CopyMemory(buffer, include, sizeof(include)); + *bytes = sizeof(include); + ok(!parent_data, "Wrong parent_data value.\n"); + } else { ok(FALSE, "Unexpected file %s included.\n", filename); @@ -1503,17 +1510,18 @@ struct D3DIncludeImpl { }; static void assembleshader_test(void) { - const char test1[] = { + static const char test1[] = + { "vs.1.1\n" "mov DEF2, v0\n" }; - const char testshader[] = { + static const char testshader[] = + { "#include \"incl.vsh\"\n" "mov REGISTER, v0\n" }; - HRESULT hr; - LPD3DBLOB shader, messages; - D3D_SHADER_MACRO defines[] = { + static const D3D_SHADER_MACRO defines[] = + { { "DEF1", "10 + 15" }, @@ -1524,6 +1532,8 @@ static void assembleshader_test(void) { NULL, NULL } }; + HRESULT hr; + LPD3DBLOB shader, messages; struct D3DIncludeImpl include; /* defines test */ @@ -1587,19 +1597,19 @@ static void assembleshader_test(void) { static void d3dpreprocess_test(void) { - const char test1[] = + static const char test1[] = { "vs.1.1\n" "mov DEF2, v0\n" }; - const char quotation_marks_test[] = + static const char quotation_marks_test[] = { "vs.1.1\n" "; ' comment\n" "; \" comment\n" "mov 0, v0\n" }; - const char *include_test_shaders[] = + static const char *include_test_shaders[] = { "#include \"incl.vsh\"\n" "mov REGISTER, v0\n", @@ -1612,10 +1622,13 @@ static void d3dpreprocess_test(void) "#include <incl4.vsh>\n" "mov REGISTER, v0\n", + + "#include \"includes/incl.vsh\"\n" + "mov REGISTER, v0\n" }; HRESULT hr; ID3DBlob *shader, *messages; - D3D_SHADER_MACRO defines[] = + static const D3D_SHADER_MACRO defines[] = { { "DEF1", "10 + 15"

1 0

Gerald Pfeifer : jscript: Remove unused propertyIsEnumerableW and isPrototypeOfW.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 2d56e775370489352518ec990302a348cf764343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56e775370489352518ec990… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:09:34 2014 +0200 jscript: Remove unused propertyIsEnumerableW and isPrototypeOfW. --- dlls/jscript/date.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d40d80f..81b714f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -48,9 +48,6 @@ typedef struct { static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR toUTCStringW[] = {'t','o','U','T','C','S','t','r','i','n','g',0}; static const WCHAR toGMTStringW[] = {'t','o','G','M','T','S','t','r','i','n','g',0};

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 17df792d902c0c84ee3b155e7dcda445f256263b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17df792d902c0c84ee3b155e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 25 12:03:10 2014 +0400 po: Update Russian translation. --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 75dfce1..72c708a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -850,7 +850,7 @@ msgstr "Файл не существует" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "Среди выбранных объектов не только папки" #: comdlg32.rc:45 msgid "Up One Level" @@ -1041,10 +1041,8 @@ msgid "Open File" msgstr "Открыть файл" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Новая папка" +msgstr "Выберите папку" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Nikolay Sivov : dwrite: Add a tiny helper to return DWRITE_TEXT_RANGE values.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 63d18fd05ca9f2c2975657c650508c5f315e4ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d18fd05ca9f2c2975657c65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 24 19:01:40 2014 +0400 dwrite: Add a tiny helper to return DWRITE_TEXT_RANGE values. --- dlls/dwrite/layout.c | 24 ++++++++++++------------ dlls/dwrite/tests/layout.c | 9 +++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2ef7c9f..18bafed 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -330,6 +330,12 @@ static inline BOOL is_in_layout_range(const DWRITE_TEXT_RANGE *outer, const DWRI (inner->startPosition + inner->length <= outer->startPosition + outer->length); } +static inline HRESULT return_range(const struct layout_range *range, DWRITE_TEXT_RANGE *r) +{ + if (r) *r = range->range; + return S_OK; +} + /* Set attribute value for given range, does all needed splitting/merging of existing ranges. */ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) { @@ -902,9 +908,8 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout *i range = get_layout_range_by_pos(This, position); *weight = range->weight; - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontStyle(IDWriteTextLayout *iface, @@ -920,9 +925,8 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontStyle(IDWriteTextLayout *if range = get_layout_range_by_pos(This, position); *style = range->style; - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontStretch(IDWriteTextLayout *iface, @@ -954,9 +958,8 @@ static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout *iface, range = get_layout_range_by_pos(This, position); *underline = range->underline; - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout *iface, @@ -972,9 +975,8 @@ static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout *iface range = get_layout_range_by_pos(This, position); *strikethrough = range->strikethrough; - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_GetDrawingEffect(IDWriteTextLayout *iface, @@ -992,9 +994,8 @@ static HRESULT WINAPI dwritetextlayout_GetDrawingEffect(IDWriteTextLayout *iface *effect = range->effect; if (*effect) IUnknown_AddRef(*effect); - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout *iface, @@ -1009,9 +1010,8 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout *iface, *object = range ? range->object : NULL; if (*object) IDWriteInlineObject_AddRef(*object); - if (r) *r = range->range; - return S_OK; + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_GetTypography(IDWriteTextLayout *iface, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 019a8f7..b778a80 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -628,6 +628,15 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + /* get from somewhere inside a range */ + inlinetest = NULL; + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, &r2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); + IDWriteInlineObject_Release(inlinetest); + range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj2, range);

1 0