October 2017 - Wine-commits

Piotr Caban : msi: Move condition integer handling into value_i.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 024c6c1b4b9c674398cd40a1971cbe7d96903ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=024c6c1b4b9c674398cd40a19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 15:00:58 2017 +0200 msi: Move condition integer handling into value_i. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 079bbd9..8b63a50 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -129,7 +129,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %nonassoc COND_ERROR COND_EOF %type <value> expression boolean_term boolean_factor -%type <value> value_i integer operator +%type <value> value_i operator %type <string> identifier symbol_s value_s literal %% @@ -293,9 +293,14 @@ literal: ; value_i: - integer + COND_NUMBER { - $$ = $1; + COND_input* cond = (COND_input*) info; + LPWSTR szNum = COND_GetString( cond, &$1 ); + if( !szNum ) + YYABORT; + $$ = atoiW( szNum ); + cond_free( szNum ); } | COND_DOLLARS identifier { @@ -382,18 +387,6 @@ identifier: } ; -integer: - COND_NUMBER - { - COND_input* cond = (COND_input*) info; - LPWSTR szNum = COND_GetString( cond, &$1 ); - if( !szNum ) - YYABORT; - $$ = atoiW( szNum ); - cond_free( szNum ); - } - ; - %%

1 0

Francois Gouget : testbot: Document CompareJobPriority(), particularly the Priority field.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: tools Branch: master Commit: dd51cc7f8afc40b6c583d5ac1b1922456da25eae URL: http://source.winehq.org/git/tools.git/?a=commit;h=dd51cc7f8afc40b6c583d5ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 19:04:55 2017 +0200 testbot: Document CompareJobPriority(), particularly the Priority field. Its naming is quite unfortunate since higher values mean a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3c7ce0d..c787e8a 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -399,6 +399,8 @@ sub CreateJobs(;$) sub CompareJobPriority { + # Process Jobs with a higher Priority value last (it's a niceness in fact), + # and older Jobs first. return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; }

1 0

Francois Gouget : testbot/TestAgent: Better report invalid options.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: tools Branch: master Commit: 252359b01c26d2f4f164ef26e0c590afb3e9c209 URL: http://source.winehq.org/git/tools.git/?a=commit;h=252359b01c26d2f4f164ef26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:49:05 2017 +0200 testbot/TestAgent: Better report invalid options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index bfc4fbc..c410556 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -152,6 +152,11 @@ while (@ARGV) { $RunFlags |= $TestAgent::RUN_DNTRUNC_ERR; } + elsif ($arg =~ /^-/) + { + error("unknown option '$arg'\n"); + $Usage = 2; + } elsif (!defined $Hostname) { $Hostname = $arg;

1 0

Francois Gouget : testbot/LibvirtTool: Give enough time for the VM to boot.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: tools Branch: master Commit: e94abb3ffad8819461f9bfa3c2e55936b8e4d3d9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e94abb3ffad8819461f9bfa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:48:24 2017 +0200 testbot/LibvirtTool: Give enough time for the VM to boot. In particular if the VM has not been used for a while one can get "No route to host" errors in quick succession. It's only once the VM has reclaimed its IP address that this error goes away. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 937821f..670c553 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -361,7 +361,7 @@ sub Revert() Debug(Elapsed($Start), " Trying the TestAgent connection\n"); LogMsg "Waiting for ". $VM->Name ." (up to ${WaitForToolsInVM}s per attempt)\n"; my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout($WaitForToolsInVM); + $TA->SetConnectTimeout($WaitForToolsInVM, undef, $WaitForToolsInVM); my $Success = $TA->Ping(); $TA->Disconnect(); if (!$Success)

1 0

