November 2017 - Wine-Commits

Jacek Caban : mshtml: Added IDOMEvent:: get_defaultPrevented implementation.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: bbffabf1b1c8d3fe78861912a14e3ddf78ebe913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbffabf1b1c8d3fe78861912a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:47:53 2017 +0100 mshtml: Added IDOMEvent::get_defaultPrevented implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 +++++-- dlls/mshtml/tests/events.js | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d57ff19..9e232be 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -995,8 +995,11 @@ static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->prevent_default); + return S_OK; } static HRESULT WINAPI DOMEvent_get_eventPhase(IDOMEvent *iface, USHORT *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 4a064f9..4c552b6 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -267,6 +267,31 @@ function test_stop_propagation() { next_test(); } +function test_prevent_default() { + document.body.innerHTML = '<div><a href="about:blank"></a></div>'; + var div = document.body.firstChild; + var a = div.firstChild; + var calls; + + div.addEventListener("click", function(e) { + calls += "div,"; + ok(e.defaultPrevented === false, "e.defaultPrevented = " + e.defaultPrevented); + e.preventDefault(); + ok(e.defaultPrevented === true, "e.defaultPrevented = " + e.defaultPrevented); + }, true); + + a.addEventListener("click", function(e) { + calls += "a,"; + ok(e.defaultPrevented === true, "e.defaultPrevented = " + e.defaultPrevented); + }, true); + + calls = ""; + a.click(); + ok(calls === "div,a,", "calls = " + calls); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -274,5 +299,6 @@ var tests = [ test_remove_listener_in_listener, test_event_phase, test_stop_propagation, + test_prevent_default, test_listener_order ];

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 5787727f9e6e8566e81692235abad12ced1db7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5787727f9e6e8566e81692235… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:42 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage. 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/metafile.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 8e9ad87..9beb3a3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -398,6 +398,19 @@ typedef struct EmfPlusPointF float Y; } EmfPlusPointF; +typedef struct EmfPlusDrawImage +{ + EmfPlusRecordHeader Header; + DWORD ImageAttributesID; + DWORD SrcUnit; + EmfPlusRectF SrcRect; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawImage; + typedef struct EmfPlusDrawImagePoints { EmfPlusRecordHeader Header; @@ -2696,6 +2709,46 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); } + case EmfPlusRecordTypeDrawImage: + { + EmfPlusDrawImage *draw = (EmfPlusDrawImage *)header; + BYTE image = flags & 0xff; + GpPointF points[3]; + + if (image >= EmfPlusObjectTableSize || real_metafile->objtable[image].type != ObjectTypeImage) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawImage, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (draw->ImageAttributesID >= EmfPlusObjectTableSize || + real_metafile->objtable[draw->ImageAttributesID].type != ObjectTypeImageAttributes) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + { + points[0].X = draw->RectData.rect.X; + points[0].Y = draw->RectData.rect.Y; + points[1].X = points[0].X + draw->RectData.rect.Width; + points[1].Y = points[0].Y; + points[2].X = points[1].X; + points[2].Y = points[1].Y + draw->RectData.rect.Height; + } + else + { + points[0].X = draw->RectData.rectF.X; + points[0].Y = draw->RectData.rectF.Y; + points[1].X = points[0].X + draw->RectData.rectF.Width; + points[1].Y = points[0].Y; + points[2].X = points[1].X; + points[2].Y = points[1].Y + draw->RectData.rectF.Height; + } + + return GdipDrawImagePointsRect(real_metafile->playback_graphics, real_metafile->objtable[image].u.image, + points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit, + real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL); + } case EmfPlusRecordTypeDrawImagePoints: { EmfPlusDrawImagePoints *draw = (EmfPlusDrawImagePoints *)header;

1 0

Dmitry Kislyuk : vbscript: Improve parsing of separators in functions and classes.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 31ef99245ae8cd08b2bb611a2a8803c6206f4d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ef99245ae8cd08b2bb611a2… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed Nov 1 15:28:57 2017 -0500 vbscript: Improve parsing of separators in functions and classes. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 22 +++++++++++----------- dlls/vbscript/tests/lang.vbs | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index dcd7b73..e8ecf4d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -396,29 +396,29 @@ PrimaryExpression | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration - : tCLASS Identifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } + : tCLASS Identifier StSep ClassBody tEND tCLASS StSep { $4->name = $2; $$ = $4; } ClassBody - : /* empty */ { $$ = new_class_decl(ctx); } - | FunctionDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } + : /* empty */ { $$ = new_class_decl(ctx); } + | FunctionDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } /* FIXME: We should use DimDecl here to support arrays, but that conflicts with PropertyDecl. */ - | Storage tIdentifier tNL ClassBody { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; + | Storage tIdentifier StSep ClassBody { dim_decl_t *dim_decl = new_dim_decl(ctx, $2, FALSE, NULL); CHECK_ERROR; $$ = add_dim_prop(ctx, $4, dim_decl, $1); CHECK_ERROR; } - | tDIM DimDecl tNL ClassBody { $$ = add_dim_prop(ctx, $4, $2, 0); CHECK_ERROR; } - | PropertyDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } + | tDIM DimDecl StSep ClassBody { $$ = add_dim_prop(ctx, $4, $2, 0); CHECK_ERROR; } + | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tPROPERTY + : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY + | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep StatementsNl_opt tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl - : Storage_opt tSUB Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + : Storage_opt tSUB Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } - | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt StSep StatementsNl_opt tEND tFUNCTION { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } Storage_opt diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8ee92a6..a904f5d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -752,6 +752,11 @@ Private Sub TestPrivateSub End Sub Call TestPrivateSub +Public Sub TestSeparatorSub : : +: +End Sub +Call TestSeparatorSub + if false then Function testfunc x = true @@ -867,6 +872,12 @@ Private Function TestPrivateFunc End Function Call TestPrivateFunc +Public Function TestSepFunc(ByVal a) : : +: TestSepFunc = a +End Function +Call ok(TestSepFunc(1) = 1, "Function did not return 1") + + ' Stop has an effect only in debugging mode Stop @@ -1127,6 +1138,30 @@ Class Property2 End Sub End Class +Class SeparatorTest : : Dim varTest1 +: + Private Sub Class_Initialize : varTest1 = 1 + End Sub :: + + Property Get Test1() : + Test1 = varTest1 + End Property :: +: : + Property Let Test1(a) : + varTest1 = a + End Property : + + Public Function AddToTest1(ByVal a) :: : + varTest1 = varTest1 + a + AddToTest1 = varTest1 + End Function : End Class : :: Set obj = New SeparatorTest + +Call ok(obj.Test1 = 1, "obj.Test1 is not 1") +obj.Test1 = 6 +Call ok(obj.Test1 = 6, "obj.Test1 is not 6") +obj.AddToTest1(5) +Call ok(obj.Test1 = 11, "obj.Test1 is not 11") + ' Array tests Call ok(getVT(arr) = "VT_EMPTY*", "getVT(arr) = " & getVT(arr))

