May 2018 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Use jsdisp_define_property to set function prototypes.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 3767d63a1c220e1168c3d4326602fd3db5abd2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=3767d63a1c220e1168c3d432… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:33:52 2018 +0200 jscript: Use jsdisp_define_property to set function prototypes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 12 ++++-------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 5fff9da..9b51b08 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -641,11 +641,6 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ return S_OK; } -static inline HRESULT set_prototype(script_ctx_t *ctx, jsdisp_t *dispex, jsdisp_t *prototype) -{ - return jsdisp_propput_dontenum(dispex, prototypeW, jsval_obj(prototype)); -} - HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, const builtin_info_t *builtin_info, DWORD flags, jsdisp_t *prototype, jsdisp_t **ret) { @@ -660,7 +655,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, hres = jsdisp_define_data_property(&function->dispex, lengthW, 0, jsval_number(function->length)); if(SUCCEEDED(hres)) - hres = set_prototype(ctx, &function->dispex, prototype); + hres = jsdisp_define_data_property(&function->dispex, prototypeW, 0, jsval_obj(prototype)); if(FAILED(hres)) { jsdisp_release(&function->dispex); return hres; @@ -713,7 +708,8 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod hres = create_function(ctx, NULL, PROPF_CONSTR, FALSE, NULL, &function); if(SUCCEEDED(hres)) { - hres = set_prototype(ctx, &function->dispex, prototype); + hres = jsdisp_define_data_property(&function->dispex, prototypeW, PROPF_WRITABLE, + jsval_obj(prototype)); if(SUCCEEDED(hres)) hres = set_constructor_prop(ctx, &function->dispex, prototype); if(FAILED(hres)) @@ -871,7 +867,7 @@ HRESULT init_function_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) if(SUCCEEDED(hres)) { constr->value_proc = FunctionConstr_value; constr->name = FunctionW; - hres = set_prototype(ctx, &constr->dispex, &prot->dispex); + hres = jsdisp_define_data_property(&constr->dispex, prototypeW, 0, jsval_obj(&prot->dispex)); if(SUCCEEDED(hres)) hres = set_constructor_prop(ctx, &constr->dispex, &prot->dispex); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 30b464c..70e9ecb 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -195,6 +195,10 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(arguments, "callee", true, false, true); })(); + test_own_data_prop_desc(String, "prototype", false, false, false); + test_own_data_prop_desc(function(){}, "prototype", true, false, false); + test_own_data_prop_desc(Function, "prototype", false, false, false); + next_test(); }

1 0

Jacek Caban : jscript: Use jsdisp_define_property to set prototype constructors.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 599769f857dc8cdb94fd8108041a322ac1c8db5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=599769f857dc8cdb94fd8108… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:34:02 2018 +0200 jscript: Use jsdisp_define_property to set prototype constructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 5 ----- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/mshtml/tests/es5.js | 1 + 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 17d3f5d..7ba625f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1316,11 +1316,6 @@ HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); } -HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) -{ - return jsdisp_propput(obj, name, PROPF_CONFIGURABLE | PROPF_WRITABLE, val); -} - HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) { WCHAR buf[12]; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9b51b08..0aae300 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -672,7 +672,8 @@ static HRESULT set_constructor_prop(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_ { static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; - return jsdisp_propput_dontenum(prot, constructorW, jsval_obj(constr)); + return jsdisp_define_data_property(prot, constructorW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + jsval_obj(constr)); } HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 40e99f3..5a7be8e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -284,7 +284,6 @@ HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 70e9ecb..5ca8d59 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -198,6 +198,7 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(String, "prototype", false, false, false); test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); + test_own_data_prop_desc(String.prototype, "constructor", true, false, true); next_test(); }

1 0

Jacek Caban : jscript: Added Object.defineProperties stub.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 5abb2ca6fc27389501cb46fb4a8a18d1778a890b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abb2ca6fc27389501cb46fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:34:13 2018 +0200 jscript: Added Object.defineProperties stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 10 ++++++++++ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 84d36c9..d18f1c9 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -36,6 +36,8 @@ static const WCHAR getOwnPropertyDescriptorW[] = {'g','e','t','O','w','n','P','r','o','p','e','r','t','y','D','e','s','c','r','i','p','t','o','r',0}; static const WCHAR definePropertyW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','y',0}; +static const WCHAR definePropertiesW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','i','e','s',0}; + static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b','j','e','c','t',']',0}; static const WCHAR configurableW[] = {'c','o','n','f','i','g','u','r','a','b','l','e',0}; @@ -447,6 +449,13 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; } +static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -511,6 +520,7 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi } static const builtin_prop_t ObjectConstr_props[] = { + {definePropertiesW, Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {definePropertyW, Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2} }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index e30aa93..02f0778 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -144,6 +144,7 @@ function test_javascript() { if(v != 8) { test_exposed("getOwnPropertyDescriptor", Object, v >= 8); test_exposed("defineProperty", Object, v >= 8); + test_exposed("defineProperties", Object, v >= 8); } test_parses("if(false) { o.default; }", v >= 9);

1 0

