wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Francois Gouget : testbot/build: Also create the staging directory if it does not exist.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: 58537d5728a256502d72b99ed14ef4b43daa16ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=58537d5728a256502d72b99e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:24:30 2012 +0200 testbot/build: Also create the staging directory if it does not exist. This simplifies the initial configuration a little bit. --- testbot/bin/build/Reconfig.pl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index c3f8eb4..4661727 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -121,6 +121,11 @@ delete $ENV{ENV}; # Start with clean logfile unlink("$LogDir/Reconfig.log"); +if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") +{ + LogMsg "Unable to create '$DataDir/staging': $!\n"; + exit(1); +} if (! GitPull()) { exit(1);

1 0

Francois Gouget : testbot/doc: Some more installation instruction updates for the server.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: 24d2cf2bb411edcdbdd08eaef8abd84db494b6ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=24d2cf2bb411edcdbdd08eae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:23:54 2012 +0200 testbot/doc: Some more installation instruction updates for the server. --- testbot/doc/INSTALL.txt | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index d7c093e..54e5e31 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -90,31 +90,31 @@ Setup for Wine's patches site: - Arrange for the WinePatchesWebNotify.pl script to be fed the notification emails. One way to do so would be to use procmail and add the following lines to the $HOME/.procmailrc file: - :0: + :0c: * ^Subject: New patches available at | $HOME/tools/testbot/bin/WinePatchesWebNotify.pl Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /home/winehq/tools/testbot/scripts/CheckForWinetestUpdate.pl + * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 32 + * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 64 Setup for wine-patches: -- FIXME: WineTestBot now expects to receive the patches to test from - Wine's Patches site instead of straight from the wine-patches mailing - list. Furthermore WinePatchesMLSubmit.pl is currently broken (because - the patch ids are no longer auto-generated). So this should be - skipped. +- A proper WineTestBot system should integrate with Wine's patches site. + An alternative is to interface directly with wine-patches as described in + this section. - Arrange for the WinePatchesMLSubmit.pl script to be fed the wine-patches emails. One way to do so would be to subscribe the winehq user to the wine-patches mailing list and to then add the following lines to the .procmailrc file: - :0: + :0c: * ^List-Id: Wine Patch Submissions + * ^TO wine-patches | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -s $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file + formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file 2. VM hosts setup @@ -136,12 +136,12 @@ Dependencies: make sure to make user winehq a member of group winehq. - Clone Wine's tools repository to $HOME/tools (so this document should be available as $HOME/tools/testbot/doc/INSTALL.txt). -- Create the $HOME/tools/testbot/var and $HOME/tools/testbot/log - directories and make them writable to group winehq. - mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log - chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log +- Create the $HOME/tools/testbot/var directory and make it writable to + group winehq. + mkdir $HOME/tools/testbot/var + chmod g+w $HOME/tools/testbot/var - Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. -- In the winetest account, run Reconfig.pl. +- In the winehq account, run Reconfig.pl. Check $HOME/tools/testbot/log/Reconfig.log to make sure it succeeded. - Take a snapshot of the running VM. Make sure restoring this snapshot

1 0

