January 2015 - Wine-commits

Hans Leidekker : wbemprox: Implement Win32_ComputerSystemProduct.UUID.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: c007b5f94c3d430cc0ad414fa72d94e4b7d8255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c007b5f94c3d430cc0ad414fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:27:13 2015 +0100 wbemprox: Implement Win32_ComputerSystemProduct.UUID. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c37c39..5f61f4a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -53,6 +53,8 @@ static const WCHAR class_cdromdriveW[] = {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_compsysproductW[] = + {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; static const WCHAR class_datafileW[] = {'C','I','M','_','D','a','t','a','F','i','l','e',0}; static const WCHAR class_directoryW[] = @@ -282,6 +284,8 @@ static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +static const WCHAR prop_uuidW[] = + {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = @@ -332,6 +336,10 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_compsysproduct[] = +{ + { prop_uuidW, CIM_STRING } +}; static const struct column col_datafile[] = { { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -563,6 +571,9 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR compsysproduct_uuidW[] = + {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','0','0',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -649,6 +660,10 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_computersystemproduct +{ + const WCHAR *uuid; +}; struct record_datafile { const WCHAR *name; @@ -855,6 +870,10 @@ static const struct record_bios data_bios[] = { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; +static const struct record_computersystemproduct data_compsysproduct[] = +{ + { compsysproduct_uuidW } +}; static const struct record_param data_param[] = { { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -2456,6 +2475,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, @@ -2463,8 +2483,7 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, - { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, - fill_networkadapterconfig }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia },

1 0

Matteo Bruni : d3d9/tests: Remove a couple duplicate lines.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 6f89df2fb4df592942adcd38c79f030337cca233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f89df2fb4df592942adcd38c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 5 17:17:54 2015 +0100 d3d9/tests: Remove a couple duplicate lines. --- dlls/d3d9/tests/visual.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1aa3d4..acc3a44 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6775,8 +6775,6 @@ static void pretransformed_varying_test(void) hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { IDirect3DPixelShader9 *shader;

1 0

Nikolay Sivov : dwrite: Fix range comparison by locale name.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: ed398419bce3fab6ac50ab025853ec28bc8ae7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed398419bce3fab6ac50ab025… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:01:21 2015 +0300 dwrite: Fix range comparison by locale name. --- dlls/dwrite/layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0ddb0b4..e8b7a10 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -424,7 +424,8 @@ 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->collection == right->collection; + left->collection == right->collection && + !strcmpW(left->locale, right->locale); } static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right)

1 0

Nikolay Sivov : dwrite: Support family name attribute for ranges.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 9661f129e012a273c2f42f8071ef8457e1b03ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9661f129e012a273c2f42f807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:22:40 2015 +0300 dwrite: Support family name attribute for ranges. --- dlls/dwrite/layout.c | 139 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 102 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e8b7a10..0fbaf4a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -68,7 +68,8 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, LAYOUT_RANGE_ATTR_FONTCOLL, - LAYOUT_RANGE_ATTR_LOCALE + LAYOUT_RANGE_ATTR_LOCALE, + LAYOUT_RANGE_ATTR_FONTFAMILY }; struct layout_range_attr_value { @@ -84,6 +85,7 @@ struct layout_range_attr_value { BOOL strikethrough; IDWriteFontCollection *collection; const WCHAR *locale; + const WCHAR *fontfamily; } u; }; @@ -100,6 +102,7 @@ struct layout_range { BOOL strikethrough; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + WCHAR *fontfamily; }; struct layout_run { @@ -407,6 +410,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->collection == value->u.collection; case LAYOUT_RANGE_ATTR_LOCALE: return strcmpW(range->locale, value->u.locale) == 0; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + return strcmpW(range->fontfamily, value->u.fontfamily) == 0; default: ; } @@ -425,7 +430,8 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st left->underline == right->underline && left->strikethrough == right->strikethrough && left->collection == right->collection && - !strcmpW(left->locale, right->locale); + !strcmpW(left->locale, right->locale) && + !strcmpW(left->fontfamily, right->fontfamily); } static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right) @@ -450,6 +456,13 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->effect = NULL; range->underline = FALSE; range->strikethrough = FALSE; + + range->fontfamily = heap_strdupW(layout->format.family_name); + if (!range->fontfamily) { + heap_free(range); + return NULL; + } + range->collection = layout->format.collection; if (range->collection) IDWriteFontCollection_AddRef(range->collection); @@ -489,6 +502,7 @@ static void free_layout_range(struct layout_range *range) IUnknown_Release(range->effect); if (range->collection) IDWriteFontCollection_Release(range->collection); + heap_free(range->fontfamily); heap_free(range); } @@ -591,6 +605,13 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang if (changed) strcpyW(dest->locale, value->u.locale); break; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + changed = strcmpW(dest->fontfamily, value->u.fontfamily) != 0; + if (changed) { + heap_free(dest->fontfamily); + dest->fontfamily = heap_strdupW(value->u.fontfamily); + } + break; default: ; } @@ -735,6 +756,63 @@ done: return S_OK; } +static inline const WCHAR *get_string_attribute_ptr(struct layout_range *range, enum layout_range_attr_kind kind) +{ + const WCHAR *str; + + switch (kind) { + case LAYOUT_RANGE_ATTR_LOCALE: + str = range->locale; + break; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + str = range->fontfamily; + break; + default: + str = NULL; + } + + return str; +} + +static HRESULT get_string_attribute_length(struct dwrite_textlayout *layout, enum layout_range_attr_kind kind, UINT32 position, + UINT32 *length, DWRITE_TEXT_RANGE *r) +{ + struct layout_range *range; + const WCHAR *str; + + range = get_layout_range_by_pos(layout, position); + if (!range) { + *length = 0; + return S_OK; + } + + str = get_string_attribute_ptr(range, kind); + *length = strlenW(str); + return return_range(range, r); +} + +static HRESULT get_string_attribute_value(struct dwrite_textlayout *layout, enum layout_range_attr_kind kind, UINT32 position, + WCHAR *ret, UINT32 length, DWRITE_TEXT_RANGE *r) +{ + struct layout_range *range; + const WCHAR *str; + + if (length == 0) + return E_INVALIDARG; + + ret[0] = 0; + range = get_layout_range_by_pos(layout, position); + if (!range) + return E_INVALIDARG; + + str = get_string_attribute_ptr(range, kind); + if (length < strlenW(str) + 1) + return E_NOT_SUFFICIENT_BUFFER; + + strcpyW(ret, str); + return return_range(range, r); +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout2 *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); @@ -1030,8 +1108,20 @@ static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout2 *ifa static HRESULT WINAPI dwritetextlayout_SetFontFamilyName(IDWriteTextLayout2 *iface, WCHAR const *name, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(name), debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_range(&range)); + + if (!name) + return E_INVALIDARG; + + if (!validate_text_range(This, &range)) + return S_OK; + + value.range = range; + value.u.fontfamily = name; + + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTFAMILY, &value); } static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout2 *iface, DWRITE_FONT_WEIGHT weight, DWRITE_TEXT_RANGE range) @@ -1212,19 +1302,19 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou } static HRESULT WINAPI dwritetextlayout_layout_GetFontFamilyNameLength(IDWriteTextLayout2 *iface, - UINT32 pos, UINT32* len, DWRITE_TEXT_RANGE *range) + UINT32 position, UINT32 *length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, pos, len, range); - return E_NOTIMPL; + TRACE("(%p)->(%d %p %p)\n", This, position, length, r); + return get_string_attribute_length(This, LAYOUT_RANGE_ATTR_FONTFAMILY, position, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontFamilyName(IDWriteTextLayout2 *iface, - UINT32 position, WCHAR* name, UINT32 name_size, DWRITE_TEXT_RANGE *range) + UINT32 position, WCHAR *name, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %u %p): stub\n", This, position, name, name_size, range); - return E_NOTIMPL; + TRACE("(%p)->(%u %p %u %p)\n", This, position, name, length, r); + return get_string_attribute_value(This, LAYOUT_RANGE_ATTR_FONTFAMILY, position, name, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout2 *iface, @@ -1376,41 +1466,16 @@ static HRESULT WINAPI dwritetextlayout_layout_GetLocaleNameLength(IDWriteTextLay UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; - TRACE("(%p)->(%u %p %p)\n", This, position, length, r); - - range = get_layout_range_by_pos(This, position); - if (!range) { - *length = 0; - return S_OK; - } - - *length = strlenW(range->locale); - return return_range(range, r); + return get_string_attribute_length(This, LAYOUT_RANGE_ATTR_LOCALE, position, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleName(IDWriteTextLayout2 *iface, UINT32 position, WCHAR* locale, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; - TRACE("(%p)->(%u %p %u %p)\n", This, position, locale, length, r); - - if (length == 0) - return E_INVALIDARG; - - locale[0] = 0; - range = get_layout_range_by_pos(This, position); - if (!range) - return E_INVALIDARG; - - if (length < strlenW(range->locale) + 1) - return E_NOT_SUFFICIENT_BUFFER; - - strcpyW(locale, range->locale); - return return_range(range, r); + return get_string_attribute_value(This, LAYOUT_RANGE_ATTR_LOCALE, position, locale, length, r); } static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,