Jacek Caban : jscript: Added support for accessor properties in defineProperty.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: f732bfc50e25ea55bd553dd4de3eb64f113550e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f732bfc50e25ea55bd553dd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:34:26 2018 +0200 jscript: Added support for accessor properties in defineProperty. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 121 +++++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/es5.js | 81 +++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f732bfc50e25ea55bd55…

1 0

Nikolay Sivov : gdiplus: Use ARRAY_SIZE() macro.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 8463159344c2f08c8d4d76b8a8045b7ba24de89b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8463159344c2f08c8d4d76b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:34 2018 +0300 gdiplus: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 6 +++--- dlls/gdiplus/metafile.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0114a51..3aeb654 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -232,7 +232,7 @@ static const char HatchBrushes[][8] = { GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { - if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) + if (hatchstyle < ARRAY_SIZE(HatchBrushes)) { *result = HatchBrushes[hatchstyle]; return Ok; diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f99b026..64778bb 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1367,7 +1367,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -1377,7 +1377,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; default: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ea79f11..9fff578 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -35,6 +35,8 @@ #include "gdiplus.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b03630c..9841857 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2554,7 +2554,7 @@ static UINT vt_to_itemtype(UINT vt) { VT_BLOB, PropertyTagTypeUndefined } }; UINT i; - for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt2type); i++) { if (vt2type[i].vt == vt) return vt2type[i].type; } @@ -3454,10 +3454,10 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { if (name.vt == VT_LPSTR) { - for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + for (j = 0; j < ARRAY_SIZE(keywords); j++) if (!strcmp(keywords[j].name, name.u.pszVal)) break; - if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + if (j < ARRAY_SIZE(keywords) && !keywords[j].seen) { keywords[j].seen = TRUE; item = create_prop(keywords[j].propid, &value); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 77673a7..08dde2f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -606,7 +606,7 @@ void METAFILE_Free(GpMetafile *metafile) if (metafile->record_stream) IStream_Release(metafile->record_stream); - for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + for (i = 0; i < ARRAY_SIZE(metafile->objtable); i++) metafile_free_object_table_entry(metafile, i); }

1 0

Nikolay Sivov : gdiplus: Partially implement arrow caps.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 1da650a1cb9b85972622e98e9589808bfa60d17a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1da650a1cb9b85972622e98e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:35 2018 +0300 gdiplus: Partially implement arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 196 +++++++++++++++++++++++++------------ dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/tests/customlinecap.c | 79 +++++++++++++-- 3 files changed, 208 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1da650a1cb9b85972622…

1 0

Nikolay Sivov : gdiplus: Implement unfilled mode for arrow caps.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 39c8ebddcc302dac896dcd594a43b16e52d723c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c8ebddcc302dac896dcd59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:36 2018 +0300 gdiplus: Implement unfilled mode for arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 75 +++++++++++++++++++++++--------------- dlls/gdiplus/tests/customlinecap.c | 5 +-- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 7fbe8b6..c74928e 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -282,19 +282,43 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomL static void arrowcap_update_path(GpAdjustableArrowCap *cap) { + static const BYTE types_filled[] = + { + PathPointTypeStart, PathPointTypeLine, PathPointTypeLine, PathPointTypeLine | PathPointTypeCloseSubpath + }; + static const BYTE types_unfilled[] = + { + PathPointTypeStart, PathPointTypeLine, PathPointTypeLine + }; GpPointF *points; - assert(cap->cap.pathdata.Count == 4); + assert(cap->cap.pathdata.Count == 3 || cap->cap.pathdata.Count == 4); points = cap->cap.pathdata.Points; - points[0].X = 0.0; - points[0].Y = 0.0; - points[1].X = -cap->width / 2.0; - points[1].Y = -cap->height; - points[2].X = 0.0; - points[2].Y = -cap->height - cap->middle_inset; - points[3].X = cap->width / 2.0; - points[3].Y = -cap->height; + if (cap->cap.fill) + { + memcpy(cap->cap.pathdata.Types, types_filled, sizeof(types_filled)); + cap->cap.pathdata.Count = 4; + points[0].X = -cap->width / 2.0; + points[0].Y = -cap->height; + points[1].X = 0.0; + points[1].Y = 0.0; + points[2].X = cap->width / 2.0; + points[2].Y = -cap->height; + points[3].X = 0.0; + points[3].Y = -cap->height - cap->middle_inset; + } + else + { + memcpy(cap->cap.pathdata.Types, types_unfilled, sizeof(types_unfilled)); + cap->cap.pathdata.Count = 3; + points[0].X = -cap->width / 4.0; + points[0].Y = -cap->height / 2.0; + points[1].X = 0.0; + points[1].Y = 0.0; + points[2].X = cap->width / 4.0; + points[2].Y = -cap->height / 2.0; + } if (cap->width == 0.0) cap->cap.inset = 0.0; @@ -306,7 +330,6 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f GpAdjustableArrowCap **cap) { GpPathData pathdata; - BYTE types[4]; GpStatus stat; TRACE("(%0.2f,%0.2f,%i,%p)\n", height, width, fill, cap); @@ -314,22 +337,15 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f if (!cap) return InvalidParameter; - if (!fill) - FIXME("Arrows without fills are not supported.\n"); - *cap = heap_alloc_zero(sizeof(**cap)); if (!*cap) return OutOfMemory; - types[0] = PathPointTypeStart; - types[1] = PathPointTypeLine; - types[2] = PathPointTypeLine; - types[3] = PathPointTypeLine | PathPointTypeCloseSubpath; - + /* We'll need 4 points at most. */ pathdata.Count = 4; pathdata.Points = NULL; - pathdata.Types = types; - stat = init_custom_linecap(&(*cap)->cap, &pathdata, TRUE, LineCapTriangle, width != 0.0 ? height / width : 0.0); + pathdata.Types = NULL; + stat = init_custom_linecap(&(*cap)->cap, &pathdata, fill, LineCapTriangle, width != 0.0 ? height / width : 0.0); if (stat != Ok) { heap_free(*cap); @@ -347,14 +363,13 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL* fill) { - static int calls; - TRACE("(%p,%p)\n", cap, fill); - if(!(calls++)) - FIXME("not implemented\n"); + if (!cap || !fill) + return InvalidParameter; - return NotImplemented; + *fill = cap->cap.fill; + return Ok; } GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL* height) @@ -392,14 +407,14 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL fill) { - static int calls; - TRACE("(%p,%i)\n", cap, fill); - if(!(calls++)) - FIXME("not implemented\n"); + if (!cap) + return InvalidParameter; - return NotImplemented; + cap->cap.fill = fill; + arrowcap_update_path(cap); + return Ok; } GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL height) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 6a22c26..e4ec329 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -250,16 +250,13 @@ static void test_create_adjustable_cap(void) ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); stat = GdipGetAdjustableArrowCapFillState(cap, NULL); -todo_wine ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); ret = FALSE; stat = GdipGetAdjustableArrowCapFillState(cap, &ret); -todo_wine -{ ok(stat == Ok, "Unexpected return code, %d\n", stat); ok(ret, "Unexpected fill state %d\n", ret); -} + stat = GdipGetAdjustableArrowCapHeight(cap, NULL); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat);