Alexandre Julliard : server: Fix propagation of the pixel format flag when the parent window is changed .
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 29b39020f789fad042824822b5aa05ec0470438a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b39020f789fad042824822b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 15:35:00 2012 +0200 server: Fix propagation of the pixel format flag when the parent window is changed. --- server/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 2b4bc50..368171f 100644 --- a/server/window.c +++ b/server/window.c @@ -254,7 +254,8 @@ static int set_parent_window( struct window *win, struct window *parent ) if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) attach_thread_input( win->thread, parent->thread ); - if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); + if (win->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)) + update_pixel_format_flags( win ); } else /* move it to parent unlinked list */ {

1 0

Christian Costa : krnl386.exe: Implement INT 33h function 15h.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 338dedef02f32705b98c6afa2e946e7c53ed32a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338dedef02f32705b98c6afa2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 17 14:03:53 2012 +0200 krnl386.exe: Implement INT 33h function 15h. --- dlls/krnl386.exe16/int33.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c index b3411a7..7226816 100644 --- a/dlls/krnl386.exe16/int33.c +++ b/dlls/krnl386.exe16/int33.c @@ -184,6 +184,11 @@ void WINAPI DOSVM_Int33Handler( CONTEXT *context ) FIXME("Define screen region for update\n"); break; + case 0x0015: + TRACE("Get mouse driver state and memory requirements\n"); + SET_BX(context, sizeof(mouse_info)); + break; + case 0x0021: TRACE("Software reset\n"); INT33_ResetMouse( context );

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::get_complete implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 06ce49c81b2e893d286aeffe4e76394ccfb74ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ce49c81b2e893d286aeffe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:20:24 2012 +0200 mshtml: Added IHTMLImgElement::get_complete implementation. --- dlls/mshtml/htmlimg.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 4ca02fc..e5f94d1 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -358,8 +358,19 @@ static HRESULT WINAPI HTMLImgElement_get_readyState(IHTMLImgElement *iface, BSTR static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIANT_BOOL *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool complete; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete); + if(NS_FAILED(nsres)) { + ERR("GetComplete failed: %08x\n", nsres); + return E_FAIL; + } + + *p = complete ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_loop(IHTMLImgElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea54b4d..ef036da 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2504,6 +2504,19 @@ static void _test_img_name(unsigned line, IUnknown *unk, const char *pValue) SysFreeString(sName); } +#define test_img_complete(a,b) _test_img_complete(__LINE__,a,b) +static void _test_img_complete(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLImgElement *img = _get_img_iface(line, (IUnknown*)elem); + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLImgElement_get_complete(img, &b); + ok_(__FILE__,line) (hres == S_OK, "get_complete failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "complete = %x, expected %x\n", b, exb); + IHTMLImgElement_Release(img); +} + static void test_dynamic_properties(IHTMLElement *elem) { static const WCHAR attr1W[] = {'a','t','t','r','1',0}; @@ -5703,6 +5716,7 @@ static void test_elems(IHTMLDocument2 *doc) test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); + test_img_complete(elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Fixed trace message.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 1dae62f0a98968c1a962d8c0905af0d24061ba2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dae62f0a98968c1a962d8c09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:20:06 2012 +0200 mshtml: Fixed trace message. --- dlls/mshtml/htmlscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index befc577..2dc25de 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -100,7 +100,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR nsAString src_str; nsresult nsres; - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->element.node.doc || !This->element.node.doc->window) { WARN("no windoow\n");

1 0

Jacek Caban : mshtml: Moved remove_target_tasks to detach_inner_window.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 81e106cfa218ab09b9f7bb108546616bb6986ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e106cfa218ab09b9f7bb108… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:53 2012 +0200 mshtml: Moved remove_target_tasks to detach_inner_window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 209a649..59b02ab 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -116,6 +116,7 @@ static void detach_inner_window(HTMLInnerWindow *window) if(window->doc) detach_events(window->doc); abort_window_bindings(window); + remove_target_tasks(window->task_magic); release_script_hosts(window); window->base.outer_window = NULL; @@ -233,7 +234,6 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); detach_inner_window(This); - remove_target_tasks(This->task_magic); if(This->doc) { This->doc->window = NULL;

1 0

Jacek Caban : mshtml: Make HTMLInnerWindow the owner of timers.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 4a491ea7e48a3a5f03f765f981fd5db0f0f2848a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a491ea7e48a3a5f03f765f98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:34 2012 +0200 mshtml: Make HTMLInnerWindow the owner of timers. --- dlls/mshtml/htmlwindow.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/task.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f9995d7..209a649 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -567,7 +567,7 @@ static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(&This->inner_window->doc->basedoc, FALSE, timerID); + return clear_task_timer(This->inner_window, FALSE, timerID); } #define MAX_MESSAGE_LEN 2000 @@ -1243,7 +1243,7 @@ static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerI TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(&This->inner_window->doc->basedoc, TRUE, timerID); + return clear_task_timer(This->inner_window, TRUE, timerID); } static HRESULT WINAPI HTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v) @@ -1563,7 +1563,7 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, if(!disp) return E_FAIL; - *timer_id = set_task_timer(&This->doc->basedoc, msec, interval, disp); + *timer_id = set_task_timer(This, msec, interval, disp); IDispatch_Release(disp); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 737731f..c54a865 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -980,8 +980,8 @@ LONG get_task_target_magic(void) DECLSPEC_HIDDEN; void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; -HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD) DECLSPEC_HIDDEN; +DWORD set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; +HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index a38437c..0fea1ca 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define TIMER_ID 0x3000 typedef struct { - HTMLDocument *doc; + HTMLInnerWindow *window; DWORD id; DWORD time; DWORD interval; @@ -107,7 +107,7 @@ void remove_target_tasks(LONG target) LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->timer_list) { timer = LIST_ENTRY(liter, task_timer_t, entry); - if(timer->doc->task_magic == target) + if(timer->window->task_magic == target) release_task_timer(thread_data->thread_hwnd, timer); } @@ -163,7 +163,7 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *disp) +DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp) { thread_data_t *thread_data = get_thread_data(TRUE); task_timer_t *timer; @@ -173,7 +173,7 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di timer = heap_alloc(sizeof(task_timer_t)); timer->id = id_cnt++; - timer->doc = doc; + timer->window = window; timer->time = tc + msec; timer->interval = interval ? msec : 0; list_init(&timer->entry); @@ -187,7 +187,7 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di return timer->id; } -HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) +HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id) { thread_data_t *thread_data = get_thread_data(FALSE); task_timer_t *iter; @@ -196,7 +196,7 @@ HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) return S_OK; LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { - if(iter->id == id && iter->doc == doc && (iter->interval == 0) == !interval) { + if(iter->id == id && iter->window == window && !iter->interval == !interval) { release_task_timer(thread_data->thread_hwnd, iter); return S_OK; }