1 0

Nikolay Sivov : dwrite: Unify temp value variable name.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 48d84eedb5ab48b84e661b2ac7fbc2206d4c4904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d84eedb5ab48b84e661b2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:25:28 2015 +0300 dwrite: Unify temp value variable name. --- dlls/dwrite/layout.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0fbaf4a..6117d69 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1232,17 +1232,17 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range_attr_value attr; + struct layout_range_attr_value value; TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); if (!validate_text_range(This, &range)) return S_OK; - attr.range = range; - attr.u.object = object; + value.range = range; + value.u.object = object; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &attr); + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &value); } static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, IDWriteTypography* typography, DWRITE_TEXT_RANGE range) @@ -1255,7 +1255,7 @@ static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, WCHAR const* locale, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range_attr_value attr; + struct layout_range_attr_value value; TRACE("(%p)->(%s %s)\n", This, debugstr_w(locale), debugstr_range(&range)); @@ -1265,10 +1265,10 @@ static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, if (!validate_text_range(This, &range)) return S_OK; - attr.range = range; - attr.u.locale = locale; + value.range = range; + value.u.locale = locale; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &attr); + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &value); } static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout2 *iface)

1 0

Nikolay Sivov : dwrite: Move range bounds check to an attribute setting helper.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 35a91741d30e33ad354273ebd430660f3dca21c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a91741d30e33ad354273ebd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 3 00:35:04 2015 +0300 dwrite: Move range bounds check to an attribute setting helper. --- dlls/dwrite/layout.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6117d69..e788c6a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -639,6 +639,9 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo BOOL changed = FALSE; DWRITE_TEXT_RANGE r; + if (!validate_text_range(layout, &value->range)) + return S_OK; + /* If new range is completely within existing range, split existing range in two */ if ((outer = find_outer_range(layout, &value->range))) { @@ -1097,9 +1100,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout2 *ifa 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); @@ -1115,12 +1115,8 @@ static HRESULT WINAPI dwritetextlayout_SetFontFamilyName(IDWriteTextLayout2 *ifa if (!name) return E_INVALIDARG; - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.fontfamily = name; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTFAMILY, &value); } @@ -1131,9 +1127,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout2 *iface, TRACE("(%p)->(%d %s)\n", This, weight, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.weight = weight; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_WEIGHT, &value); @@ -1146,9 +1139,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontStyle(IDWriteTextLayout2 *iface, D TRACE("(%p)->(%d %s)\n", This, style, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.style = style; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STYLE, &value); @@ -1161,9 +1151,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout2 *iface, 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); @@ -1176,9 +1163,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout2 *iface, FL 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); @@ -1191,9 +1175,6 @@ static HRESULT WINAPI dwritetextlayout_SetUnderline(IDWriteTextLayout2 *iface, B TRACE("(%p)->(%d %s)\n", This, underline, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.underline = underline; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_UNDERLINE, &value); @@ -1206,9 +1187,6 @@ static HRESULT WINAPI dwritetextlayout_SetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%d %s)\n", This, strikethrough, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.underline = strikethrough; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRIKETHROUGH, &value); @@ -1221,9 +1199,6 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac TRACE("(%p)->(%p %s)\n", This, effect, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.effect = effect; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_EFFECT, &value); @@ -1236,12 +1211,8 @@ static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.object = object; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &value); } @@ -1262,12 +1233,8 @@ static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, if (!locale || strlenW(locale) > LOCALE_NAME_MAX_LENGTH-1) return E_INVALIDARG; - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.locale = locale; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &value); }