1 0

Jacek Caban : mshtml: Use variant_bool helper where appropriate.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: eafbe884a293a4429ba33778990f648dea604a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafbe884a293a4429ba337789… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:48:02 2017 +0100 mshtml: Use variant_bool helper where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 5 ++--- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 5 +++-- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 4 +--- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 2 +- 15 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e42b068..b04fb81 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -971,7 +971,7 @@ static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvi case VT_BOOL: if(V_VT(src) == VT_BSTR) { V_VT(dst) = VT_BOOL; - V_BOOL(dst) = V_BSTR(src) && *V_BSTR(src) ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(dst) = variant_bool(V_BSTR(src) && *V_BSTR(src)); return S_OK; } break; diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 89630ce..e3a16df 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, V TRACE("(%p)->(%p)\n", This, p); - *p = !This->elem || get_dispid_type(This->dispid) == DISPEXPROP_BUILTIN ? VARIANT_FALSE : VARIANT_TRUE; + *p = variant_bool(This->elem && get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN); return S_OK; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5f33e84..fbb70c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2606,7 +2606,7 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL nsres = nsIDOMHTMLDocument_HasFocus(This->doc_node->nsdoc, &has_focus); assert(nsres == NS_OK); - *pfFocus = has_focus ? VARIANT_TRUE : VARIANT_FALSE; + *pfFocus = variant_bool(has_focus); return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ed1aa86..dc712f3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC assert(nsres == NS_OK); } - *pfResult = result ? VARIANT_TRUE : VARIANT_FALSE; + *pfResult = variant_bool(result); return S_OK; } @@ -1777,8 +1777,7 @@ static HRESULT WINAPI HTMLElement_get_isTextEdit(IHTMLElement *iface, VARIANT_BO TRACE("(%p)->(%p)\n", This, p); - *p = This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node) - ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node)); return S_OK; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9e232be..46697b3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -421,7 +421,7 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -451,7 +451,7 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -481,7 +481,7 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO } } - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } @@ -529,7 +529,7 @@ static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - *p = This->event && This->event->stop_propagation ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(This->event && This->event->stop_propagation); return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index abf7f5c..02f0cba 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -131,7 +131,8 @@ static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_B ERR("Get IsMap failed: %08x\n", nsres); return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + + *p = variant_bool(b); return S_OK; } @@ -391,7 +392,7 @@ static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIAN return E_FAIL; } - *p = complete ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(complete); return S_OK; } diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index d7b774d..43a4f4c 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -302,7 +302,7 @@ static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARI if(NS_FAILED(nsres)) return E_FAIL; - *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(ret); return S_OK; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 70b0d0d..70b8758 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -610,7 +610,7 @@ static HRESULT WINAPI HTMLDOMNode_hasChildNodes(IHTMLDOMNode *iface, VARIANT_BOO if(NS_FAILED(nsres)) ERR("HasChildNodes failed: %08x\n", nsres); - *fChildren = has_child ? VARIANT_TRUE : VARIANT_FALSE; + *fChildren = variant_bool(has_child); return S_OK; } diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a4ea95d..616328b 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -129,7 +129,7 @@ static HRESULT WINAPI HTMLOptionElement_get_selected(IHTMLOptionElement *iface, return E_FAIL; } - *p = selected ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(selected); return S_OK; } @@ -211,7 +211,7 @@ static HRESULT WINAPI HTMLOptionElement_get_defaultSelected(IHTMLOptionElement * return E_FAIL; } - *p = val ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(val); return S_OK; } diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 4c3ea16..49d82aa 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -258,9 +258,7 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR ERR("GetSrc failed: %08x\n", nsres); } - *p = defer ? VARIANT_TRUE : VARIANT_FALSE; - - TRACE("*p = %d\n", *p); + *p = variant_bool(defer); return S_OK; } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a9f47cc..59e6811 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -198,7 +198,7 @@ static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, nsres = nsIDOMHTMLSelectElement_GetMultiple(This->nsselect, &val); assert(nsres == NS_OK); - *p = val ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(val); return S_OK; } @@ -364,7 +364,7 @@ static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, return E_FAIL; } - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0c6f3bc..12ce92b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -628,7 +628,7 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); nsAString_GetData(&str_value, &value); - *p = strcmpW(value, exval) ? VARIANT_FALSE : VARIANT_TRUE; + *p = variant_bool(!strcmpW(value, exval)); nsAString_Finish(&str_value); TRACE("%s -> %x\n", debugstr_w(style_tbl[sid].name), *p); @@ -2927,7 +2927,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri /* filter property is a special case */ if(style_entry->dispid == DISPID_IHTMLSTYLE_FILTER) { - *pfSuccess = This->elem->filter && *This->elem->filter ? VARIANT_TRUE : VARIANT_FALSE; + *pfSuccess = variant_bool(This->elem->filter && *This->elem->filter); heap_free(This->elem->filter); This->elem->filter = NULL; update_filter(This); @@ -2940,7 +2940,7 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri if(NS_SUCCEEDED(nsres)) { const PRUnichar *ret; nsAString_GetData(&ret_str, &ret); - *pfSuccess = *ret ? VARIANT_TRUE : VARIANT_FALSE; + *pfSuccess = variant_bool(*ret); }else { ERR("RemoveProperty failed: %08x\n", nsres); } diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 457df12..71a8798 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -318,7 +318,7 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(b); return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 759f1b6..3a34f5c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -862,7 +862,7 @@ static BOOL notify_webbrowser_close(HTMLOuterWindow *window, HTMLDocumentObj *do V_VT(args) = VT_BYREF|VT_BOOL; V_BOOLREF(args) = &cancel; V_VT(args+1) = VT_BOOL; - V_BOOL(args+1) = window->parent ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(args+1) = variant_bool(window->parent != NULL); hres = IDispatch_Invoke(disp, DISPID_WINDOWCLOSING, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); IDispatch_Release(disp); if(FAILED(hres)) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1597de9..a8d3330 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -610,7 +610,7 @@ static HRESULT WINAPI BindCallbackRedirect_Redirect(IBindCallbackRedirect *iface SysFreeString(frame_name); } - *vbCancel = cancel ? VARIANT_TRUE : VARIANT_FALSE; + *vbCancel = variant_bool(cancel); return hres; }

1 0

Alexandre Julliard : ntdll: Don't change packing of fd cache entries.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 59963983606a96175567a4af0053a5b2ef5a01be URL: http://source.winehq.org/git/wine.git/?a=commit;h=59963983606a96175567a4af0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 16:59:11 2017 +0100 ntdll: Don't change packing of fd cache entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 1e84fbf..4c329d0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -808,7 +808,6 @@ static int receive_fd( obj_handle_t *handle ) /***********************************************************************/ /* fd cache support */ -#include "pshpack1.h" union fd_cache_entry { LONG64 data; @@ -820,7 +819,6 @@ union fd_cache_entry unsigned int options : 24; } s; }; -#include "poppack.h" C_ASSERT( sizeof(union fd_cache_entry) == sizeof(LONG64) );

1 0

Fabian Maurer : comctl32/tests: Add taskdialog callback tests.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 18fbca709071c5ade31743114ce5617bf27262f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fbca709071c5ade31743114… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 2 17:26:42 2017 +0300 comctl32/tests: Add taskdialog callback tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/taskdialog.c | 121 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 57f33f3..dfb6808 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -26,11 +26,118 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" + +#define WM_TD_CALLBACK (WM_APP) /* Custom dummy message to wrap callback notifications */ + +#define NUM_MSG_SEQUENCES 1 +#define TASKDIALOG_SEQ_INDEX 0 static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + +struct message_info +{ + UINT message; + WPARAM wparam; + LPARAM lparam; + + HRESULT callback_retval; + const struct message_info *send; /* Message to send to trigger the next callback message */ +}; + +static const struct message_info *current_message_info; + +/* Messages to send */ +static const struct message_info msg_send_return[] = +{ + { WM_KEYDOWN, VK_RETURN, 0 }, + { 0 } +}; + +/* Messages to test against */ +static const struct message_info msg_return_press_ok[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_return }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + +static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) +{ + msg->message = WM_TD_CALLBACK; + msg->flags = sent|wparam|lparam|id; + msg->wParam = wParam; + msg->lParam = lParam; + msg->id = message; + msg->stage = 0; +} + +#define run_test(info, expect_button, expect_radio, seq, context) \ + run_test_(info, expect_button, expect_radio, seq, context, \ + sizeof(seq)/sizeof(seq[0]) - 1, __FILE__, __LINE__) + +void run_test_(TASKDIALOGCONFIG *info, int expect_button, int expect_radio, const struct message_info *test_messages, + const char *context, int test_messages_len, const char *file, int line) +{ + struct message *msg, *msg_start; + int ret_button = 0; + int ret_radio = 0; + HRESULT hr; + int i; + + /* Allocate messages to test against, plus 2 implicit and 1 empty */ + msg_start = msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*msg) * (test_messages_len + 3)); + + /* Always needed, thus made implicit */ + init_test_message(TDN_DIALOG_CONSTRUCTED, 0, 0, msg++); + for (i = 0; i < test_messages_len; i++) + init_test_message(test_messages[i].message, test_messages[i].wparam, test_messages[i].lparam, msg++); + /* Always needed, thus made implicit */ + init_test_message(TDN_DESTROYED, 0, 0, msg++); + + current_message_info = test_messages; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hr = pTaskDialogIndirect(info, &ret_button, &ret_radio, NULL); + ok_(file, line)(hr == S_OK, "TaskDialogIndirect() failed, got %#x.\n", hr); + + ok_sequence_(sequences, TASKDIALOG_SEQ_INDEX, msg_start, context, FALSE, file, line); + ok_(file, line)(ret_button == expect_button, + "Wrong button. Expected %d, got %d\n", expect_button, ret_button); + ok_(file, line)(ret_radio == expect_radio, + "Wrong radio button. Expected %d, got %d\n", expect_radio, ret_radio); + + HeapFree(GetProcessHeap(), 0, msg_start); +} + +static const LONG_PTR test_ref_data = 123456; + +static HRESULT CALLBACK taskdialog_callback_proc(HWND hwnd, UINT notification, + WPARAM wParam, LPARAM lParam, LONG_PTR ref_data) +{ + int msg_pos = sequences[TASKDIALOG_SEQ_INDEX]->count - 1; /* Skip implicit message */ + const struct message_info *msg_send; + struct message msg; + + ok(test_ref_data == ref_data, "Unexpected ref data %lu.\n", ref_data); + + init_test_message(notification, wParam, lParam, &msg); + add_message(sequences, TASKDIALOG_SEQ_INDEX, &msg); + + if (notification == TDN_DIALOG_CONSTRUCTED || notification == TDN_DESTROYED) /* Skip implicit messages */ + return S_OK; + + msg_send = current_message_info[msg_pos].send; + for(; msg_send && msg_send->message; msg_send++) + PostMessageW(hwnd, msg_send->message, msg_send->wparam, msg_send->lparam); + + return current_message_info[msg_pos].callback_retval; +} + static void test_invalid_parameters(void) { TASKDIALOGCONFIG info = { 0 }; @@ -52,6 +159,17 @@ static void test_invalid_parameters(void) ok(hr == E_INVALIDARG, "Unexpected return value %#x.\n", hr); } +static void test_callback(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + + run_test(&info, IDOK, 0, msg_return_press_ok, "Press VK_RETURN."); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -83,7 +201,10 @@ START_TEST(taskdialog) ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + test_invalid_parameters(); + test_callback(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Jacek Caban : mshtml: Introduce variant_bool helper.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 0bff85cd44854ffc0c9dfad3d6e696ad62457fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff85cd44854ffc0c9dfad3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:47:45 2017 +0100 mshtml: Introduce variant_bool helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 11 ++++++----- dlls/mshtml/mshtml_private.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index b0380a2..0dea8cb 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -275,7 +275,7 @@ static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VA nsIDOMHTMLInputElement_GetDisabled(This->nsinput, &disabled); - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } @@ -474,7 +474,8 @@ static HRESULT WINAPI HTMLInputElement_get_readOnly(IHTMLInputElement *iface, VA ERR("Get ReadOnly Failed: %08x\n", nsres); return E_FAIL; } - *p = b ? VARIANT_TRUE : VARIANT_FALSE; + + *p = variant_bool(b); return S_OK; } @@ -529,7 +530,7 @@ static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *ifa return E_FAIL; } - *p = default_checked ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(default_checked); return S_OK; } @@ -563,7 +564,7 @@ static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VAR return E_FAIL; } - *p = checked ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(checked); TRACE("checked=%x\n", *p); return S_OK; } @@ -1891,7 +1892,7 @@ static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface, return E_FAIL; } - *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + *p = variant_bool(disabled); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 98daa65..8965d46 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1333,6 +1333,11 @@ static inline void windowref_release(windowref_t *ref) heap_free(ref); } +static inline VARIANT_BOOL variant_bool(BOOL b) +{ + return b ? VARIANT_TRUE : VARIANT_FALSE; +} + UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : gdiplus/metafile: Support hatch brushes for recording.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: f25f0fa2ac47af177de8ea7ef3a476b2b78a4941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25f0fa2ac47af177de8ea7ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:41 2017 +0300 gdiplus/metafile: Support hatch brushes for recording. 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/metafile.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0630779..8e9ad87 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3752,25 +3752,45 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) { - if (brush->bt == BrushTypeSolidColor) + switch (brush->bt) { - *size = FIELD_OFFSET(EmfPlusBrush, BrushData.solid) + sizeof(EmfPlusSolidBrushData); - return Ok; + case BrushTypeSolidColor: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); + break; + case BrushTypeHatchFill: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); + break; + default: + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; } - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; + return Ok; } static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) { - if (brush->bt == BrushTypeSolidColor) - { - GpSolidFill *solid = (GpSolidFill*)brush; + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; - data->Version = VERSION_MAGIC2; - data->Type = solid->brush.bt; + switch (brush->bt) + { + case BrushTypeSolidColor: + { + GpSolidFill *solid = (GpSolidFill *)brush; data->BrushData.solid.SolidColor = solid->color; + break; + } + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch *)brush; + data->BrushData.hatch.HatchStyle = hatch->hatchstyle; + data->BrushData.hatch.ForeColor = hatch->forecol; + data->BrushData.hatch.BackColor = hatch->backcol; + break; + } + default: + FIXME("unsupported brush type: %d\n", brush->bt); } }

1 0

Nikolay Sivov : gdiplus/metafile: Support texture brushes playback.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 905bd23b2e46f800ab2100feec8abbdc2565d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=905bd23b2e46f800ab2100fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:40 2017 +0300 gdiplus/metafile: Support texture brushes playback. 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/metafile.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c9ddcc6..0630779 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -225,6 +225,18 @@ typedef struct EmfPlusPenData BYTE OptionalData[1]; } EmfPlusPenData; +enum BrushDataFlags +{ + BrushDataPath = 1 << 0, + BrushDataTransform = 1 << 1, + BrushDataPresetColors = 1 << 2, + BrushDataBlendFactorsH = 1 << 3, + BrushDataBlendFactorsV = 1 << 4, + BrushDataFocusScales = 1 << 6, + BrushDataIsGammaCorrected = 1 << 7, + BrushDataDoNotTransform = 1 << 8, +}; + typedef struct EmfPlusSolidBrushData { EmfPlusARGB SolidColor; @@ -237,6 +249,13 @@ typedef struct EmfPlusHatchBrushData EmfPlusARGB BackColor; } EmfPlusHatchBrushData; +typedef struct EmfPlusTextureBrushData +{ + DWORD BrushDataFlags; + INT WrapMode; + BYTE OptionalData[1]; +} EmfPlusTextureBrushData; + typedef struct EmfPlusBrush { DWORD Version; @@ -244,6 +263,7 @@ typedef struct EmfPlusBrush union { EmfPlusSolidBrushData solid; EmfPlusHatchBrushData hatch; + EmfPlusTextureBrushData texture; } BrushData; } EmfPlusBrush; @@ -1848,6 +1868,36 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, data->BrushData.hatch.BackColor, (GpHatch **)brush); break; + case BrushTypeTextureFill: + { + UINT offset = header_size + FIELD_OFFSET(EmfPlusTextureBrushData, OptionalData); + EmfPlusTransformMatrix *transform = NULL; + DWORD brushflags; + GpImage *image; + + if (data_size <= offset) + return InvalidParameter; + + brushflags = data->BrushData.texture.BrushDataFlags; + if (brushflags & BrushDataTransform) + { + if (data_size <= offset + sizeof(EmfPlusTransformMatrix)) + return InvalidParameter; + transform = (EmfPlusTransformMatrix *)(record_data + offset); + offset += sizeof(EmfPlusTransformMatrix); + } + + status = metafile_deserialize_image(record_data + offset, data_size - offset, &image); + if (status != Ok) + return status; + + status = GdipCreateTexture(image, data->BrushData.texture.WrapMode, (GpTexture **)brush); + if (status == Ok && transform && !(brushflags & BrushDataDoNotTransform)) + GdipSetTextureTransform((GpTexture *)*brush, (const GpMatrix *)transform); + + GdipDisposeImage(image); + break; + } default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0