1 0

Jacek Caban : mshtml: Use detach_inner_window in release_inner_window.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: d1c1f9e8300786cfe6a4f113bc26b529e694c6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c1f9e8300786cfe6a4f113b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:12 2012 +0200 mshtml: Use detach_inner_window in release_inner_window. --- dlls/mshtml/htmlevent.c | 4 +++- dlls/mshtml/htmlwindow.c | 27 ++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b2dfa61..641d453 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1312,8 +1312,10 @@ void detach_events(HTMLDocumentNode *doc) int i; for(i=0; i < EVENTID_LAST; i++) { - if(doc->event_vector[i]) + if(doc->event_vector[i]) { detach_nsevent(doc, event_info[i].name); + doc->event_vector[i] = FALSE; + } } } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 92659cf..f9995d7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -106,23 +106,23 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN return get_event_handler(&window->inner_window->doc->body_event_target, eid, var); } -static void detach_inner_window(HTMLOuterWindow *outer_window) +static void detach_inner_window(HTMLInnerWindow *window) { - HTMLInnerWindow *window = outer_window->base.inner_window; - - if(!window) - return; + HTMLOuterWindow *outer_window = window->base.outer_window; - if(outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) + if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; - detach_events(window->doc); + if(window->doc) + detach_events(window->doc); abort_window_bindings(window); release_script_hosts(window); - window->doc->basedoc.window = NULL; window->base.outer_window = NULL; - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + if(outer_window && outer_window->base.inner_window == window) { + outer_window->base.inner_window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } } static inline HTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) @@ -206,7 +206,8 @@ static void release_outer_window(HTMLOuterWindow *This) remove_target_tasks(This->task_magic); set_current_mon(This, NULL); - detach_inner_window(This); + if(This->base.inner_window) + detach_inner_window(This->base.inner_window); release_children(This); if(This->secmgr) @@ -231,9 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); + detach_inner_window(This); remove_target_tasks(This->task_magic); - abort_window_bindings(This); - release_script_hosts(This); if(This->doc) { This->doc->window = NULL; @@ -2877,7 +2877,8 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return S_OK; } - detach_inner_window(outer_window); + if(outer_window->base.inner_window) + detach_inner_window(outer_window->base.inner_window); outer_window->base.inner_window = window; outer_window->pending_window = NULL;

1 0

Jacek Caban : mshtml: Added IOmNavigator::onLine semi-stub.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 75994335e3b3080072c487116cdeb2ec95464ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75994335e3b3080072c487116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:18:48 2012 +0200 mshtml: Added IOmNavigator::onLine semi-stub. --- dlls/mshtml/omnavigator.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 73bb0bb..6d7ec15 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -881,8 +881,11 @@ static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG static HRESULT WINAPI OmNavigator_get_onLine(IOmNavigator *iface, VARIANT_BOOL *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p) semi-stub, returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI OmNavigator_get_userProfile(IOmNavigator *iface, IHTMLOpsProfile **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02ba3ef..ea54b4d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4496,6 +4496,7 @@ static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IOmNavigator *navigator, *navigator2; + VARIANT_BOOL b; char buf[512]; DWORD size; ULONG ref; @@ -4581,6 +4582,11 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, "[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + b = 100; + hres = IOmNavigator_get_onLine(navigator, &b); + ok(hres == S_OK, "get_onLine failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "onLine = %x\n", b); + size = sizeof(buf); hres = ObtainUserAgentString(0, buf, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
96
Older →

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 October 2012