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

Nikolay Sivov : dwrite: Implement outline mode for DrawGlyphRun().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 204d46c6741d76f13cd52359eb59990cf4a10d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204d46c6741d76f13cd52359e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 18:55:52 2015 +0300 dwrite: Implement outline mode for DrawGlyphRun(). --- dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 1 - 2 files changed, 159 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8c0aa43..da4fc5f 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -45,6 +45,7 @@ struct dib_data { struct rendertarget { IDWriteBitmapRenderTarget1 IDWriteBitmapRenderTarget1_iface; + ID2D1SimplifiedGeometrySink ID2D1SimplifiedGeometrySink_iface; LONG ref; IDWriteFactory *factory; @@ -99,11 +100,111 @@ static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget1(IDWriteB return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget1_iface); } +static inline struct rendertarget *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) +{ + return CONTAINING_RECORD(iface, struct rendertarget, ID2D1SimplifiedGeometrySink_iface); +} + static inline struct gdiinterop *impl_from_IDWriteGdiInterop(IDWriteGdiInterop *iface) { return CONTAINING_RECORD(iface, struct gdiinterop, IDWriteGdiInterop_iface); } +static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySink *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_ID2D1SimplifiedGeometrySink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + ID2D1SimplifiedGeometrySink_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI rendertarget_sink_AddRef(ID2D1SimplifiedGeometrySink *iface) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_AddRef(&This->IDWriteBitmapRenderTarget1_iface); +} + +static ULONG WINAPI rendertarget_sink_Release(ID2D1SimplifiedGeometrySink *iface) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_Release(&This->IDWriteBitmapRenderTarget1_iface); +} + +static void WINAPI rendertarget_sink_SetFillMode(ID2D1SimplifiedGeometrySink *iface, D2D1_FILL_MODE mode) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + SetPolyFillMode(This->hdc, mode == D2D1_FILL_MODE_ALTERNATE ? ALTERNATE : WINDING); +} + +static void WINAPI rendertarget_sink_SetSegmentFlags(ID2D1SimplifiedGeometrySink *iface, D2D1_PATH_SEGMENT vertexFlags) +{ +} + +static void WINAPI rendertarget_sink_BeginFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + MoveToEx(This->hdc, startPoint.x, startPoint.y, NULL); +} + +static void WINAPI rendertarget_sink_AddLines(ID2D1SimplifiedGeometrySink *iface, const D2D1_POINT_2F *points, UINT32 count) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + + while (count--) { + LineTo(This->hdc, points->x, points->y); + points++; + } +} + +static void WINAPI rendertarget_sink_AddBeziers(ID2D1SimplifiedGeometrySink *iface, const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + POINT points[3]; + + while (count--) { + points[0].x = beziers->point1.x; + points[0].y = beziers->point1.y; + points[1].x = beziers->point2.x; + points[1].y = beziers->point2.y; + points[2].x = beziers->point3.x; + points[2].y = beziers->point3.y; + + PolyBezierTo(This->hdc, points, 3); + beziers++; + } +} + +static void WINAPI rendertarget_sink_EndFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_FIGURE_END figureEnd) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + CloseFigure(This->hdc); +} + +static HRESULT WINAPI rendertarget_sink_Close(ID2D1SimplifiedGeometrySink *iface) +{ + return S_OK; +} + +static const ID2D1SimplifiedGeometrySinkVtbl rendertargetsinkvtbl = { + rendertarget_sink_QueryInterface, + rendertarget_sink_AddRef, + rendertarget_sink_Release, + rendertarget_sink_SetFillMode, + rendertarget_sink_SetSegmentFlags, + rendertarget_sink_BeginFigure, + rendertarget_sink_AddLines, + rendertarget_sink_AddBeziers, + rendertarget_sink_EndFigure, + rendertarget_sink_Close +}; + static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget1 *iface, REFIID riid, void **obj) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); @@ -213,6 +314,8 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac TRACE("(%p)->(%.2f %.2f %d %p %p 0x%08x %p)\n", This, originX, originY, measuring_mode, run, params, color, bbox_ret); + SetRectEmpty(bbox_ret); + if (!This->dib.ptr) return S_OK; @@ -221,9 +324,59 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (FAILED(hr)) return hr; - /* FIXME: outline mode rendering is not supported for this target yet */ - if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) - rendermode = DWRITE_RENDERING_MODE_ALIASED; + target.left = target.top = 0; + target.right = This->size.cx; + target.bottom = This->size.cy; + + if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) { + static const XFORM identity = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; + const DWRITE_MATRIX *m = &This->m; + XFORM xform; + + /* target allows any transform to be set, filter it here */ + if (m->m11 * m->m22 == m->m12 * m->m21) { + xform.eM11 = 1.0f; + xform.eM12 = 0.0f; + xform.eM21 = 0.0f; + xform.eM22 = 1.0f; + xform.eDx = originX; + xform.eDy = originY; + } else { + xform.eM11 = m->m11; + xform.eM12 = m->m12; + xform.eM21 = m->m21; + xform.eM22 = m->m22; + xform.eDx = m->m11 * originX + m->m21 * originY + m->dx; + xform.eDy = m->m12 * originX + m->m22 * originY + m->dy; + } + SetWorldTransform(This->hdc, &xform); + + BeginPath(This->hdc); + + hr = IDWriteFontFace_GetGlyphRunOutline(run->fontFace, run->fontEmSize * This->ppdip, + run->glyphIndices, run->glyphAdvances, run->glyphOffsets, run->glyphCount, + run->isSideways, run->bidiLevel & 1, &This->ID2D1SimplifiedGeometrySink_iface); + + EndPath(This->hdc); + + if (hr == S_OK) { + HBRUSH brush = CreateSolidBrush(color); + + SelectObject(This->hdc, brush); + + FillPath(This->hdc); + + /* FIXME: one way to get affected rectangle bounds is to use region fill */ + if (bbox_ret) + *bbox_ret = target; + + DeleteObject(brush); + } + + SetWorldTransform(This->hdc, &identity); + + return hr; + } hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, run, This->ppdip, &This->m, rendermode, measuring_mode, @@ -241,11 +394,6 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1; } - target.left = target.top = 0; - target.right = This->size.cx; - target.bottom = This->size.cy; - - SetRectEmpty(bbox_ret); if (IntersectRect(&target, &target, &bounds)) { UINT32 size = (target.right - target.left) * (target.bottom - target.top); BYTE *bitmap; @@ -261,7 +409,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac else blit_subpixel_888(&This->dib, This->size.cx, bitmap, &target, color); - *bbox_ret = target; + if (bbox_ret) *bbox_ret = target; } heap_free(bitmap); @@ -387,9 +535,11 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt if (!target) return E_OUTOFMEMORY; target->IDWriteBitmapRenderTarget1_iface.lpVtbl = &rendertargetvtbl; + target->ID2D1SimplifiedGeometrySink_iface.lpVtbl = &rendertargetsinkvtbl; target->ref = 1; target->hdc = CreateCompatibleDC(hdc); + SetGraphicsMode(target->hdc, GM_ADVANCED); hr = create_target_dibsection(target, width, height); if (FAILED(hr)) { IDWriteBitmapRenderTarget1_Release(&target->IDWriteBitmapRenderTarget1_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b132749..9ba0d18 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -794,7 +794,6 @@ if (0) /* crashes on native */ /* test mode */ ret = GetGraphicsMode(hdc); -todo_wine ok(ret == GM_ADVANCED, "got %d\n", ret); hbm = GetCurrentObject(hdc, OBJ_BITMAP);

1 0

Nikolay Sivov : dwrite: Use aliased outline threshold for GDI target.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 433b7c04c7f6544212217334faf735c8b8e07a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433b7c04c7f6544212217334f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 18:56:38 2015 +0300 dwrite: Use aliased outline threshold for GDI target. --- dlls/dwrite/gdiinterop.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index da4fc5f..6f96656 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -308,6 +308,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac IDWriteGlyphRunAnalysis *analysis; DWRITE_RENDERING_MODE rendermode; DWRITE_TEXTURE_TYPE texturetype; + IDWriteFontFace1 *fontface1; RECT target, bounds; HRESULT hr; @@ -319,8 +320,17 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; - hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, - This->ppdip, measuring_mode, params, &rendermode); + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, run->fontEmSize, This->ppdip * 96.0f, + This->ppdip * 96.0f, NULL, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + &rendermode); + IDWriteFontFace1_Release(fontface1); + } + else + hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, + This->ppdip, measuring_mode, params, &rendermode); + if (FAILED(hr)) return hr;

