November 2016 - Wine-commits

Stefan Silviu : msvcrt: Implement nearbyint and nearbyintf.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 4d37b87219b17049e7b1928bc8148a561382f513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d37b87219b17049e7b1928bc… Author: Stefan Silviu <sylviu44(a)gmail.com> Date: Tue Nov 22 09:39:50 2016 +0100 msvcrt: Implement nearbyint and nearbyintf. Signed-off-by: Stefan Silviu <sylviu44(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 24 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- include/config.h.in | 6 ++++++ include/msvcrt/math.h | 3 +++ 9 files changed, 49 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 3feca3f..783332b 100755 --- a/configure +++ b/configure @@ -17130,6 +17130,8 @@ for ac_func in \ lrintf \ lround \ lroundf \ + nearbyint \ + nearbyintf \ powl \ remainder \ remainderf \ diff --git a/configure.ac b/configure.ac index 1c42e2d..353f271 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,6 +2554,8 @@ AC_CHECK_FUNCS(\ lrintf \ lround \ lroundf \ + nearbyint \ + nearbyintf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index f886b97..87937ea 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -291,9 +291,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) ucrtbase.nearbyint +@ cdecl nearbyintf(float) ucrtbase.nearbyintf +@ cdecl nearbyintl(double) ucrtbase.nearbyintl @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7ce5dfb..f305062 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2296,9 +2296,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) MSVCRT_nearbyint +@ cdecl nearbyintf(float) MSVCRT_nearbyintf +@ cdecl nearbyintl(double) MSVCRT_nearbyint @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1acaf7c..449e8e1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1959,9 +1959,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) msvcr120.nearbyint +@ cdecl nearbyintf(float) msvcr120.nearbyintf +@ cdecl nearbyintl(double) msvcr120.nearbyintl @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e87151a..6880d6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1354,6 +1354,30 @@ double CDECL MSVCRT__yn(int order, double num) } /********************************************************************* + * _nearbyint (MSVCRT.@) + */ +double CDECL MSVCRT_nearbyint(double num) +{ +#ifdef HAVE_NEARBYINT + return nearbyint(num); +#else + return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); +#endif +} + +/********************************************************************* + * _nearbyintf (MSVCRT.@) + */ +float CDECL MSVCRT_nearbyintf(float num) +{ +#ifdef HAVE_NEARBYINTF + return nearbyintf(num); +#else + return MSVCRT_nearbyint(num); +#endif +} + +/********************************************************************* * _nextafter (MSVCRT.@) */ double CDECL MSVCRT__nextafter(double num, double next) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2aa0563..0005850 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2432,9 +2432,9 @@ @ stub nan @ stub nanf @ stub nanl -@ stub nearbyint -@ stub nearbyintf -@ stub nearbyintl +@ cdecl nearbyint(double) MSVCRT_nearbyint +@ cdecl nearbyintf(float) MSVCRT_nearbyintf +@ cdecl nearbyintl(double) MSVCRT_nearbyint @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter diff --git a/include/config.h.in b/include/config.h.in index 40909fe..5dcd90b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -564,6 +564,12 @@ /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H +/* Define to 1 if you have the `nearbyint' function. */ +#undef HAVE_NEARBYINT + +/* Define to 1 if you have the `nearbyintf' function. */ +#undef HAVE_NEARBYINTF + /* Define to 1 if you have the <netdb.h> header file. */ #undef HAVE_NETDB_H diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c76fe0d..5b42b4d 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -148,6 +148,9 @@ float __cdecl fmodf(float, float); #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) +double __cdecl nearbyint(double); +float __cdecl nearbyintf(float); + float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*);

1 0

Hadrien Boizard : comctl32: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 891540436ff8d2a099e5dbe04d4e57ade9d1b905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891540436ff8d2a099e5dbe04… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Tue Nov 22 00:38:39 2016 +0100 comctl32: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tooltips.c | 2 +- dlls/comctl32/trackbar.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 86435ca..80b800e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -816,7 +816,7 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) { int i; - TRACE ("%d, %d\n", pt.x, pt.y); + TRACE ("%s\n", wine_dbgstr_point(&pt)); if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP; if (PtInRect (&infoPtr->checkbox, pt)) return DTHT_CHECKBOX; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0fef638..6a10860 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2170,7 +2170,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) hit = MONTHCAL_HitTest(infoPtr, &ht); - TRACE("%x at (%d, %d)\n", hit, ht.pt.x, ht.pt.y); + TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt)); switch(hit) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 752f870..ca6f50d 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3321,7 +3321,7 @@ REBAR_NCHitTest (const REBAR_INFO *infoPtr, LPARAM lParam) ret, i); ret = (LRESULT) i; } - TRACE("returning %ld, client point (%d,%d)\n", ret, clpt.x, clpt.y); + TRACE("returning %ld, client point %s\n", ret, wine_dbgstr_point(&clpt)); return ret; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 4944e3b..56dc743 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1523,7 +1523,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) &pt); TRACE("tool (%p) %d %d %d\n", infoPtr->hwndSelf, nOldTool, infoPtr->nTool, infoPtr->nCurrentTool); - TRACE("WM_MOUSEMOVE (%p %d %d)\n", infoPtr->hwndSelf, pt.x, pt.y); + TRACE("WM_MOUSEMOVE (%p %s)\n", infoPtr->hwndSelf, wine_dbgstr_point(&pt)); if (infoPtr->nTool != nOldTool) { if(infoPtr->nTool == -1) { /* Moved out of all tools */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 26f5cdc..5ce32e4 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -450,7 +450,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG prevPos = infoPtr->lPos; - TRACE("x=%d, y=%d, dir=%d\n", clickPoint.x, clickPoint.y, dir); + TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir); if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) TRACKBAR_PageDown(infoPtr);