1 0

Nikolay Sivov : oleaut32: Use CoTaskMem* functions for safearrays.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: adc091b8dad2a02d81fa50b488396b614f169632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc091b8dad2a02d81fa50b48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 12:45:16 2015 +0300 oleaut32: Use CoTaskMem* functions for safearrays. --- dlls/oleaut32/safearray.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 99ffe27..01dbfc3 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -95,18 +95,18 @@ static const USHORT ignored_copy_features = FADF_CREATEVECTOR; /* Allocate memory */ -static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) +static inline void* SAFEARRAY_Malloc(ULONG size) { - /* FIXME: Memory should be allocated and freed using a per-thread IMalloc - * instance returned from CoGetMalloc(). - */ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulSize); + void *ret = CoTaskMemAlloc(size); + if (ret) + memset(ret, 0, size); + return ret; } /* Free memory */ -static inline BOOL SAFEARRAY_Free(LPVOID lpData) +static inline void SAFEARRAY_Free(void *ptr) { - return HeapFree(GetProcessHeap(), 0, lpData); + CoTaskMemFree(ptr); } /* Get the size of a supported VT type (0 means unsupported) */ @@ -772,8 +772,7 @@ HRESULT WINAPI SafeArrayDestroyDescriptor(SAFEARRAY *psa) !(psa->fFeatures & FADF_DATADELETED)) SAFEARRAY_DestroyData(psa, 0); /* Data not previously deleted */ - if (!SAFEARRAY_Free(lpv)) - return E_UNEXPECTED; + SAFEARRAY_Free(lpv); } return S_OK; } @@ -1283,8 +1282,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) /* If this is not a vector, free the data memory block */ if (!(psa->fFeatures & FADF_CREATEVECTOR)) { - if (!SAFEARRAY_Free(psa->pvData)) - return E_UNEXPECTED; + SAFEARRAY_Free(psa->pvData); psa->pvData = NULL; } else