1 0

Alexandre Julliard : secur32: Avoid ssize_t type that causes printf format warnings.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 52e68a7823aff32a399e265c47140491882b7498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e68a7823aff32a399e265c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 15:34:20 2015 +0900 secur32: Avoid ssize_t type that causes printf format warnings. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index d2c64fc..95c9bda 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -402,7 +402,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret, total = 0; + SSIZE_T ret, total = 0; for (;;) { @@ -410,7 +410,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, if (ret >= 0) { total += ret; - TRACE( "sent %d now %d/%ld\n", ret, total, *length ); + TRACE( "sent %ld now %ld/%ld\n", ret, total, *length ); if (total == *length) return SEC_E_OK; } else if (ret == GNUTLS_E_AGAIN)

1 0

Hugh McMaster : kernel32: Reset insert key toggle when Insert Mode changes.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: ac3a684d3b5b939772fb0a22d99e9a9c2d8201c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3a684d3b5b939772fb0a22d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 13 15:22:17 2015 +1000 kernel32: Reset insert key toggle when Insert Mode changes. --- dlls/kernel32/editline.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index c0234d7..b330869 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -913,7 +913,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) const KeyEntry* ke; unsigned ofs; void (*func)(struct WCEL_Context* ctx); - DWORD mode, ks; + DWORD mode, input_mode, ks; int use_emacs; memset(&ctx, 0, sizeof(ctx)); @@ -928,6 +928,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) return NULL; if (!GetConsoleMode(hConsoleIn, &mode)) mode = 0; + input_mode = mode; ctx.shall_echo = (mode & ENABLE_ECHO_INPUT) ? 1 : 0; ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0; if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; @@ -982,6 +983,11 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } GetConsoleMode(hConsoleIn, &mode); + if (input_mode != mode) + { + input_mode = mode; + ctx.insertkey = 0; + } ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); if (ctx.insertkey)