1 0

Nikolay Sivov : d2d1: Implement DrawLine() over DrawGeometry() for a linear path.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 7159479e11b4ad0970236039bb2544e5bec4fb2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7159479e11b4ad0970236039b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 15:10:33 2016 +0300 d2d1: Implement DrawLine() over DrawGeometry() for a linear path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index d4c812b..3deb6e3 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -471,8 +471,36 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - FIXME("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1PathGeometry *geometry; + ID2D1GeometrySink *sink; + HRESULT hr; + + TRACE("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, p0.x, p0.y, p1.x, p1.y, brush, stroke_width, stroke_style); + + if (FAILED(hr = ID2D1Factory_CreatePathGeometry(render_target->factory, &geometry))) + { + WARN("Failed to create path geometry, %#x.\n", hr); + return; + } + + if (FAILED(hr = ID2D1PathGeometry_Open(geometry, &sink))) + { + WARN("Open() failed, %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + return; + } + + ID2D1GeometrySink_BeginFigure(sink, p0, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_AddLine(sink, p1); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + if (FAILED(hr = ID2D1GeometrySink_Close(sink))) + WARN("Close() failed, %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1PathGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTarget *iface,

1 0

Nikolay Sivov : d2d1: Store stroke style properties, implement methods returning them.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 786633e311703fe471e00b49c1fcbdf39d12bc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786633e311703fe471e00b49c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 16:38:36 2016 +0300 d2d1: Store stroke style properties, implement methods returning them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/stroke.c | 43 +++++++++++++++++++++++------------ dlls/d2d1/tests/d2d1.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index a6bc4f3..bfe60ee 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -223,6 +223,7 @@ struct d2d_stroke_style LONG refcount; ID2D1Factory *factory; + D2D1_STROKE_STYLE_PROPERTIES desc; }; void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 167db67..3b5dbfd 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -84,51 +84,65 @@ static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *ifac static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.startCap; } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.endCap; } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.dashCap; } static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return style->desc.miterLimit; } static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); - return D2D1_LINE_JOIN_MITER; + TRACE("iface %p.\n", iface); + + return style->desc.lineJoin; } static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return 0.0f; + return style->desc.dashOffset; } static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_DASH_STYLE_SOLID; + return style->desc.dashStyle; } static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) @@ -168,4 +182,5 @@ void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; ID2D1Factory_AddRef(style->factory = factory); + style->desc = *desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 04ce2b5..857cba2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3333,6 +3333,63 @@ static void test_desktop_dpi(void) ID2D1Factory_Release(factory); } +static void test_stroke_style(void) +{ + D2D1_STROKE_STYLE_PROPERTIES desc; + ID2D1StrokeStyle *style; + ID2D1Factory *factory; + UINT32 count; + HRESULT hr; + D2D1_CAP_STYLE cap_style; + D2D1_LINE_JOIN line_join; + float miter_limit, dash_offset; + D2D1_DASH_STYLE dash_style; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + desc.startCap = D2D1_CAP_STYLE_SQUARE; + desc.endCap = D2D1_CAP_STYLE_ROUND; + desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + desc.miterLimit = 1.5f; + desc.dashStyle = D2D1_DASH_STYLE_DOT; + desc.dashOffset = -1.0f; + + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + cap_style = ID2D1StrokeStyle_GetStartCap(style); + ok(cap_style == D2D1_CAP_STYLE_SQUARE, "Unexpected cap style %d.\n", cap_style); + cap_style = ID2D1StrokeStyle_GetEndCap(style); + ok(cap_style == D2D1_CAP_STYLE_ROUND, "Unexpected cap style %d.\n", cap_style); + cap_style = ID2D1StrokeStyle_GetDashCap(style); + ok(cap_style == D2D1_CAP_STYLE_TRIANGLE, "Unexpected cap style %d.\n", cap_style); + line_join = ID2D1StrokeStyle_GetLineJoin(style); + ok(line_join == D2D1_LINE_JOIN_BEVEL, "Unexpected line joind %d.\n", line_join); + miter_limit = ID2D1StrokeStyle_GetMiterLimit(style); + ok(miter_limit == 1.5f, "Unexpected miter limit %f.\n", miter_limit); + dash_style = ID2D1StrokeStyle_GetDashStyle(style); + ok(dash_style == D2D1_DASH_STYLE_DOT, "Unexpected dash style %d.\n", dash_style); + dash_offset = ID2D1StrokeStyle_GetDashOffset(style); + ok(dash_offset == -1.0f, "Unexpected dash offset %f.\n", dash_offset); + + + ID2D1StrokeStyle_Release(style); + + /* NULL dashes array, non-zero length. */ + memset(&desc, 0, sizeof(desc)); + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 1, &style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + count = ID2D1StrokeStyle_GetDashesCount(style); + ok(count == 0, "Unexpected dashes count %u.\n", count); + + ID2D1StrokeStyle_Release(style); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -3353,4 +3410,5 @@ START_TEST(d2d1) test_hwnd_target(); test_bitmap_target(); test_desktop_dpi(); + test_stroke_style(); }

