December 2009 - Wine-Commits

Scott Ritchie : Update Ubuntu install instructions
by Jeremy Newman Dec. 7, 2009

Dec. 7, 2009

Module: website Branch: master Commit: 8238f8dbacba18546e645d1359dbd9e50d5ae71a URL: http://source.winehq.org/git/website.git/?a=commit;h=8238f8dbacba18546e645d… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sun Dec 6 14:25:57 2009 -0800 Update Ubuntu install instructions Update ubuntu install instructions >From 303aa1f6aedd1ac1812cf121c743c0e9068d62d2 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-laptop.(none)> Date: Sun, 6 Dec 2009 14:21:58 -0800 Subject: Update Ubuntu install instructions --- images/distro/ubuntu-ppa.png | Bin 0 -> 58532 bytes templates/en/download/deb.template | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png new file mode 100644 index 0000000..d839cfc Binary files /dev/null and b/images/distro/ubuntu-ppa.png differ diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 6f44d0a..b843618 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -3,7 +3,7 @@ <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine for Ubuntu and Ubuntu derivatives -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> <p>Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of @@ -27,7 +27,7 @@ beta packages.</i></p> <b>System->Administration->Software Sources</b>. Then select the <b>Third Party Software</b> tab and click <b>Add</b>.</p> -<img src="{$root}/images/distro/ubuntu-softwaresources1.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> <p>Then, <b>copy and paste one of the lines below</b> depending on which version you are running.</p> @@ -41,7 +41,7 @@ version you are running.</p> <p><b>For Ubuntu Hardy (8.04):</b><br> <i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p> -<h2>Trusting the WineHQ APT Repository:</h2> +<h2>Trusting the WineHQ APT Repository (9.04 and earlier):</h2> <p>After adding the repository, you also need to add the key for the repository to your system's list of trusted keys. Ubuntu 9.10 users may skip this step.</p> @@ -82,10 +82,14 @@ the packages are available at <p>It is also possible to add the Wine repositories and install via the command line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu -derivatives.</p> +derivatives. You will need to run these in a terminal window.</p> -<p>First, open a terminal window (Applications->Accessories->Terminal). Then -add the repository's key to your system's list of trusted APT keys by copy +<h3>For 9.10 (Karmic):</h3> + +<p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> + +<h3>For 9.04 and earlier:</h3> +<p>Add the repository's key to your system's list of trusted APT keys by copy and pasting the following into your terminal:</p> <p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p>

1 0

Piotr Caban : mshtml: Added more OleDocumentView_UIActivate tests.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 2efb8298451c33dfe3a1ea8ed6d3bed8c1058fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efb8298451c33dfe3a1ea8ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:55:02 2009 +0100 mshtml: Added more OleDocumentView_UIActivate tests. --- dlls/mshtml/tests/htmldoc.c | 370 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 321 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2efb8298451c33dfe3a1e…

1 0