Francois Gouget : testbot/TestAgent: Add --connect-attempts and --connect-interval options.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: tools Branch: master Commit: e7e490e5e2e7d883a1d8d6a8a1ba3d8e5868c614 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7e490e5e2e7d883a1d8d6a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:48:19 2017 +0200 testbot/TestAgent: Add --connect-attempts and --connect-interval options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 33fc298..bfc4fbc 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -56,7 +56,8 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); +my ($Port, $ConnectTimeout, $ConnectAttempts, $ConnectInterval, $Timeout); +my ($Keepalive, $TunnelOpt); my $Usage; sub set_cmd($) @@ -103,6 +104,14 @@ while (@ARGV) { $ConnectTimeout = check_opt_val($arg, $ConnectTimeout); } + elsif ($arg eq "--connect-attempts") + { + $ConnectAttempts = check_opt_val($arg, $ConnectAttempts); + } + elsif ($arg eq "--connect-interval") + { + $ConnectInterval = check_opt_val($arg, $ConnectInterval); + } elsif ($arg eq "--timeout") { $Timeout = check_opt_val($arg, $Timeout); @@ -340,6 +349,9 @@ if (defined $Usage) print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; print " connecting instead of the default one.\n"; + print " --connect-attempts <count> How many connection attempts to perform.\n"; + print " --connect-interval <time> The minimum interval (in seconds) between failed\n"; + print " connection attempts.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; print " default one for the operation.\n"; print " --keepalive <keepalive> How often (in seconds) the run and wait operations\n"; @@ -363,7 +375,10 @@ if ($TunnelOpt and $TunnelOpt =~ /^ssh:/) } my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo); -$TA->SetConnectTimeout($ConnectTimeout) if (defined $ConnectTimeout); +if (defined $ConnectTimeout or defined $ConnectAttempts or defined $ConnectInterval) +{ + $TA->SetConnectTimeout($ConnectTimeout, $ConnectAttempts, $ConnectInterval); +} $TA->SetTimeout($Timeout) if (defined $Timeout); my $RC = 0;

1 0

Francois Gouget : testbot/TestAgent: Add a minimum interval between connection attempts.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: tools Branch: master Commit: 81f6422814b5cfa30af6aad6a77411059603609d URL: http://source.winehq.org/git/tools.git/?a=commit;h=81f6422814b5cfa30af6aad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 24 15:47:43 2017 +0200 testbot/TestAgent: Add a minimum interval between connection attempts. This can be used to ensure the remote host has enough time to boot before TestAgent gives up, or to paper over very short network outages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e4d655c..255c1a1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -106,6 +106,7 @@ sub new($$$;$) connection => "$Hostname:$Port", ctimeout => 20, cattempts => 3, + cinterval => 0, timeout => 0, fd => undef, deadline => undef, @@ -147,9 +148,9 @@ sub Disconnect($) $self->{agentversion} = undef; } -sub SetConnectTimeout($$;$) +sub SetConnectTimeout($$;$$) { - my ($self, $Timeout, $Attempts) = @_; + my ($self, $Timeout, $Attempts, $Interval) = @_; my @Ret; if (defined $Timeout) { @@ -161,6 +162,11 @@ sub SetConnectTimeout($$;$) push @Ret, $self->{cattempts}; $self->{cattempts} = $Attempts; } + if (defined $Interval) + { + push @Ret, $self->{cinterval}; + $self->{cinterval} = $Interval; + } return @Ret; } @@ -891,7 +897,8 @@ sub _Connect($) $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; my $Step; - foreach my $Dummy (1..$self->{cattempts}) + my $Start = time(); + foreach my $Attempt (1..$self->{cattempts}) { my $Step = "initializing"; eval @@ -1026,7 +1033,8 @@ sub _Connect($) } # Ideally we should probably check the error and not retry if it is likely # permanent, like a hostname that does not resolve. - sleep(1); + my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); + sleep($Remaining) if ($Remaining > 0); } $self->{rpc} = $OldRPC; return undef;

1 0

Jacek Caban : mshtml: Added IDOMEvent:get_eventPhase implementation.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 85527dbdf39c70fe5b1a341701813ecf6263ebc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85527dbdf39c70fe5b1a34170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:39:11 2017 +0200 mshtml: Added IDOMEvent:get_eventPhase implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 18 ++++++++++++------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 6 ++++++ include/mshtml.idl | 8 ++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a428879..d64238f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -938,8 +938,11 @@ static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BO static HRESULT WINAPI DOMEvent_get_eventPhase(IDOMEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->phase; + return S_OK; } static HRESULT WINAPI DOMEvent_get_target(IDOMEvent *iface, IEventTarget **p) @@ -1434,10 +1437,13 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); - for(i = 0; i < chain_cnt; i++) { - call_event_handlers(target_chain[i], event); - if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) - break; + event->phase = DEP_AT_TARGET; + call_event_handlers(target_chain[0], event); + + if(event_flags & EVENT_BUBBLES) { + event->phase = DEP_BUBBLING_PHASE; + for(i = 1; !event->stop_propagation && i < chain_cnt; i++) + call_event_handlers(target_chain[i], event); } if(target_vtbl && target_vtbl->set_current_event) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0a967f2..97d34af 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { EventTarget *target; BOOL prevent_default; BOOL stop_propagation; + USHORT phase; IHTMLEventObj *event_obj; BOOL no_event_obj; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 84a35f3..ac7ae43 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2534,6 +2534,7 @@ static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; IDOMEvent *event; + USHORT phase; BSTR str; HRESULT hres; @@ -2547,6 +2548,11 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + phase = 0xdead; + hres = IDOMEvent_get_eventPhase(event, &phase); + ok(hres == S_OK, "get_eventPhase failed: %08x\n", hres); + ok(!phase, "phase = %u\n", phase); + hres = IDOMEvent_preventDefault(event); ok(hres == S_OK, "preventDefault failed: %08x\n", hres); diff --git a/include/mshtml.idl b/include/mshtml.idl index 45feb09..99150aa 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20031,6 +20031,14 @@ interface IEventTarget : IDispatch [out, retval] VARIANT_BOOL *pfResult); } +typedef enum _DOM_EVENT_PHASE +{ + DEP_CAPTURING_PHASE = 1, + DEP_AT_TARGET = 2, + DEP_BUBBLING_PHASE = 3, + DOM_EVENT_PHASE_Max = 0x7fffffff +} DOM_EVENT_PHASE; + /***************************************************************************** * IDOMEvent interface */