1 0

Bruno Jesus : include: Add tcpestats.h.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 2eba32b93613a8c1c7e3dcff19e98979f193b4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eba32b93613a8c1c7e3dcff1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 9 00:11:29 2015 +0800 include: Add tcpestats.h. --- include/Makefile.in | 1 + include/tcpestats.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b5229c6..1dc912b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -580,6 +580,7 @@ SRCDIR_INCLUDES = \ t2embapi.h \ tapi.h \ tchar.h \ + tcpestats.h \ tcpmib.h \ textserv.h \ tlhelp32.h \ diff --git a/include/tcpestats.h b/include/tcpestats.h new file mode 100644 index 0000000..0e22ee6 --- /dev/null +++ b/include/tcpestats.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Bruno Jesus + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _TCPESTATS_ +#define _TCPESTATS_ + +/* Values used in Get/SetPerTcpConnectionEStats */ +typedef enum +{ + TcpConnectionEstatsSynOpts, + TcpConnectionEstatsData, + TcpConnectionEstatsSndCong, + TcpConnectionEstatsPath, + TcpConnectionEstatsSendBuff, + TcpConnectionEstatsRec, + TcpConnectionEstatsObsRec, + TcpConnectionEstatsBandwidth, + TcpConnectionEstatsFineRtt, + TcpConnectionEstatsMaximum +} TCP_ESTATS_TYPE; + +#endif /* _TCPESTATS_ */

1 0

