wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Francois Gouget : testbot/WineSendLog: We are testing more than Windows now.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: tools Branch: master Commit: a1a36aa2d605d1dbcbafabc2e862f935f14ec5b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a1a36aa2d605d1dbcbafabc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:02:27 2019 +0100 testbot/WineSendLog: We are testing more than Windows now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1d13454..28644fb 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -342,7 +342,7 @@ EOF Hi, -While running your changed tests on Windows, I think I found new failures. +While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

1 0

Francois Gouget : testbot/SetWinLocale: Fix setting the VM description.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: tools Branch: master Commit: 2ded1320e329d9f5ab9824710a8fb51495035b72 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ded1320e329d9f5ab98247… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:02:00 2019 +0100 testbot/SetWinLocale: Fix setting the VM description. There is no $Suffix variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index e9d024f..5ca0507 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -649,7 +649,7 @@ if ($OptRefresh) $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); $VM->Hostname($BaseVM->Hostname); - my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); if ($PropertyDescriptor->GetMaxLength() < length($Description)) {

1 0

Henri Verbeet : d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 73355cab96de112f5125907424b37289afc6ebe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73355cab96de112f51259074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 22:04:24 2019 +0330 d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP. This fails intermittently on the testbot. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9318610..0ce9948 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8747,8 +8747,7 @@ static void test_vshader_input(void) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 - || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x0b, 0x75, 0x80), 1)), + ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 || broken(warp), "Got unexpected color 0x%08x for quad 2 (different colors).\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Stefan Dösinger : ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper().
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: e809a500d73c07c0012e80e185e95a5255a82e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e809a500d73c07c0012e80e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 13 22:04:23 2019 +0330 ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper(). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b788bd..b8cc2d2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4408,39 +4408,25 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetClipper - * - * Returns the IDirectDrawClipper interface of the clipper assigned to this - * surface - * - * Params: - * Clipper: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Clipper is NULL - * DDERR_NOCLIPPERATTACHED if there's no clipper attached - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper) +static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **clipper) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, clipper); - if (!Clipper) + if (!clipper) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (!surface->clipper) { wined3d_mutex_unlock(); + *clipper = NULL; return DDERR_NOCLIPPERATTACHED; } - *Clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*Clipper); + *clipper = &surface->clipper->IDirectDrawClipper_iface; + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK;

1 0

Jacek Caban : mshtml: Correctly handle documents with no window associated in IHTMLDocument2:: get_location.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: fc1bdc65a7b909aba258d871c7840ec52635790c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1bdc65a7b909aba258d871… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:30 2019 +0100 mshtml: Correctly handle documents with no window associated in IHTMLDocument2::get_location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9d57ef9..d5e2a70 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -745,12 +745,12 @@ static HRESULT WINAPI HTMLDocument_get_referrer(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLocation **p) { - HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface)->doc_node; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); + if(!This->nsdoc || !This->window) { + WARN("NULL window\n"); return E_UNEXPECTED; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index adb1fa5..52d353f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6921,7 +6921,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDOMImplementation_QueryInterface(dom_implementation, &IID_IHTMLDOMImplementation2, (void**)&dom_implementation2); if(SUCCEEDED(hres)) { + IHTMLDocument2 *new_document2; IHTMLDocument7 *new_document; + IHTMLLocation *location; str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); @@ -6930,6 +6932,13 @@ static void test_dom_implementation(IHTMLDocument2 *doc) test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); + hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + hres = IHTMLDocument2_get_location(new_document2, &location); + ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); }else {

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2:: createHTMLDocument implementation.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 7e0e55f76f31018554ada8aa71a472ab830d959a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0e55f76f31018554ada8aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:22 2019 +0100 mshtml: Add IHTMLDOMImplementation2::createHTMLDocument implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 26 +++++++++++-------- dlls/mshtml/htmlwindow.c | 6 ++++- dlls/mshtml/mshtml_private.h | 6 +++-- dlls/mshtml/nsiface.idl | 16 +++++++++++- dlls/mshtml/omnavigator.c | 62 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 ++++++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e0e55f76f31018554ad…

1 0

Jacek Caban : mshtml: Bind events directly to document node for documents with no window associated.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: b574cd98bd91f4d2e52247b5d77da3bb1644b34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b574cd98bd91f4d2e52247b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:11 2019 +0100 mshtml: Bind events directly to document node for documents with no window associated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4fc557d..0ba0bb9 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -384,18 +385,29 @@ static void init_listener(nsEventListener *This, nsDocumentEventListener *listen This->This = listener; } +static nsIDOMEventTarget *get_default_document_target(HTMLDocumentNode *doc) +{ + nsIDOMEventTarget *target; + nsISupports *target_iface; + nsresult nsres; + + target_iface = doc->window ? (nsISupports*)doc->basedoc.window->nswindow : (nsISupports*)doc->nsdoc; + nsres = nsISupports_QueryInterface(target_iface, &IID_nsIDOMEventTarget, (void**)&target); + return NS_SUCCEEDED(nsres) ? target : NULL; +} + void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR type) { nsIDOMEventTarget *target; nsresult nsres; - if(nsnode) + if(nsnode) { nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMEventTarget, (void**)&target); - else - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); - return; + assert(nsres == NS_OK); + }else { + target = get_default_document_target(doc); + if(!target) + return; } init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, @@ -409,14 +421,9 @@ static void detach_nslistener(HTMLDocumentNode *doc, const WCHAR *type, nsEventL nsAString type_str; nsresult nsres; - if(!doc->basedoc.window) - return; - - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } nsAString_InitDepend(&type_str, type); nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, @@ -455,7 +462,6 @@ void init_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener; nsIDOMEventTarget *target; - nsresult nsres; listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) @@ -474,11 +480,9 @@ void init_nsevents(HTMLDocumentNode *doc) doc->nsevent_listener = listener; - nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + target = get_default_document_target(doc); + if(!target) return; - } init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE);

1 0

Jacek Caban : mshtml: Use detach_document_node in detach_gecko_browser.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: d49d83a18e7fee9122d94adf1a675d4e47c2eed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49d83a18e7fee9122d94adf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:04 2019 +0100 mshtml: Use detach_document_node in detach_gecko_browser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 956ba37..33d251d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2197,8 +2197,7 @@ void detach_gecko_browser(GeckoBrowser *This) while(!list_empty(&This->document_nodes)) { HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); - list_remove(&doc->browser_entry); - doc->browser = NULL; + detach_document_node(doc); } while(!list_empty(&This->outer_windows)) {

1 0

Jacek Caban : mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: 1d04b6044631fc43ba94d9ac70728da671669eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d04b6044631fc43ba94d9ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:53:59 2019 +0100 mshtml: Don't Use HTMLDocument type in HTMLDOMNode_unlink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index aec12fc..ee504f9 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1573,9 +1573,9 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) } if(This->doc && &This->doc->node != This) { - HTMLDocument *doc = &This->doc->basedoc; + HTMLDocumentNode *doc = This->doc; This->doc = NULL; - htmldoc_release(doc); + htmldoc_release(&doc->basedoc); }else { This->doc = NULL; }

1 0

Rob Hughes : ws2_32: Handle EISCONN from sendmsg.
by Alexandre Julliard 13 Mar '19

13 Mar '19

Module: wine Branch: master Commit: b9591e21cfbe62a0c523524f0214f05d783239a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9591e21cfbe62a0c523524f… Author: Rob Hughes <rbhughes(a)gmail.com> Date: Tue Mar 12 16:14:19 2019 +0000 ws2_32: Handle EISCONN from sendmsg. When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rbhughes(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338..a56e284 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,12 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) + { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019