Piotr Caban : mshtml: Added OleObject_Advise tests.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 91dd9bbb71eb60b4c4bc030bcbec5e77ae993069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dd9bbb71eb60b4c4bc030bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:53:44 2009 +0100 mshtml: Added OleObject_Advise tests. --- dlls/mshtml/tests/htmldoc.c | 105 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 751866f..498cedc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2549,6 +2549,62 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; +static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSink *iface, + REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI AdviseSink_AddRef(IAdviseSink *iface) +{ + return 2; +} + +static ULONG WINAPI AdviseSink_Release(IAdviseSink *iface) +{ + return 1; +} + +static void WINAPI AdviseSink_OnDataChange(IAdviseSink *iface, + FORMATETC *pFormatetc, STGMEDIUM *pStgmed) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnViewChange(IAdviseSink *iface, + DWORD dwAspect, LONG lindex) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnRename(IAdviseSink *iface, IMoniker *pmk) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnSave(IAdviseSink *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnClose(IAdviseSink *iface) +{ + ok(0, "unexpected call\n"); +} + +static const IAdviseSinkVtbl AdviseSinkVtbl = { + AdviseSink_QueryInterface, + AdviseSink_AddRef, + AdviseSink_Release, + AdviseSink_OnDataChange, + AdviseSink_OnViewChange, + AdviseSink_OnRename, + AdviseSink_OnSave, + AdviseSink_OnClose +}; + +static IAdviseSink AdviseSink = { &AdviseSinkVtbl }; + DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); DEFINE_GUID(IID_IRenMailEditor, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -3632,6 +3688,54 @@ static void test_Close(IUnknown *unk, BOOL set_client) IOleObject_Release(oleobj); } +static void test_Advise(IUnknown *unk) +{ + IOleObject *oleobj = NULL; + IEnumSTATDATA *enum_advise = (void*)0xdeadbeef; + DWORD conn; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IOleObject_Unadvise(oleobj, 0); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_EnumAdvise(oleobj, &enum_advise); + ok(hres == S_OK, "EnumAdvise returned: %08x\n", hres); + ok(enum_advise == NULL, "enum_advise != NULL\n"); + + conn = -1; + hres = IOleObject_Advise(oleobj, NULL, &conn); + /* Old IE returns S_OK and sets conn to 1 */ + ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08x\n", hres); + ok(conn == 0 || conn == 1, "conn = %d\n", conn); + + hres = IOleObject_Advise(oleobj, &AdviseSink, NULL); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(conn == 1, "conn = %d\n", conn); + + hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(conn == 2, "conn = %d\n", conn); + + hres = IOleObject_Unadvise(oleobj, 1); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, 1); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, 2); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + IOleObject_Release(oleobj); +} + static void test_OnFrameWindowActivate(IUnknown *unk) { IOleInPlaceActiveObject *inplaceact; @@ -4046,6 +4150,7 @@ static void test_HTMLDocument(BOOL do_load) doc_unk = unk; test_QueryInterface(unk); + test_Advise(unk); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_external(unk, FALSE);

1 0

Piotr Caban : mshtml: Improved OleDocumentView_UIActivate implementation.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 8c06ed96aeb737e5596e190efe785a2c2c97237e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c06ed96aeb737e5596e190ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:54:33 2009 +0100 mshtml: Improved OleDocumentView_UIActivate implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/view.c | 44 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index bf539d4..012d543 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -379,6 +379,7 @@ struct HTMLDocumentObj { HWND hwnd; HWND tooltips_hwnd; + BOOL request_uiactivate; BOOL in_place_active; BOOL ui_active; BOOL window_active; diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 0d1d055..271a167 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -342,6 +342,14 @@ static HRESULT activate_window(HTMLDocumentObj *This) IOleInPlaceFrame_Release(This->frame); This->frame = pIPFrame; + if(!This->request_uiactivate) { + hres = IOleInPlaceSite_QueryInterface(This->ipsite, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); + if(SUCCEEDED(hres)) { + IOleInPlaceSiteEx_RequestUIActivate(ipsiteex); + IOleInPlaceSiteEx_Release(ipsiteex); + } + } + This->window_active = TRUE; return S_OK; @@ -466,6 +474,7 @@ static HRESULT WINAPI OleDocumentView_SetInPlaceSite(IOleDocumentView *iface, IO IOleInPlaceSite_Release(This->doc_obj->ipsite); This->doc_obj->ipsite = pIPSite; + This->doc_obj->request_uiactivate = TRUE; return S_OK; } @@ -557,6 +566,10 @@ static HRESULT WINAPI OleDocumentView_Show(IOleDocumentView *iface, BOOL fShow) ShowWindow(This->doc_obj->hwnd, SW_SHOW); }else { ShowWindow(This->doc_obj->hwnd, SW_HIDE); + + if(This->doc_obj->in_place_active) + IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(This)); + if(This->doc_obj->ip_window) { IOleInPlaceUIWindow_Release(This->doc_obj->ip_window); This->doc_obj->ip_window = NULL; @@ -574,8 +587,35 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f TRACE("(%p)->(%x)\n", This, fUIActivate); if(!This->doc_obj->ipsite) { - FIXME("This->ipsite = NULL\n"); - return E_FAIL; + IOleClientSite *cs = This->doc_obj->client; + IOleInPlaceSite *ips; + + if(!cs) { + WARN("this->ipsite = NULL\n"); + return E_UNEXPECTED; + } + + hres = IOleClientSite_QueryInterface(cs, &IID_IOleInPlaceSiteWindowless, (void**)&ips); + if(SUCCEEDED(hres)) + This->doc_obj->ipsite = ips; + else { + hres = IOleClientSite_QueryInterface(cs, &IID_IOleInPlaceSiteEx, (void**)&ips); + if(SUCCEEDED(hres)) + This->doc_obj->ipsite = ips; + else { + hres = IOleClientSite_QueryInterface(cs, &IID_IOleInPlaceSite, (void**)&ips); + if(SUCCEEDED(hres)) + This->doc_obj->ipsite = ips; + else { + WARN("this->ipsite = NULL\n"); + return E_NOINTERFACE; + } + } + } + + IOleClientSite_AddRef(This->doc_obj->ipsite); + This->doc_obj->request_uiactivate = FALSE; + HTMLDocument_LockContainer(This->doc_obj, TRUE); } if(fUIActivate) {

1 0

Piotr Caban : mshtml: Added OleObject_EnumAdvise implementation.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 7372a6dd12cde485acdf69dabf00494cf5c4ea80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7372a6dd12cde485acdf69dab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:53:19 2009 +0100 mshtml: Added OleObject_EnumAdvise implementation. --- dlls/mshtml/oleobj.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fd396b1..32f5f60 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -413,8 +413,13 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { HTMLDocument *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return E_NOTIMPL; + + if(!This->advise_holder) { + *ppenumAdvise = NULL; + return S_OK; + } + + return IOleAdviseHolder_EnumAdvise(This->advise_holder, ppenumAdvise); } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)

1 0

Paul Vriens : mshtml/tests: Skip some tests on older IE.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 8da7a00e67326e84d1f5f2de8d3f65c09aa0f2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da7a00e67326e84d1f5f2de8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 7 16:43:47 2009 +0100 mshtml/tests: Skip some tests on older IE. --- dlls/mshtml/tests/events.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index abca9f4..fc10510 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1774,12 +1774,23 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if (FAILED(hres)) + return NULL; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(FAILED(hres)) { + win_skip("Could not get IHTMLDocument5 interface, probably too old IE\n"); + IHTMLDocument2_Release(doc); + return NULL; + } + IHTMLDocument5_Release(doc5); return doc; } @@ -1796,6 +1807,8 @@ static void run_test(const char *str, testfunc_t test) xy_todo = FALSE; doc = create_document(); + if (!doc) + return; set_client_site(doc, TRUE); doc_load_string(doc, str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);

1 0

Piotr Caban : mshtml: Added Advise handling to OleObject_Close.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 24601ed1dbcace9bc35e1cec2fdc6795d953c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24601ed1dbcace9bc35e1cec2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:54:05 2009 +0100 mshtml: Added Advise handling to OleObject_Close. --- dlls/mshtml/oleobj.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 32f5f60..872d766 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -250,6 +250,9 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(This)); HTMLDocument_LockContainer(This->doc_obj, FALSE); + + if(This->advise_holder) + IOleAdviseHolder_SendOnClose(This->advise_holder); return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 498cedc..aeeef31 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -150,6 +150,7 @@ DEFINE_EXPECT(Frame_EnableModeless_TRUE); DEFINE_EXPECT(Frame_EnableModeless_FALSE); DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); +DEFINE_EXPECT(Advise_Close); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -2589,7 +2590,7 @@ static void WINAPI AdviseSink_OnSave(IAdviseSink *iface) static void WINAPI AdviseSink_OnClose(IAdviseSink *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(Advise_Close); } static const IAdviseSinkVtbl AdviseSinkVtbl = { @@ -4395,6 +4396,7 @@ static void test_HTMLDocument_StreamLoad(void) { IOleObject *oleobj; IUnknown *unk; + DWORD conn; HRESULT hres; ULONG ref; @@ -4411,6 +4413,9 @@ static void test_HTMLDocument_StreamLoad(void) hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_readyState(unk); test_IsDirty(unk, S_FALSE); test_ConnectionPointContainer(unk); @@ -4427,7 +4432,9 @@ static void test_HTMLDocument_StreamLoad(void) test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); + SET_EXPECT(Advise_Close); test_Close(unk, FALSE); + CHECK_CALLED(Advise_Close); test_IsDirty(unk, S_FALSE); if(view) { @@ -4444,6 +4451,7 @@ static void test_HTMLDocument_StreamInitNew(void) { IOleObject *oleobj; IUnknown *unk; + DWORD conn; HRESULT hres; ULONG ref; @@ -4460,6 +4468,9 @@ static void test_HTMLDocument_StreamInitNew(void) hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_readyState(unk); test_IsDirty(unk, S_FALSE); test_ConnectionPointContainer(unk); @@ -4476,7 +4487,9 @@ static void test_HTMLDocument_StreamInitNew(void) test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); + SET_EXPECT(Advise_Close); test_Close(unk, FALSE); + CHECK_CALLED(Advise_Close); test_IsDirty(unk, S_FALSE); if(view) { @@ -4520,6 +4533,7 @@ static void test_editing_mode(BOOL do_load) { IUnknown *unk; IOleObject *oleobj; + DWORD conn; HRESULT hres; ULONG ref; @@ -4536,6 +4550,9 @@ static void test_editing_mode(BOOL do_load) hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_readyState(unk); test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); @@ -4586,7 +4603,9 @@ static void test_editing_mode(BOOL do_load) test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); + SET_EXPECT(Advise_Close); test_Close(unk, FALSE); + CHECK_CALLED(Advise_Close); if(view) { IOleDocumentView_Release(view);

1 0

Piotr Caban : mshtml: Added OleObject_Unadvise implementation.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 0aca61c5c36b510f06ad0bbdf17b1743584860ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aca61c5c36b510f06ad0bbdf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:52:54 2009 +0100 mshtml: Added OleObject_Unadvise implementation. --- dlls/mshtml/oleobj.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 7ae03a4..fd396b1 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -402,8 +402,12 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { HTMLDocument *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->advise_holder) + return OLE_E_NOCONNECTION; + + return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise)

1 0

Piotr Caban : mshtml: Added OleObject_Advise implementation.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: bbfa604dc04990cdbaf89ccc9ea958a979f7790e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfa604dc04990cdbaf89ccc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:52:28 2009 +0100 mshtml: Added OleObject_Advise implementation. --- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/oleobj.c | 19 +++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 291bba5..b52005b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1951,6 +1951,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) This->basedoc.window->doc_obj = NULL; IHTMLWindow2_Release(HTMLWINDOW2(This->basedoc.window)); } + if(This->basedoc.advise_holder) + IOleAdviseHolder_Release(This->basedoc.advise_holder); if(This->client) IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4e02ce6..bf539d4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -338,6 +338,8 @@ struct HTMLDocument { ConnectionPoint cp_htmldocevents; ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; + + IOleAdviseHolder *advise_holder; }; static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e9cb204..7ae03a4 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -380,8 +380,23 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) { HTMLDocument *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, pAdvSink, pdwConnection); + + if(!pdwConnection) + return E_INVALIDARG; + + if(!pAdvSink) { + *pdwConnection = 0; + return E_INVALIDARG; + } + + if(!This->advise_holder) { + CreateOleAdviseHolder(&This->advise_holder); + if(!This->advise_holder) + return E_OUTOFMEMORY; + } + + return IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)