Bruno Jesus : iphlpapi: Add a stub for SetPerTcpConnectionEStats.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 89d3f08ca247697d41099772d87e4b4230faab06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d3f08ca247697d41099772d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 9 00:11:35 2015 +0800 iphlpapi: Add a stub for SetPerTcpConnectionEStats. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index d98d5c0..50ea35b 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -285,7 +285,7 @@ #@ stub SetNetworkInformation #@ stub SetPerTcp6ConnectionEStats #@ stub SetPerTcp6ConnectionStats -#@ stub SetPerTcpConnectionEStats +@ stdcall SetPerTcpConnectionEStats( ptr long ptr long long long ) #@ stub SetPerTcpConnectionStats @ stub SetProxyArpEntryToStack @ stub SetRouteWithRef diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e8daa8c..2efabd3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -53,6 +53,7 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" +#include "tcpestats.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -2708,6 +2709,17 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) return 0; } +/****************************************************************** + * SetPerTcpConnectionEStats (IPHLPAPI.@) + */ +DWORD WINAPI SetPerTcpConnectionEStats(PMIB_TCPROW row, TCP_ESTATS_TYPE state, PBYTE rw, + ULONG version, ULONG size, ULONG offset) +{ + FIXME("(row %p, state %d, rw %p, version %u, size %u, offset %u): stub\n", + row, state, rw, version, size, offset); + return ERROR_NOT_SUPPORTED; +} + /****************************************************************** * UnenableRouter (IPHLPAPI.@)

1 0

Gerald Pfeifer : oleaut32: Use proper unsigned type in EXPECT_I8(high, low) .
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: a9363698d4f848365aa4e9ee3f1ad5153d8edf09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9363698d4f848365aa4e9ee3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 9 02:38:53 2015 +0200 oleaut32: Use proper unsigned type in EXPECT_I8(high,low). --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cf9e101..9b05fe7 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1618,7 +1618,7 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); } #define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \ - ok(V_I8(&vOut) == ((((LONG64)(high))<<32)|(low)), "Expected i8 = %x%08x, got %x%08x\n", \ + ok(V_I8(&vOut) == ((((ULONG64)(high))<<32)|(low)), "Expected i8 = %x%08x, got %x%08x\n", \ (LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \

1 0

André Hentschel : vcomp/tests: Comment out architecture dependent tests (shift count overflow).
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: f0b32b8d57d77cb86d5b403a9a0773ea729a9ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b32b8d57d77cb86d5b403a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:05:40 2015 +0200 vcomp/tests: Comment out architecture dependent tests (shift count overflow). Shifting more than variable width adds zeros on ARM to fill up. --- dlls/vcomp/tests/vcomp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f24c654..a111d16 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1286,10 +1286,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, + /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, @@ -1304,7 +1304,7 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, + /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, }; int i;

1 0

André Hentschel : vcomp/tests: Add ARM and ARM64 arch strings.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: e40970bce7bb14063d697caccac6d1794462f29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40970bce7bb14063d697cacc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:06:03 2015 +0200 vcomp/tests: Add ARM and ARM64 arch strings. --- dlls/vcomp/tests/vcomp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a111d16..7bfddc2 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -86,6 +86,10 @@ static void (CDECL *pomp_set_num_threads)(int num_threads); #define ARCH "x86" #elif defined(__x86_64__) #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

André Hentschel : vcomp/tests: Make float test i386 only.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 15495d19ef2645043f41567397c7d593efc859a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15495d19ef2645043f4156739… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:07:09 2015 +0200 vcomp/tests: Make float test i386 only. amd64 and arm don't pass floats on the stack --- dlls/vcomp/tests/vcomp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 7bfddc2..32a8619 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -419,6 +419,7 @@ static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d ok(e == 5, "expected e == 5, got %p\n", (void *)e); } +#ifdef __i386__ static void CDECL fork_float_cb(float a, float b, float c, float d, float e) { ok(1.4999 < a && a < 1.5001, "expected a == 1.5, got %f\n", a); @@ -427,6 +428,7 @@ static void CDECL fork_float_cb(float a, float b, float c, float d, float e) ok(4.4999 < d && d < 4.5001, "expected d == 4.5, got %f\n", d); ok(5.4999 < e && e < 5.5001, "expected e == 5.5, got %f\n", e); } +#endif static void test_vcomp_fork(void) { @@ -453,13 +455,14 @@ static void test_vcomp_fork(void) p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); - if (sizeof(int) < sizeof(void *)) - skip("skipping float test on x86_64\n"); - else +#ifdef __i386__ { void (CDECL *func)(BOOL, int, void *, float, float, float, float, float) = (void *)p_vcomp_fork; func(TRUE, 5, fork_float_cb, 1.5f, 2.5f, 3.5f, 4.5f, 5.5f); } +#else + skip("skipping float test on non-x86\n"); +#endif pomp_set_num_threads(max_threads); }

1 0