1 0

Hans Leidekker : rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{, Ex}.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: f8450fae23d3f87f220cdd1212500900925328c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8450fae23d3f87f220cdd121… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 16:27:06 2016 +0100 rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{,Ex}. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 6 +++++- dlls/rpcrt4/tests/server.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 07eddbe..f2b1d59 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1621,11 +1621,15 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, ULONG *AuthzSvc, ULONG Flags ) { - RpcBinding *bind = ClientBinding; + RpcBinding *bind; TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (!ClientBinding) ClientBinding = I_RpcGetCurrentCallHandle(); + if (!ClientBinding) return RPC_S_INVALID_BINDING; + + bind = ClientBinding; if (!bind->FromConn) return RPC_S_INVALID_BINDING; return rpcrt4_conn_inquire_auth_client(bind->FromConn, Privs, diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ee28703..89dc27a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1525,6 +1525,15 @@ void __cdecl s_authinfo_test(unsigned int protseq, int secure) } ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientA(NULL, &privs, &principal, &level, &authnsvc, NULL); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientExA(NULL, &privs, &principal, &level, &authnsvc, NULL, 0); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); status = RpcImpersonateClient(NULL); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status);

1 0

Hans Leidekker : shell32: Implement IKnownFolderManager::GetFolderByName.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 567b52cd933d4ce2646d58b7cb9943c08949e6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=567b52cd933d4ce2646d58b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 16:27:07 2016 +0100 shell32: Implement IKnownFolderManager::GetFolderByName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 45 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 20 ++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2072814..aa2742d 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5549,8 +5549,49 @@ static HRESULT WINAPI foldermanager_GetFolderByName( LPCWSTR pszCanonicalName, IKnownFolder **ppkf) { - FIXME("%s, %p\n", debugstr_w(pszCanonicalName), ppkf); - return E_NOTIMPL; + struct foldermanager *fm = impl_from_IKnownFolderManager( iface ); + struct knownfolder *kf; + BOOL found = FALSE; + HRESULT hr; + UINT i; + + TRACE( "%s, %p\n", debugstr_w(pszCanonicalName), ppkf ); + + for (i = 0; i < fm->num_ids; i++) + { + WCHAR *path, *name; + hr = get_known_folder_registry_path( &fm->ids[i], NULL, &path ); + if (FAILED( hr )) return hr; + + hr = get_known_folder_wstr( path, szName, &name ); + HeapFree( GetProcessHeap(), 0, path ); + if (FAILED( hr )) return hr; + + found = !strcmpiW( pszCanonicalName, name ); + CoTaskMemFree( name ); + if (found) break; + } + + if (found) + { + hr = knownfolder_create( &kf ); + if (FAILED( hr )) return hr; + + hr = knownfolder_set_id( kf, &fm->ids[i] ); + if (FAILED( hr )) + { + IKnownFolder_Release( &kf->IKnownFolder_iface ); + return hr; + } + *ppkf = &kf->IKnownFolder_iface; + } + else + { + hr = HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); + *ppkf = NULL; + } + + return hr; } static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFINITION *pKFD) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2125092..fa391c2 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2033,9 +2033,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; + static const WCHAR sWindows2[] = {'w','i','n','d','o','w','s',0}; static const WCHAR sExample[] = {'E','x','a','m','p','l','e',0}; static const WCHAR sExample2[] = {'E','x','a','m','p','l','e','2',0}; static const WCHAR sSubFolder[] = {'S','u','b','F','o','l','d','e','r',0}; + static const WCHAR sNoSuch[] = {'N','o','S','u','c','h',0}; static const WCHAR sBackslash[] = {'\\',0}; static const KNOWNFOLDERID newFolderId = {0x01234567, 0x89AB, 0xCDEF, {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x01} }; static const KNOWNFOLDERID subFolderId = {0xFEDCBA98, 0x7654, 0x3210, {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF} }; @@ -2137,7 +2139,6 @@ static void test_knownFolders(void) } hr = IKnownFolderManager_GetFolderByName(mgr, sWindows, &folder); - todo_wine ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -2149,6 +2150,23 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + hr = IKnownFolderManager_GetFolderByName(mgr, sWindows2, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetId(folder, &folderId); + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + + folder = (IKnownFolder *)0xdeadbeef; + hr = IKnownFolderManager_GetFolderByName(mgr, sNoSuch, &folder); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) known_folder_found[i] = FALSE;