1 0

Seán de Búrca : kernel32: Implement Get{Time, Date}FormatEx.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 6cd0eb202726616a1c3d9e59915be90016e42862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd0eb202726616a1c3d9e599… Author: Seán de Búrca <leftmostcat(a)gmail.com> Date: Wed Dec 24 11:52:04 2014 -0500 kernel32: Implement Get{Time,Date}FormatEx. --- .../api-ms-win-core-datetime-l1-1-1.spec | 4 +- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/lcformat.c | 71 +++++ dlls/kernel32/tests/locale.c | 300 +++++++++++++++++++++ include/winnls.h | 2 + 5 files changed, 377 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cd0eb202726616a1c3d9…

1 0

Mark Harmstone : include: Add xaudio2.h.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: db75d7bf26ca31ddd5427678a39aabfa594020ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=db75d7bf26ca31ddd5427678a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 4 13:06:33 2015 +0000 include: Add xaudio2.h. --- include/Makefile.in | 1 + include/xaudio2.idl | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 527 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db75d7bf26ca31ddd5427…

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: b46a62843f783a3f6e463d189559b8dc23727a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46a62843f783a3f6e463d189… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 6 16:49:29 2015 +0100 ws2_32: Add a trailing '\n' to a TRACE() call. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4edc38f..4c8d705 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6368,7 +6368,7 @@ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set) break; } - TRACE("(socket %04lx, fd_set %p, count %i) <- %d", s, set, i, ret); + TRACE("(socket %04lx, fd_set %p, count %i) <- %d\n", s, set, i, ret); return ret; }

1 0