November 2017 - Wine-Commits

Piotr Caban : hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: ace66d3540d7d3d93344545a91143e02fcbda91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace66d3540d7d3d93344545a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 2 19:39:05 2017 +0100 hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/help.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5fd7634..c7a2a7a 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1603,7 +1603,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *info) { - HWND hWnd, parent = 0; + HWND hWnd; RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -1677,11 +1677,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle; - if (info->WinType.dwStyles & WS_CHILD) - parent = info->WinType.hwndCaller; - - hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, - dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL); + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height, + info->WinType.hwndCaller, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE;

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie playback.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 6931e629cd0624daaa0a103307cd7390c1c95a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6931e629cd0624daaa0a10330… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:11 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 9beb3a3..c5c72e2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -432,6 +432,18 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusDrawPie +{ + EmfPlusRecordHeader Header; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawPie; + typedef struct EmfPlusFillPath { EmfPlusRecordHeader Header; @@ -2862,6 +2874,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, real_metafile->objtable[path].u.path); } + case EmfPlusRecordTypeDrawPie: + { + EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawPie, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawPieI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height, draw->StartAngle, draw->SweepAngle); + else + return GdipDrawPie(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : advapi32/tests: Remove dynamic function binding from LSA tests.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 90f94eae1d004550bdb1b39540f149976c847a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f94eae1d004550bdb1b3954… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:17 2017 +0300 advapi32/tests: Remove dynamic function binding from LSA tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 136 +++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90f94eae1d004550bdb1b…

1 0

Nikolay Sivov : advapi32/tests: Merge some test code.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 7112b60c833391680e4f90f685ea90d322c4eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7112b60c833391680e4f90f68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:18 2017 +0300 advapi32/tests: Merge some test code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 81bcf21..a06c8af 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -328,6 +328,7 @@ static void test_LsaLookupSids(void) HANDLE token; DWORD size; BOOL ret; + PSID sid; memset(&attrs, 0, sizeof(attrs)); attrs.Length = sizeof(attrs); @@ -364,26 +365,6 @@ static void test_LsaLookupSids(void) CloseHandle(token); - status = LsaClose(policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); -} - -static void test_LsaLookupSids_NullBuffers(void) -{ - LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; - LSA_TRANSLATED_NAME *names; - LSA_HANDLE policy; - NTSTATUS status; - BOOL ret; - PSID sid; - - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ret = ConvertStringSidToSidA("S-1-1-0", &sid); ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); @@ -415,5 +396,4 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); - test_LsaLookupSids_NullBuffers(); }

1 0

Jacek Caban : mshtml: Added IDocumentSelector:: querySelector implementation.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 3d505b12e352fd837246890656905b11d3b36699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d505b12e352fd83724689065… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:48:07 2017 +0100 mshtml: Added IDocumentSelector::querySelector implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 22 +++++++++++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index fbb70c1..55d55f7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4262,8 +4262,32 @@ static HRESULT WINAPI DocumentSelector_Invoke(IDocumentSelector *iface, DISPID d static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, BSTR v, IHTMLElement **pel) { HTMLDocument *This = impl_from_IDocumentSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMElement *nselem; + HTMLElement *elem; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_QuerySelector(This->doc_node->nsdoc, &nsstr, &nselem); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelector failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nselem) { + *pel = NULL; + return S_OK; + } + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(SUCCEEDED(hres)) + *pel = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index f0498d5..3912e9a 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -129,10 +129,30 @@ function test_getElementsByClassName() { next_test(); } +function test_query_selector() { + document.body.innerHTML = '<div class="class1">' + + '<div class="class1"></div>' + + '<a id="class1" class="class2"></a>' + + '</div>' + + '<script class="class1"></script>'; + + var e = document.querySelector("nomatch"); + ok(e === null, "e = " + e); + + e = document.querySelector(".class1"); + ok(e.tagName === "DIV", "e.tagName = " + e.tagName); + + e = document.querySelector("a"); + ok(e.tagName === "A", "e.tagName = " + e.tagName); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, test_getElementsByClassName, - test_head + test_head, + test_query_selector ];

1 0

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