1 0

Jacek Caban : mshtml/tests: Skip postMessage test on IE7.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: caa3c43272f95f0093bd4b845e5f09d76a3a74c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa3c43272f95f0093bd4b845… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:44 2017 +0200 mshtml/tests: Skip postMessage test on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/jstest.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 00dd35d..cce8050 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -362,7 +362,12 @@ function test_xhr() { ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); } -function test_sendMessage() { +function test_postMessage() { + if(!("postMessage" in window)) { + win_skip("postMessage not available"); + return; + } + var onmessage_called = false; window.onmessage = function() { onmessage_called = true; @@ -397,7 +402,7 @@ function runTests() { test_language_attribute(); test_text_node(); test_xhr(); - test_sendMessage(); + test_postMessage(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml/tests: Fixed tests on old IE versions.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 8bcd54d7b5d0bb310a618d3e48860a86b81c21d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcd54d7b5d0bb310a618d3e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:36 2017 +0200 mshtml/tests: Fixed tests on old IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0ce4872..48262bb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -41,6 +41,8 @@ static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); +static BOOL is_ie9plus; + static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = @@ -6692,7 +6694,8 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLXMLHttpRequestFactory_create(factory, &xml); ok(hres == S_OK, "create failed: %08x\n", hres); ok(xml != NULL, "xml == NULL\n"); - test_disp((IUnknown*)xml, &DIID_DispHTMLXMLHttpRequest, &CLSID_HTMLXMLHttpRequest, "[object]"); + if(is_ie9plus) + test_disp((IUnknown*)xml, &DIID_DispHTMLXMLHttpRequest, &CLSID_HTMLXMLHttpRequest, "[object]"); IHTMLXMLHttpRequest_Release(xml); IHTMLXMLHttpRequestFactory_Release(factory); @@ -6725,10 +6728,12 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(doc2 != NULL, "doc2 == NULL\n"); - test_ifaces((IUnknown*)doc2, doc_node_iids); + if(is_ie9plus) + test_ifaces((IUnknown*)doc2, doc_node_iids); test_disp((IUnknown*)doc2, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); - test_ifaces((IUnknown*)doc, doc_obj_iids); + if(is_ie9plus) + test_ifaces((IUnknown*)doc, doc_obj_iids); test_disp((IUnknown*)doc, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); unk = (void*)0xdeadbeef; @@ -10589,16 +10594,6 @@ static void test_document_mode(IHTMLDocument2 *doc2) VARIANT v; HRESULT hres; - if(expected_document_mode >= 9) { - IHTMLDocument7 *doc7; - hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument7, (void**)&doc7); - if(FAILED(hres)) { - win_skip("IHTMLDocument7 interface not supported: %08x\n", hres); - return; - } - IHTMLDocument7_Release(doc7); - } - hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument6, (void**)&doc); ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08x\n", hres); @@ -10645,6 +10640,9 @@ static void test_quirks_mode(void) expected_document_mode = 5; run_domtest("<html><body></body></html>", test_document_mode); + if(!is_ie9plus) + return; + expected_document_mode = 9; run_domtest("<!DOCTYPE html>\n" "<html>" @@ -10667,6 +10665,27 @@ static void test_quirks_mode(void) "</html>", test_document_mode); } +static void check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + IHTMLDocument2_Release(doc); +} + START_TEST(dom) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -10677,6 +10696,8 @@ START_TEST(dom) container_hwnd = CreateWindowA("static", NULL, WS_POPUP|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 500, 500, NULL, NULL, NULL, NULL); + check_ie(); + run_domtest(doc_str1, test_doc_elem); run_domtest(doc_str1, test_get_set_attr); run_domtest(range_test_str, test_txtrange);

1 0

Jacek Caban : mshtml/tests: Fixed tests on some versions of IE.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: a428dea8bb524c8a95167f82c30f02028ff2dfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a428dea8bb524c8a95167f82c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:30 2017 +0200 mshtml/tests: Fixed tests on some versions of IE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6964f6e..7ec3f60 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5051,6 +5051,7 @@ static HRESULT wb_qi(REFIID riid, void **ppv) { static const IID IID_IWebBrowserPriv2IE7 = {0x1af32b6c, 0xa3ba,0x48b9,{0xb2,0x4e,0x8a,0xa9,0xc4,0x1f,0x6e,0xcd}}; static const IID IID_IWebBrowserPriv2IE8XP = {0x486f6159,0x9f3f,0x4827,{0x82,0xd4,0x28,0x3c,0xef,0x39,0x77,0x33}}; + static const IID IID_WB_undoc = {0xd9befc84,0xf21e,0x4166,{0x87,0x4b,0xa8,0xd3,0x01,0x0d,0xc7,0x64}}; *ppv = NULL; @@ -5089,7 +5090,8 @@ static HRESULT wb_qi(REFIID riid, void **ppv) return E_NOINTERFACE; } - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + if(!IsEqualGUID(riid, &IID_WB_undoc)) + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -6275,6 +6277,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) if(support_wbapp) SET_EXPECT(get_LocationURL); SET_EXPECT(TranslateUrl); + SET_EXPECT(GetOverrideKeyPath); SET_EXPECT(EvaluateNewWindow); hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); @@ -6286,6 +6289,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) todo_wine CHECK_CALLED_BROKEN(get_LocationURL); todo_wine CHECK_CALLED(TranslateUrl); + CLEAR_CALLED(GetOverrideKeyPath); if(!called_EvaluateNewWindow) { win_skip("INewWindowManager not supported\n");

1 0