October 2012 - Wine-Commits

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

Oct. 18, 2012

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 Oct. 18, 2012

Oct. 18, 2012

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 Oct. 17, 2012

Oct. 17, 2012

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 Oct. 17, 2012

Oct. 17, 2012

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 HTMLImgElement::onabort implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 5e0f624c418b9668b03f3ee70a43e289aef91c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0f624c418b9668b03f3ee70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:18:30 2012 +0200 mshtml: Added HTMLImgElement::onabort implementation. --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlimg.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 94a9e7e..b2dfa61 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -45,6 +45,9 @@ struct event_target_t { handler_vector_t *event_table[EVENTID_LAST]; }; +static const WCHAR abortW[] = {'a','b','o','r','t',0}; +static const WCHAR onabortW[] = {'o','n','a','b','o','r','t',0}; + static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0}; static const WCHAR onbeforeunloadW[] = {'o','n','b','e','f','o','r','e','u','n','l','o','a','d',0}; @@ -160,6 +163,8 @@ typedef struct { #define EVENT_HASDEFAULTHANDLERS 0x0020 static const event_info_t event_info[] = { + {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, + EVENT_NODEHANDLER}, {beforeunloadW, onbeforeunloadW, EVENTT_NONE, DISPID_EVMETH_ONBEFOREUNLOAD, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, {blurW, onblurW, EVENTT_HTML, DISPID_EVMETH_ONBLUR, @@ -216,7 +221,7 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} }; -static const eventid_t node_handled_list[] = { EVENTID_ERROR, EVENTID_LOAD }; +static const eventid_t node_handled_list[] = { EVENTID_ABORT, EVENTID_ERROR, EVENTID_LOAD }; eventid_t str_to_eid(LPCWSTR str) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 174d2f7..8aa8ed1 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,6 +17,7 @@ */ typedef enum { + EVENTID_ABORT, EVENTID_BEFOREUNLOAD, EVENTID_BLUR, EVENTID_CHANGE, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index bc6ec80..4ca02fc 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -429,15 +429,19 @@ static HRESULT WINAPI HTMLImgElement_get_onerror(IHTMLImgElement *iface, VARIANT static HRESULT WINAPI HTMLImgElement_put_onabort(IHTMLImgElement *iface, VARIANT v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLImgElement_get_onabort(IHTMLImgElement *iface, VARIANT *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLImgElement_put_name(IHTMLImgElement *iface, BSTR v)

1 0

Jason Edmeades : cmd: Add support for calling a built in command.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 3c058185155a24f0e059d55c5d6318bc9a3f6400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c058185155a24f0e059d55c5… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Oct 14 00:38:53 2012 +0100 cmd: Add support for calling a built in command. --- programs/cmd/batch.c | 7 +++- programs/cmd/builtins.c | 10 +++--- programs/cmd/tests/test_builtins.cmd | 16 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++---- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 50 ++++++++++++++++++++++------- 6 files changed, 79 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c058185155a24f0e059d…

1 0

Henri Verbeet : ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: f9105db050eee83621f4aea75b9db8786fdb2188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9105db050eee83621f4aea75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 11:33:36 2012 +0200 ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects. --- dlls/ddraw/tests/ddraw1.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 192 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 192 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 784 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9105db050eee83621f4a…

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::get_complete implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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

Alexandre Julliard : gdi32: Process the object HDC list outside of the critical section.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 5f14ff42a80d03200dfd6eca4485bdb0ce75617c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f14ff42a80d03200dfd6eca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:08:11 2012 +0200 gdi32: Process the object HDC list outside of the critical section. --- dlls/gdi32/gdiobj.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 750e95b..afc0c59 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -810,7 +810,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; - const struct gdi_obj_funcs *funcs; + const struct gdi_obj_funcs *funcs = NULL; EnterCriticalSection( &gdi_section ); if (!(entry = handle_entry( obj ))) @@ -826,41 +826,38 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return TRUE; } - while ((hdcs_head = entry->hdcs) != NULL) + hdcs_head = entry->hdcs; + entry->hdcs = NULL; + + if (entry->obj->selcount) { + TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); + entry->obj->deleted = 1; /* mark for delete */ + } + else funcs = entry->funcs; + + LeaveCriticalSection( &gdi_section ); + + while (hdcs_head) + { + struct hdc_list *next = hdcs_head->next; DC *dc = get_dc_ptr(hdcs_head->hdc); - entry->hdcs = hdcs_head->next; TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); - if(dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeleteObject ); - LeaveCriticalSection( &gdi_section ); physdev->funcs->pDeleteObject( physdev, obj ); - EnterCriticalSection( &gdi_section ); /* and grab it again */ - entry = handle_entry( obj ); release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); - if (!entry) return FALSE; + hdcs_head = next; } - if (entry->obj->selcount) - { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); - entry->obj->deleted = 1; /* mark for delete */ - LeaveCriticalSection( &gdi_section ); - return TRUE; - } - - funcs = entry->funcs; - LeaveCriticalSection( &gdi_section ); - TRACE("%p\n", obj ); if (funcs && funcs->pDeleteObject) return funcs->pDeleteObject( obj ); - return FALSE; + return TRUE; } /***********************************************************************

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 9b516abb482ade8594ffdca86bc3924491cc17dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b516abb482ade8594ffdca86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:40 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/exception.c | 7 + dlls/msvcp100/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp100/string.c | 8 +- dlls/msvcp60/exception.c | 7 + dlls/msvcp60/ios.c | 240 +++++++++++++++++++++++++++++++++++ dlls/msvcp60/locale.c | 292 +++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 22 ++-- dlls/msvcp70/msvcp70.spec | 56 ++++---- dlls/msvcp71/exception.c | 7 + dlls/msvcp71/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp71/string.c | 4 + dlls/msvcp80/msvcp80.spec | 58 +++++----- dlls/msvcp90/string.c | 12 ++- 15 files changed, 774 insertions(+), 521 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b516abb482ade8594ffd…

1 0