Zhiyi Zhang : kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 1354c0f3e4d4c46218a8657bb89cc0c25f102606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354c0f3e4d4c46218a8657bb… Author: Zhiyi Zhang <gd.yi(a)139.com> Date: Wed Nov 1 22:26:38 2017 +0800 kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName. Signed-off-by: Zhiyi Zhang <gd.yi(a)139.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 86fcc33..11a5788 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2779,7 +2779,7 @@ static void test_LocaleNameToLCID(void) ptr++; } - /* zh-Hant */ + /* zh-Hant has LCID 0x7c04, but LocaleNameToLCID actually returns 0x0c04, which is the LCID of zh-HK */ lcid = pLocaleNameToLCID(zhHantW, 0); todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); @@ -2787,6 +2787,11 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); + /* check that 0x7c04 also works and is mapped to zh-HK */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_CHINESE_TRADITIONAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + todo_wine ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); + todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* zh-hant */ lcid = pLocaleNameToLCID(zhhantW, 0); @@ -2798,14 +2803,20 @@ static void test_LocaleNameToLCID(void) todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); - /* zh-Hans */ + /* zh-Hans has LCID 0x0004, but LocaleNameToLCID actually returns 0x0804, which is the LCID of zh-CN */ lcid = pLocaleNameToLCID(zhHansW, 0); + /* check that LocaleNameToLCID actually returns 0x0804 */ todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); + /* check that 0x0004 also works and is mapped to zh-CN */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE, SUBLANG_NEUTRAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); /* zh-hans */ lcid = pLocaleNameToLCID(zhhansW, 0);