1 0

Józef Kucia : d3d11/tests: Add test for occlusion query.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: eacb2f91aad77c9c4e850a1edca9e370f758d54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacb2f91aad77c9c4e850a1ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:52 2016 +0100 d3d11/tests: Add test for occlusion query. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 123676d..50f58cc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4623,6 +4623,119 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_occlusion_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size, i; + ID3D11Device *device; + union + { + UINT64 uint; + DWORD dword[2]; + } data; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D11_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(query); + todo_wine ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(DWORD), 0); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(WORD), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(DWORD), 0); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(data), 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_End(context, query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data.dword[0] = 0x12345678; + data.dword[1] = 0x12345678; + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D11Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -10926,6 +11039,7 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_occlusion_query(); test_timestamp_query(); test_device_removed_reason(); test_private_data();

1 0

Jeremy Newman : fix typo
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 37d412dc1e8c0188e1cb21e1f1a523d0f4f2b5d1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37d412dc1e8c0188e1cb21e1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:55:19 2016 -0600 fix typo --- include/objectManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/objectManager.php b/include/objectManager.php index eaf0503..182a8b9 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -187,7 +187,7 @@ class ObjectManager { header("HTTP/1.1 404 Not Found"); echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; - echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + echo "<p>We are unable to find the page you are trying to access. Please check your URL and try again.</p>\n"; } else {

1 0

Jeremy Newman : improve item not found handling with 404 code
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: be04b155ec663365febc3fc2459d73f7f28f9c20 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=be04b155ec663365febc3fc2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:48:37 2016 -0600 improve item not found handling with 404 code --- include/objectManager.php | 21 +++++++++++++++++---- objectManager.php | 15 ++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 126dfac..eaf0503 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -181,9 +181,22 @@ class ObjectManager return $bAllowed; } - public static function error_exit($shMessage) + public static function error_exit($shMessage, $b404 = false) { - echo '<div align="center"><p><font color="red"><b>'.$shMessage.'</b></font></p></div'; + if ($b404) + { + header("HTTP/1.1 404 Not Found"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + } + else + { + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> Error!</h1>\n"; + echo "<p>We have encountered an error. More details in message below.</p>\n"; + } + echo "<p>If you feel this is an error on our end, please report it to our <a href=\"https://forum.winehq.org/viewforum.php?f=11\">forums</a>.\n"; + echo "<hr>\n"; + echo "<p><b>Error Message:</b> {$shMessage}</p>\n"; echo apidb_footer(); exit; } @@ -1287,11 +1300,11 @@ class ObjectManager /* Check that the entry exists */ if(!$oObject->objectGetId() && !$this->isNullIdAllowed('view')) - $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})"); + $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})", true); /* Check if the entry has been deleted */ if($oObject->objectGetState() == 'deleted') - $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry"); + $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry", true); /* Show a note if the entry is queued or rejected */ if($oObject->objectGetState() != 'accepted') diff --git a/objectManager.php b/objectManager.php index 37f61a9..1d3d66f 100644 --- a/objectManager.php +++ b/objectManager.php @@ -31,16 +31,13 @@ require_once(BASE.'include/tag_CommonReply.php'); require_once(BASE.'include/commonReply.php'); /* if we have no valid class name we should abort */ -if(!isset($aClean['sClass'])) +if(empty($aClean['sClass']) or !class_exists($aClean['sClass'])) { - echo "No class defined.\n"; - exit; -} - -/* make sure the class is defined */ -if(!class_exists($aClean['sClass'])) -{ - echo "Class ".$aClean['sClass']." doesn't exist"; + header("HTTP/1.1 404 Not Found"); + apidb_header("404 - Not Found!"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We were unable to load this page due to a missing or invalid class parameter.</p>\n"; + apidb_footer(); exit; }

1 0

Jeremy Newman : allow additional header code to be loaded
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: a00bb7ba016822b990246b4972a42d7276c945ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a00bb7ba016822b990246b49… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 11:25:24 2016 -0600 allow additional header code to be loaded --- include/appdb.php | 4 +++- include/header.php | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/appdb.php b/include/appdb.php index 4a92df6..4130bb0 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -233,8 +233,10 @@ function appdb_fullpath($path) /** * output the common apidb header + * title => sets the page title + * sHeaderCode => add additional code to <head> block */ -function apidb_header($title = 0) +function apidb_header($title = 0, $sHeaderCode = "") { $realname = $_SESSION['current']->sRealname; diff --git a/include/header.php b/include/header.php index 1df07cc..516fba0 100644 --- a/include/header.php +++ b/include/header.php @@ -29,7 +29,11 @@ $iJStime = filemtime(BASE."utils.js"); <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> <script src="<?php echo BASE; ?>utils.js?f=<?php echo $iJStime; ?>"></script> - +<?php +// additional header code +if (!empty($sHeaderCode)) + echo " {$sHeaderCode}\n"; +?> <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head>

1 0