1 0

Nikolay Sivov : gdiplus: Only draw filled arrows with positive height.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 9ffc6e600e435066cc10ccfa58046b76cb41f267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ffc6e600e435066cc10ccfa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:37 2018 +0300 gdiplus: Only draw filled arrows with positive height. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5fdbaf1..76aabe7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1692,6 +1692,13 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s if(!custom) break; + if (custom->type == CustomLineCapTypeAdjustableArrow) + { + GpAdjustableArrowCap *arrow = (GpAdjustableArrowCap *)custom; + if (arrow->cap.fill && arrow->height <= 0.0) + break; + } + count = custom->pathdata.Count; custptf = heap_alloc_zero(count * sizeof(PointF)); custpt = heap_alloc_zero(count * sizeof(POINT));

1 0

Ken Thomases : winemac: Transform the process to a GUI app on an attempt to change the display mode.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 09bf88092d0748ceac355098a942b01b267e8773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09bf88092d0748ceac355098… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 14 13:32:29 2018 -0500 winemac: Transform the process to a GUI app on an attempt to change the display mode. It had only been done when a window is shown. Some games change the display mode before showing their first window. Following Mac conventions, the Mac driver does not apply display mode changes when it's not the active GUI app. If such a game were to change the mode and then query display-mode-related info, it would get info for the original mode, not the requested mode. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 46176f7..239c11f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -843,7 +843,6 @@ static NSString* WineLocalizedString(unsigned int stringID) } else { - BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; NSArray* modes; @@ -866,6 +865,10 @@ static NSString* WineLocalizedString(unsigned int stringID) if (!modes.count) return FALSE; + [self transformProcessToForeground]; + + BOOL active = [NSApp isActive]; + if ([originalDisplayModes count] || displaysCapturedForFullscreen || !active || CGCaptureAllDisplays() == CGDisplayNoErr) {

1 0

Matteo Bruni : wined3d: Use core functions to set the stencil mask on GL 2.0+.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 16c708c33909fa1fba6e0e160e276ecb3818388f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c708c33909fa1fba6e0e16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:02 2018 +0200 wined3d: Use core functions to set the stencil mask on GL 2.0+. glStencilMask() is defined as setting both front and back stencil masks in GL 2.0+ and we don't want to use the EXT_stencil_two_side entry points even if they happen to be available there. D3D doesn't support separate front / back stencil write masks anyway. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89506b1..164f9c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4049,7 +4049,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[WINED3D_GL_BLEND_EQUATION] = TRUE; if (gl_version >= MAKEDWORD_VERSION(2, 0)) + { gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + /* We want to use the core APIs for two-sided stencil in GL 2.0. */ + gl_info->supported[EXT_STENCIL_TWO_SIDE] = FALSE; + } if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 175fd14..34e08e9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1003,7 +1003,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ } } -static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_stencilwrite2s_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4603,7 +4603,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_STENCILFUNC), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILMASK), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite2s}, EXT_STENCIL_TWO_SIDE }, + { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite2s_ext}, EXT_STENCIL_TWO_SIDE }, { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0