1 0

Józef Kucia : d3d11/tests: Add test for SV_InstanceID.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: dfbcc93da34f6b628838353d4a87d10149fb5ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbcc93da34f6b628838353d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:48 2017 +0100 d3d11/tests: Add test for SV_InstanceID. 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 | 268 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 256 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbcc93da34f6b6288383…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 8151875fcbf5355e9ea4c1b84b022edc874bb370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8151875fcbf5355e9ea4c1b84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:44 2017 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect(). 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/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c216b07..7a8f3df 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -842,7 +842,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *d3d_buffer; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_draw_indexed_primitive_instanced_indirect(device->wined3d_device, + d3d_buffer->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawInstancedIndirect().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6ff0e0041532fe157cbb01f6a5eb6ec11e621914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff0e0041532fe157cbb01f6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:43 2017 +0100 d3d11: Implement d3d11_immediate_context_DrawInstancedIndirect(). 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/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ced9a13..c216b07 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -848,7 +848,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndire static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *d3d_buffer; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_draw_primitive_instanced_indirect(device->wined3d_device, + d3d_buffer->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Add ARB_draw_indirect extension.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: f51f86cc196acb54096a5468d7276871585294df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51f86cc196acb54096a5468d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:40 2017 +0100 wined3d: Add ARB_draw_indirect extension. 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/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e060017..eae7505 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -123,6 +123,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, + {"GL_ARB_draw_indirect", ARB_DRAW_INDIRECT }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, @@ -2715,6 +2716,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDrawElementsInstancedBaseVertex) USE_GL_FUNC(glDrawRangeElementsBaseVertex) USE_GL_FUNC(glMultiDrawElementsBaseVertex) + /* GL_ARB_draw_indirect */ + USE_GL_FUNC(glDrawArraysIndirect) + USE_GL_FUNC(glDrawElementsIndirect) /* GL_ARB_draw_instanced */ USE_GL_FUNC(glDrawArraysInstancedARB) USE_GL_FUNC(glDrawElementsInstancedARB) @@ -3866,6 +3870,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, + {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TESSELLATION_SHADER, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8366111..47f3770 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -56,6 +56,7 @@ enum wined3d_gl_extension ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, + ARB_DRAW_INDIRECT, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, ARB_ES3_COMPATIBILITY,

1 0

Nikolay Sivov : gdiplus/metafile: Simplify EmfPlusARGB definition.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 0625b33834b108c4d0bf6466cbf0571fa2bf52ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625b33834b108c4d0bf6466c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:38 2017 +0300 gdiplus/metafile: Simplify EmfPlusARGB definition. 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/metafile.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e40487a..bf07fed 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -45,13 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); -typedef struct EmfPlusARGB -{ - BYTE Blue; - BYTE Green; - BYTE Red; - BYTE Alpha; -} EmfPlusARGB; +typedef ARGB EmfPlusARGB; typedef struct EmfPlusRecordHeader { @@ -1837,7 +1831,7 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si if (data_size != header_size + sizeof(EmfPlusSolidBrushData)) return InvalidParameter; - status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush); + status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; default: FIXME("brush type %u is not supported.\n", data->Type); @@ -2274,7 +2268,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill((ARGB)record->BrushID, (GpSolidFill**)&temp_brush); + stat = GdipCreateSolidFill(record->BrushID, (GpSolidFill **)&temp_brush); brush = temp_brush; } else @@ -2714,7 +2708,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(*(ARGB *)&fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3565,10 +3559,7 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp attrs_record->Version = VERSION_MAGIC2; attrs_record->Reserved1 = 0; attrs_record->WrapMode = attrs->wrap; - attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; - attrs_record->ClampColor.Green = (attrs->outside_color >> 8) & 0xff; - attrs_record->ClampColor.Red = (attrs->outside_color >> 16) & 0xff; - attrs_record->ClampColor.Alpha = attrs->outside_color >> 24; + attrs_record->ClampColor = attrs->outside_color; attrs_record->ObjectClamp = attrs->clamp; attrs_record->Reserved2 = 0; return Ok; @@ -3714,10 +3705,7 @@ static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) data->Version = VERSION_MAGIC2; data->Type = solid->brush.bt; - data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; - data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; - data->BrushData.solid.SolidColor.Red = (solid->color >> 16) & 0xff; - data->BrushData.solid.SolidColor.Alpha = solid->color >> 24; + data->BrushData.solid.SolidColor = solid->color; } } @@ -3970,10 +3958,7 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) if (inline_color) { fill_path_record->Header.Flags = 0x8000 | path_id; - fill_path_record->data.Color.Blue = ((GpSolidFill*)brush)->color & 0xff; - fill_path_record->data.Color.Green = (((GpSolidFill*)brush)->color >> 8) & 0xff; - fill_path_record->data.Color.Red = (((GpSolidFill*)brush)->color >> 16) & 0xff; - fill_path_record->data.Color.Alpha = ((GpSolidFill*)brush)->color >> 24; + fill_path_record->data.Color = ((GpSolidFill *)brush)->color; } else {

1 0

Andrey Gusev : hidclass.sys: Remove check for negative value.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 495ade93baa2ed13248a4a0e42cb35fda012bcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495ade93baa2ed13248a4a0e4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 1 18:41:37 2017 +0200 hidclass.sys: Remove check for negative value. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index ee13055..6b84997 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -440,10 +440,8 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, static void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) { - if (bSize <= 0) - return; - else - { + if (bSize) + { collection->type = itemVal; if (itemVal >= 0x07 && itemVal <= 0x7F) {

1 0

Alex Henrie : vbscript/tests: Fix test for WeekDayName(foo, bar, 0).
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 4438b2706b5dad21e9aa8dd29d19be9c5e1a0c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4438b2706b5dad21e9aa8dd29… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 14:12:21 2017 +0100 vbscript/tests: Fix test for WeekDayName(foo, bar, 0). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 4 +++- dlls/vbscript/tests/run.c | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 95ef84f..baa0553 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -594,7 +594,6 @@ if isEnglishLang then Call ok(WeekDayName(1, false) = "Sunday", "WeekDayName(1, false) = " & WeekDayName(1, false)) Call ok(WeekDayName(1, true) = "Sun", "WeekDayName(1, true) = " & WeekDayName(1, true)) Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) - Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) @@ -609,6 +608,9 @@ if isEnglishLang then Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if +Call ok(WeekDayName(1, true, 0) = WeekDayName(1, true, firstDayOfWeek), _ + "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) + Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) Call ok(vbOKOnly = 0, "vbOKOnly = " & vbOKOnly) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 81b1ced..7c97db2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -123,6 +123,7 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_LETOBJ 1018 #define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_GLOBAL_TODO_WINE_OK 1020 +#define DISPID_GLOBAL_WEEKSTARTDAY 1021 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -136,6 +137,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check, is_english, allow_ui; +static int first_day_of_week; static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; @@ -204,27 +206,23 @@ static const char *vt2a(VARIANT *v) } } -/* Returns true if the user interface is in English. Note that this does not - * presume of the formatting of dates, numbers, etc. +/* Sets is_english to true if the user interface is in English. Note that this + * does not presume the formatting of dates, numbers, etc. + * Sets first_day_of_week to 1 if Sunday, 2 if Monday, and so on. */ -static BOOL is_lang_english(void) +static void detect_locale(void) { - static HMODULE hkernel32 = NULL; - static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; - static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + LANGID (WINAPI *pGetThreadUILanguage)(void) = (void*)GetProcAddress(kernel32, "GetThreadUILanguage"); - if (!hkernel32) - { - hkernel32 = GetModuleHandleA("kernel32.dll"); - pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); - pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); - } - if (pGetThreadUILanguage && PRIMARYLANGID(pGetThreadUILanguage()) != LANG_ENGLISH) - return FALSE; - if (pGetUserDefaultUILanguage && PRIMARYLANGID(pGetUserDefaultUILanguage()) != LANG_ENGLISH) - return FALSE; + is_english = ((!pGetThreadUILanguage || PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH) && + PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && + PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; + GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), + LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + (void*)&first_day_of_week, sizeof(first_day_of_week)); + first_day_of_week = 1 + (first_day_of_week + 1) % 7; } static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) @@ -1010,6 +1008,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLANG; return S_OK; } + if(!strcmp_wa(bstrName, "firstDayOfWeek")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_WEEKSTARTDAY; + return S_OK; + } if(!strcmp_wa(bstrName, "testObj")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_TESTOBJ; @@ -1183,6 +1186,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BOOL(pvarRes) = is_english ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; + case DISPID_GLOBAL_WEEKSTARTDAY: + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = first_day_of_week; + return S_OK; + case DISPID_GLOBAL_VBVAR: CHECK_EXPECT(global_vbvar_i); @@ -2355,7 +2363,7 @@ START_TEST(run) int argc; char **argv; - is_english = is_lang_english(); + detect_locale(); if(!is_english) skip("Skipping some tests in non-English locale\n");

1 0

Józef Kucia : wined3d: Add support for R8_UNORM vertex format.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 5b3b1aa238773f94ae3a0e0b11d30af1809b4416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3b1aa238773f94ae3a0e0b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:47 2017 +0100 wined3d: Add support for R8_UNORM vertex format. 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/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d54334..2a12a91 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -405,6 +405,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_TRUE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE},

1 0

Józef Kucia : include/d3d11: Add definitions for indirect draw arguments.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 792f42f6d3960ba128991315ea91a7d1f6cd966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=792f42f6d3960ba128991315e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:46 2017 +0100 include/d3d11: Add definitions for indirect draw arguments. 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> --- include/d3d11.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index ba2cad8..a7b9812 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -2101,6 +2101,23 @@ typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS UINT64 CSInvocations; } D3D11_QUERY_DATA_PIPELINE_STATISTICS; +typedef struct D3D11_DRAW_INSTANCED_INDIRECT_ARGS +{ + UINT VertexCountPerInstance; + UINT InstanceCount; + UINT StartVertexLocation; + UINT StartInstanceLocation; +} D3D11_DRAW_INSTANCED_INDIRECT_ARGS; + +typedef struct D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS +{ + UINT IndexCountPerInstance; + UINT InstanceCount; + UINT StartIndexLocation; + INT BaseVertexLocation; + UINT StartInstanceLocation; +} D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS; + typedef struct D3D11_AUTHENTICATED_CONFIGURE_INPUT { D3D11_OMAC omac;

1 0

Michael Müller : wined3d: Add support for start instance in draw_primitive_arrays().
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: deae0044f4d7e3432871d89cba259f4d942d17d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deae0044f4d7e3432871d89cb… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 1 22:08:45 2017 +0100 wined3d: Add support for start instance in draw_primitive_arrays(). 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/wined3d/directx.c | 5 +++++ dlls/wined3d/drawprim.c | 16 +++++++++++++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eae7505..ef3a7fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ + {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, @@ -2686,6 +2687,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_APPLE_flush_buffer_range */ USE_GL_FUNC(glBufferParameteriAPPLE) USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) + /* GL_ARB_base_instance */ + USE_GL_FUNC(glDrawArraysInstancedBaseInstance) + USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) @@ -3881,6 +3885,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, + {ARB_BASE_INSTANCE, MAKEDWORD_VERSION(4, 2)}, {ARB_CONSERVATIVE_DEPTH, MAKEDWORD_VERSION(4, 2)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 67fca62..a7ca748 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -69,18 +69,32 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct return; } - if (start_instance) + if (start_instance && !(gl_info->supported[ARB_BASE_INSTANCE] && gl_info->supported[ARB_INSTANCED_ARRAYS])) FIXME("Start instance (%u) not supported.\n", start_instance); if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { if (!idx_size) { + if (gl_info->supported[ARB_BASE_INSTANCE]) + { + GL_EXTCALL(glDrawArraysInstancedBaseInstance(state->gl_primitive_type, start_idx, count, instance_count, start_instance)); + checkGLcall("glDrawArraysInstancedBaseInstance"); + return; + } + GL_EXTCALL(glDrawArraysInstanced(state->gl_primitive_type, start_idx, count, instance_count)); checkGLcall("glDrawArraysInstanced"); return; } + if (gl_info->supported[ARB_BASE_INSTANCE]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(state->gl_primitive_type, count, idx_type, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx, start_instance)); + checkGLcall("glDrawElementsInstancedBaseVertexBaseInstance"); + return; + } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { GL_EXTCALL(glDrawElementsInstancedBaseVertex(state->gl_primitive_type, count, idx_type, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 47f3770..f676b2f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -42,6 +42,7 @@ enum wined3d_gl_extension APPLE_FLUSH_BUFFER_RANGE, APPLE_YCBCR_422, /* ARB */ + ARB_BASE_INSTANCE, ARB_BLEND_FUNC_EXTENDED, ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE,

1 0

Józef Kucia : wined3d: Implement indirect draws.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: f4aa2911a689f95783fe2061a516440dc3d3f39e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4aa2911a689f95783fe2061a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:42 2017 +0100 wined3d: Implement indirect draws. 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/wined3d/cs.c | 68 ++++++++++++++++++++++++++++++------------ dlls/wined3d/device.c | 18 +++++++++++ dlls/wined3d/drawprim.c | 58 ++++++++++++++++++++++++++++------- dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 31 +++++++++++++++++-- include/wine/wined3d.h | 4 +++ 6 files changed, 149 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4aa2911a689f95783fe2…

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw2 tests.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 71443a5e1259384961ded2914d47b696fa7a6e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71443a5e1259384961ded2914… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:27 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw2 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 124 ++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71443a5e1259384961ded…

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw1 tests.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 27c203f237eb8eb41dbdebc8bd99ab985bce6bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c203f237eb8eb41dbdebc8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:26 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw1 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27c203f237eb8eb41dbde…

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw4 tests.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 1677711d6ee89196208effca84b4a3546bb413f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1677711d6ee89196208effca8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:28 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw4 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 145 ++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1677711d6ee89196208ef…

1 0

Nikolay Sivov : gdiplus/metafile: Support hatch brushes in playback.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 6d0ca495b8b0555c5f62911e43fee04396cd7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0ca495b8b0555c5f62911e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 14:10:39 2017 +0300 gdiplus/metafile: Support hatch brushes in playback. 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/metafile.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index bf07fed..c9ddcc6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -230,12 +230,20 @@ typedef struct EmfPlusSolidBrushData EmfPlusARGB SolidColor; } EmfPlusSolidBrushData; +typedef struct EmfPlusHatchBrushData +{ + DWORD HatchStyle; + EmfPlusARGB ForeColor; + EmfPlusARGB BackColor; +} EmfPlusHatchBrushData; + typedef struct EmfPlusBrush { DWORD Version; DWORD Type; union { EmfPlusSolidBrushData solid; + EmfPlusHatchBrushData hatch; } BrushData; } EmfPlusBrush; @@ -1833,6 +1841,13 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si status = GdipCreateSolidFill(data->BrushData.solid.SolidColor, (GpSolidFill **)brush); break; + case BrushTypeHatchFill: + if (data_size != header_size + sizeof(EmfPlusHatchBrushData)) + return InvalidParameter; + + status = GdipCreateHatchBrush(data->BrushData.hatch.HatchStyle, data->BrushData.hatch.ForeColor, + data->BrushData.hatch.BackColor, (GpHatch **)brush); + break; default: FIXME("brush type %u is not supported.\n", data->Type); return NotImplemented;

1 0