1 0

Alexandre Julliard : aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools .
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: a91fb219a99f236a576454205660d77c5908e27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91fb219a99f236a576454205… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 15:36:09 2009 +0100 aclocal.m4: Perform a more exhaustive search of the possible naming combinations for Mingw tools. --- aclocal.m4 | 15 ++++++++++----- configure | 30 +++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f7beb5d..ce3941e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,11 +140,16 @@ dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], -[AC_CHECK_PROGS([$1], - m4_foreach([ac_wine_prefix], - [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32], - [ac_wine_prefix-$2 ]), - [$3],[$4])]) +[case "$host_cpu" in + i[[3456789]]86*) + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + x86_64) + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;; + *) + ac_prefix_list="" ;; +esac +AC_CHECK_PROGS([$1],[$ac_prefix_list],[$3],[$4])]) dnl **** Create nonexistent directories from config.status **** diff --git a/configure b/configure index 4f52528..785c7b1 100755 --- a/configure +++ b/configure @@ -6948,7 +6948,15 @@ fi if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then - for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-pc-mingw32-gcc + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6991,7 +6999,15 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool i686-pc-mingw32-dlltool + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-dlltool i586-pc-mingw32-dlltool i486-pc-mingw32-dlltool i386-pc-mingw32-dlltool i686-mingw32msvc-dlltool i586-mingw32msvc-dlltool i486-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-dlltool x86_64-w64-mingw32-dlltool " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7034,7 +7050,15 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar i686-pc-mingw32-ar + case "$host_cpu" in + i[3456789]86*) + ac_prefix_list="i686-pc-mingw32-ar i586-pc-mingw32-ar i486-pc-mingw32-ar i386-pc-mingw32-ar i686-mingw32msvc-ar i586-mingw32msvc-ar i486-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar " ;; + x86_64) + ac_prefix_list="x86_64-pc-mingw32-ar x86_64-w64-mingw32-ar " ;; + *) + ac_prefix_list="" ;; +esac +for ac_prog in $ac_prefix_list do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0