January 2015 - Wine-Commits

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSHostName.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Module: wine Branch: master Commit: 0052695426db398b6a5da99196a1f7e88af86c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0052695426db398b6a5da9919… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:26:50 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSHostName. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index b5127cb..0307e0e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 +IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3f51f7d..0c37c39 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winsock2.h" +#include "ws2tcpip.h" #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h" @@ -149,6 +150,8 @@ static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR prop_diskindexW[] = {'D','i','s','k','I','n','d','e','x',0}; +static const WCHAR prop_dnshostnameW[] = + {'D','N','S','H','o','s','t','N','a','m','e',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -389,6 +392,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, @@ -705,6 +709,7 @@ struct record_networkadapter }; struct record_networkadapterconfig { + const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; int ipenabled; @@ -1829,6 +1834,17 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) +{ + const SOCKET_ADDRESS *sa = &addr->Address; + WCHAR buf[NI_MAXHOST]; + + if (!addr) return NULL; + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + 0, NI_NAMEREQD )) return NULL; + return heap_strdupW( buf ); +} + static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { struct record_networkadapterconfig *rec; @@ -1860,6 +1876,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20; rec->ipenabled = -1;

1 0

André Hentschel : Update copyright info for 2015.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

Module: wine Branch: master Commit: 25f24f2b0093ca14f8ac0a7878462c50b1c5a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f24f2b0093ca14f8ac0a787… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 6 18:47:53 2015 +0100 Update copyright info for 2015. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 429646c..6dbf8c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index d8aeaf8..5938582 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Nikolay Sivov : dwrite/tests: Fix buffer overflow when filling test string.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

Module: wine Branch: master Commit: de09e9b94ed340c8004a0919157a52fd90cb9f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de09e9b94ed340c8004a09191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 19:45:04 2015 +0300 dwrite/tests: Fix buffer overflow when filling test string. --- dlls/dwrite/tests/layout.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b90d7af..1a1cfd9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -927,7 +927,7 @@ todo_wine { static void test_SetLocaleName(void) { static const WCHAR strW[] = {'a','b','c','d',0}; - WCHAR buffW[LOCALE_NAME_MAX_LENGTH+5]; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; @@ -971,10 +971,8 @@ if (0) /* crashes on native */ /* name is too long */ lstrcpyW(buffW, strW); - while (lstrlenW(buffW) < LOCALE_NAME_MAX_LENGTH) { + while (lstrlenW(buffW) <= LOCALE_NAME_MAX_LENGTH) lstrcatW(buffW, strW); - } - lstrcatW(buffW, strW); range.startPosition = 0; range.length = 1;

1 0

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

Jan. 6, 2015

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

Nikolay Sivov : oleaut32: Use CoTaskMem* functions for safearrays.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

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

Mark Harmstone : include: Add xaudio2.h.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

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

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

Jan. 6, 2015

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

Nikolay Sivov : dwrite: Support family name attribute for ranges.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

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: Fix range comparison by locale name.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

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

Matteo Bruni : d3d9/tests: Remove a couple duplicate lines.
by Alexandre Julliard Jan. 6, 2015

Jan. 6, 2015

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