January 2012 - Wine-Commits

André Hentschel : winedev: Cleanup multimedia documentation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: docs Branch: master Commit: 9ffbd7c28b48f76a6630f613398865fb02a9479a URL: http://source.winehq.org/git/docs.git/?a=commit;h=9ffbd7c28b48f76a6630f6133… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 23:02:50 2012 +0100 winedev: Cleanup multimedia documentation. --- en/winedev-multimedia.sgml | 168 ++------------------------------------------ 1 files changed, 6 insertions(+), 162 deletions(-) diff --git a/en/winedev-multimedia.sgml b/en/winedev-multimedia.sgml index 29936f7..3ba4de3 100644 --- a/en/winedev-multimedia.sgml +++ b/en/winedev-multimedia.sgml @@ -227,8 +227,8 @@ Kernel space | Client applications <para> The low level drivers abstract the hardware specific features - from the rest of the multimedia code. Those are implemented with a - well defined set of APIs, as windows do. + from the rest of the multimedia code. Those are implemented on top + of mmdevapi, as new versions of windows do. </para> <para> @@ -267,49 +267,6 @@ Kernel space | Client applications <sect2> <title>Hardware-bound low level drivers</title> - - <para> - Each low lever driver has to implement at least one of the - following functionality, through the named function: - <itemizedlist> - <listitem> - <para> - Waveform audio: out for playback, and in for - recording. MMSYSTEM and WINMM call the real low level - audio driver using the driver's - <function>wodMessage</function> and - <function>widMessage</function> functions which handle - the different requests. - </para> - </listitem> - <listitem> - <para> - MIDI (Musical Instrument Digital Interface): out for - playback, and in for recording. MMSYSTEM and WINMM - call the low level driver functions using the driver's - <function>midMessage</function> and the - <function>modMessage</function> functions. - </para> - </listitem> - <listitem> - <para> - Mixer: this allows setting the volume for each one of - the other functionnality (and also some specific - attributes, like left/right balance for stereo - streams...). MMSYSTEM and WINMM call the low level - driver functions using the - <function>mxdMessage</function> function. - </para> - </listitem> - <listitem> - <para> - Aux: this is the predecessor of the mixer - functionnality (introduced in Win 95). Its usage has - been deprecated in favor of mixer interfaces. - </para> - </listitem> - </itemizedlist> - </para> <para> Wine currently supports the following (kernel) multimedia @@ -323,7 +280,7 @@ Kernel space | Client applications Technologies</ulink>. The presence of this driver is checked by configure (depends on the <sys/soundcard.h> file). Source code resides in - <filename>dlls/winmm/wineoss</filename>. + <filename>dlls/wineoss.drv</filename>. </para> </listitem> <listitem> @@ -331,131 +288,18 @@ Kernel space | Client applications Advanced Linux Sound Architecture (<ulink url="http://www.alsa-project.org/">ALSA</ulink>) as supplied in the Linux kernel. Source code resides in - <filename>dlls/winmm/winealsa</filename>. - </para> - </listitem> - <listitem> - <para> - Analog RealTime Synthetizer (<ulink - url="http://www.arts-project.org/">aRts</ulink>): a - network server (and virtual mixer) used in the KDE project. - </para> - </listitem> - <listitem> - <para> - Enlightenment Sound Daemon (<ulink - url="http://www.tux.org/~ricdude/EsounD.html">EsounD</ulink>): - a network server used in the GNOME project. - </para> - </listitem> - <listitem> - <para> - Network Audio Server (<ulink - url="http://radscan.com/nas.html">NAS</ulink>): an - audio server. + <filename>dlls/winealsa.drv</filename>. </para> </listitem> <listitem> <para> - <ulink - url="http://jackit.sourceforge.net/">Jack</ulink>: a - low latency audio server. - </para> - </listitem> - <listitem> - <para> - AudioIO: the native Solaris audio interface. + Core Audio as introduced in Mac OS X 10.3. Source code resides in + <filename>dlls/winecoreaudio.drv</filename>. </para> </listitem> </itemizedlist> </para> - <para> - The supported functionnalities per driver is as follows - (this table lists the available features of the products, - not exactly what's actually implemented on Wine): - <table frame="all"> - <title>Wine multimedia drivers' functionalities</title> - <tgroup cols="6" align="left" colsep="1" rowsep="1"> - <thead> - <row> - <entry>Driver</entry> - <entry>Wave Out</entry> - <entry>Wave In</entry> - <entry>Midi Out</entry> - <entry>Midi In</entry> - <entry>Mixer (and Aux)</entry> - </row> - </thead> - <tbody> - <row> - <entry>OSS</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - </row> - <row> - <entry>ALSA</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>Yes</entry> - </row> - <row> - <entry>aRts</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>No</entry> - <entry>No</entry> - <entry>Yes</entry> - </row> - <row> - <entry>ESD</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>No</entry> - <entry>No</entry> - <entry>No</entry> - </row> - <row> - <entry>NAS</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>No</entry> - <entry>No</entry> - <entry>Yes</entry> - </row> - <row> - <entry>AudioIO</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>No</entry> - <entry>No</entry> - <entry>Yes</entry> - </row> - <row> - <entry>Jack</entry> - <entry>Yes</entry> - <entry>Yes</entry> - <entry>No</entry> - <entry>No</entry> - <entry>Yes</entry> - </row> - </tbody> - </tgroup> - </table> - </para> - - <para> - Lots of listed drivers won't support Midi (in a short time) - because the exposed "Un*x" native interfaces don't. This - would require using some kind as software synthesis (as - Timidity), but we cannot incorporate as it's GPL'ed. - </para> - </sect2> <sect2>

1 0

André Hentschel : wineusr: Rewrite WineCfg Graphics tab documentation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: docs Branch: master Commit: 827edebbeed6e7624afff36f235d1d8c41533e82 URL: http://source.winehq.org/git/docs.git/?a=commit;h=827edebbeed6e7624afff36f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 23:02:26 2012 +0100 wineusr: Rewrite WineCfg Graphics tab documentation. --- en/wineusr-configuring.sgml | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 02d30e6..2d3fc9c 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -244,19 +244,11 @@ can configure. For most people the defaults are fine. </para> <para> - The first few settings primarily affect games and are somewhat + The first setting primarily affect games and is somewhat self-explanatory. You can prevent the mouse from leaving the - window of a DirectX program (i.e. a game.) and the default is - to have that box checked. There's lots of - reasons you might want to do that, not the least of which - includes it's easier to play the game if the cursor is - confined to a smaller area. The other reason to turn this - option on is for more precise control of the mouse - Wine - warps the location of the mouse to mimic the way Windows - works. Similarly, "desktop double buffering" allows for - smoother updates to the screen, which games can benefit from, - and the default is to leave it turned on. The tradeoff is - increased memory use. + window of a full-screen program (i.e. a game.) and the default + is to not have that box checked. That is mostly needed when using + a virtual desktop. </para> <para> You may find it helpful to <emphasis>Emulate a virtual @@ -266,17 +258,7 @@ (possibly unsuccessfully) the screen resolution. Confining them to a window can allow for more control over them at the possible expense of decreased usability. Sizes you might want to try are - 640x480 (the default) or 800x600. - </para> - <para> - Finally, you can configure some Direct3D settings. For the - most part these settings are detected automatically, but you - can force them to behave in a specific manner. Some games - attempt to probe the underlying system to see if it supports - specific features. By turning these off Wine won't report - the ability to render games in a certain way. It may lead - to the game running faster at the expense of the quality of - the graphics or the game may not run at all. + 800x600 (the default) or 1024x768. </para> </sect2> <sect2>

1 0

André Hentschel : winelib: Remove empty wmc section.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: docs Branch: master Commit: 00c23b838f255f56fa1ca143a8cd55b4b5ce7e73 URL: http://source.winehq.org/git/docs.git/?a=commit;h=00c23b838f255f56fa1ca143a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:15:13 2012 +0100 winelib: Remove empty wmc section. --- en/winelib-toolkit.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index c162a0a..1af66ac 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -419,13 +419,6 @@ WRCFLAGS = -r -L </para> </sect1> - <sect1 id="wmc"> - <title id="wmc.title">Compiling message files: WMC</title> - <para> - how does one use it??? - </para> - </sect1> - <sect1 id="spec-file"> <title id="spec-file.title">The Spec file</title>

1 0

André Hentschel : wineusr: Rewrite WineCfg Audio tab documentation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: docs Branch: master Commit: 5b3b3d20519bebf071988541dee68d6899cf8c1c URL: http://source.winehq.org/git/docs.git/?a=commit;h=5b3b3d20519bebf071988541d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 23:01:51 2012 +0100 wineusr: Rewrite WineCfg Audio tab documentation. --- en/wineusr-configuring.sgml | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 56f7923..02d30e6 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -334,23 +334,14 @@ <sect2> <title>Audio Settings</title> <para> - Wine can work with quite a few different audio subsystems - which you can choose under the "Audio" tab. winecfg figures out all - available drivers for you, but you can manually select which driver - will be used. Older - Linux distributions using the 2.4 kernel or earlier typically - use the "OSS" driver. Usually 2.6 kernels have switched to "ALSA". - The "aRts" driver was recently deactivated due to the general lack - of maintenance of the "aRts" subsystem. - If you're using GNOME you can probably use EsounD. The OSS and ALSA - audio drivers get the most testing, so it's recommended you stick - with them if possible. - If you need to use "Jack", "NAS" or "CoreAudio" you probably already know why. + Wine can work with quite a few different audio subsystems. + You can see the selected driver that Wine figures out for you + under the "Audio" tab. </para> <para> - DirectSound settings are primarily used by games. You can - choose what level of hardware acceleration you'd like, but - for most people "Full" is fine. + You can manually select which device will be used for + Output, Input, Voice output and Voice input. For example you can choose + the digital output of your sound device instead of the analog one. </para> </sect2> <sect2>

1 0

Jacek Caban : mshtml: Better stub for ITravelLogClient::FindWindowByIndex.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 50a86f5f2564219f53495f79b6fa72874e098306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a86f5f2564219f53495f79b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:10:39 2012 +0100 mshtml: Better stub for ITravelLogClient::FindWindowByIndex. --- dlls/mshtml/htmlwindow.c | 7 +++++-- dlls/mshtml/tests/htmldoc.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7848b76..1d6ed5d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1977,8 +1977,11 @@ static ULONG WINAPI TravelLogClient_Release(ITravelLogClient *iface) static HRESULT WINAPI TravelLogClient_FindWindowByIndex(ITravelLogClient *iface, DWORD dwID, IUnknown **ppunk) { HTMLWindow *This = impl_from_ITravelLogClient(iface); - FIXME("(%p)->(%d %p)\n", This, dwID, ppunk); - return E_NOTIMPL; + + FIXME("(%p)->(%d %p) semi-stub\n", This, dwID, ppunk); + + *ppunk = NULL; + return E_FAIL; } static HRESULT WINAPI TravelLogClient_GetWindowData(ITravelLogClient *iface, IStream *pStream, LPWINDOWDATA pWinData) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0177c16..55e3ac7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6239,6 +6239,38 @@ static void test_target_container(IHTMLDocument2 *doc) IOleContainer_Release(doc_ole_container); } +static void test_travellog(IHTMLDocument2 *doc) +{ + ITravelLogClient *travellog_client; + IHTMLWindow2 *window, *top_window; + IUnknown *unk; + HRESULT hres; + + window = NULL; + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(window != NULL, "window = NULL\n"); + + hres = IHTMLWindow2_get_top(window, &top_window); + IHTMLWindow2_Release(window); + ok(hres == S_OK, "get_top failed: %08x\n", hres); + + hres = IHTMLWindow2_QueryInterface(top_window, &IID_ITravelLogClient, (void**)&travellog_client); + IHTMLWindow2_Release(top_window); + if(hres == E_NOINTERFACE) { + win_skip("ITravelLogClient not supported\n"); + return; + } + ok(hres == S_OK, "Could not get ITraveLogClient iface: %08x\n", hres); + + unk = (void*)0xdeadbeef; + hres = ITravelLogClient_FindWindowByIndex(travellog_client, 0, &unk); + ok(hres == E_FAIL, "FindWindowByIndex failed: %08x\n", hres); + ok(!unk, "unk != NULL\n"); + + ITravelLogClient_Release(travellog_client); +} + static void test_StreamLoad(IHTMLDocument2 *doc) { IPersistStreamInit *init; @@ -6613,10 +6645,13 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); + test_travellog(doc); nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ - if(support_wbapp) + if(support_wbapp) { test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE); + test_travellog(doc); + } test_put_href(doc, FALSE, NULL, "javascript:external&&undefined", TRUE, FALSE); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE);

1 0

Jacek Caban : ieframe: Added very beginning IWebBrowser2:: GoBack implementation.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 51c141ab4cd839b98cde41cc0d746f3fa69ff35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c141ab4cd839b98cde41cc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:16:10 2012 +0100 ieframe: Added very beginning IWebBrowser2::GoBack implementation. --- dlls/ieframe/dochost.c | 52 +++++++++++++++++++++++++++++++++++++++++++- dlls/ieframe/ieframe.h | 10 ++++++++ dlls/ieframe/navigate.c | 23 +++++++++++++++++++ dlls/ieframe/webbrowser.c | 4 +- 4 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index d59c335..6eb27ec 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -30,6 +30,9 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); #define DOCHOST_DOCCANNAVIGATE 0 +/* Undocumented notification, see mshtml tests */ +#define CMDID_EXPLORER_UPDATEHISTORY 38 + static ATOM doc_view_atom = 0; void push_dochost_task(DocHost *This, task_header_t *task, task_proc_t proc, task_destr_t destr, BOOL send) @@ -324,6 +327,39 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l return DefWindowProcW(hwnd, msg, wParam, lParam); } +static void update_travellog(DocHost *This) +{ + travellog_entry_t *new_entry; + + if(!This->travellog) { + This->travellog = heap_alloc(4 * sizeof(*This->travellog)); + if(!This->travellog) + return; + + This->travellog_size = 4; + }else if(This->travellog_size < This->travellog_position+1) { + travellog_entry_t *new_travellog; + + new_travellog = heap_realloc(This->travellog, This->travellog_size*2); + if(!new_travellog) + return; + + This->travellog = new_travellog; + This->travellog_size *= 2; + } + + while(This->travellog_length > This->travellog_position) + heap_free(This->travellog[--This->travellog_length].url); + + new_entry = This->travellog + This->travellog_position; + + new_entry->url = heap_strdupW(This->url); + if(!new_entry->url) + return; + + This->travellog_position++; +} + void create_doc_view_hwnd(DocHost *This) { RECT rect; @@ -550,12 +586,20 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) { + switch(nCmdID) { + case CMDID_EXPLORER_UPDATEHISTORY: + update_travellog(This); + break; + default: + FIXME("Unimplemented cmd %d of CGID_Explorer\n", nCmdID); + } + } + FIXME("Unimplemented group %s\n", debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; } -#undef impl_from_IOleCommandTarget - static const IOleCommandTargetVtbl OleCommandTargetVtbl = { ClOleCommandTarget_QueryInterface, ClOleCommandTarget_AddRef, @@ -899,5 +943,9 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); + while(This->travellog_length) + heap_free(This->travellog[--This->travellog_length].url); + heap_free(This->travellog); + heap_free(This->url); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 60a65fb..2953841 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -94,6 +94,10 @@ typedef struct { DocHost *doc_host; } NewWindowManager; +typedef struct { + WCHAR *url; +} travellog_entry_t; + typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); @@ -148,6 +152,11 @@ struct DocHost { ShellBrowser *browser_service; + travellog_entry_t *travellog; + unsigned travellog_size; + unsigned travellog_length; + unsigned travellog_position; + ConnectionPointContainer cps; IEHTMLWindow html_window; NewWindowManager nwm; @@ -253,6 +262,7 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; +HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 8d2636b..dac1077 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -994,6 +994,29 @@ HRESULT go_home(DocHost *This) return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } +HRESULT go_back(DocHost *This) +{ + WCHAR *url; + HRESULT hres; + + if(!This->travellog_position) { + WARN("No history available\n"); + return E_FAIL; + } + + url = This->travellog[--This->travellog_position].url; + + if(This->doc_navigate) { + hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE); + }else { + FIXME("unsupported doc_navigate FALSE\n"); + hres = E_NOTIMPL; + } + + heap_free(url); + return hres; +} + HRESULT get_location_url(DocHost *This, BSTR *ret) { FIXME("semi-stub\n"); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 2d4d818..4846207 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -251,8 +251,8 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember static HRESULT WINAPI WebBrowser_GoBack(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_back(&This->doc_host); } static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface)

1 0

Jacek Caban : ieframe: Added HTTP navigation and GoBack tests.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 14b790a54897749ee1b46e2c092df08f117f0c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b790a54897749ee1b46e2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 18:26:55 2012 +0100 ieframe: Added HTTP navigation and GoBack tests. --- dlls/ieframe/tests/Makefile.in | 2 +- dlls/ieframe/tests/webbrowser.c | 132 ++++++++++++++++++++++++++++++++------- 2 files changed, 109 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14b790a54897749ee1b46…

1 0

Jacek Caban : mshtml: Added history update notification support.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 5e847895786aed617c2f8ee3d28872c377cf039b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e847895786aed617c2f8ee3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:11:06 2012 +0100 mshtml: Added history update notification support. --- dlls/mshtml/persist.c | 35 ++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/htmldoc.c | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e66cbcb..6cb7b72 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +/* Undocumented notification, see tests */ +#define CMDID_EXPLORER_UPDATEHISTORY 38 + typedef struct { task_t header; HTMLDocumentObj *doc; @@ -70,6 +73,35 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } +static void notify_travellog_update(HTMLDocumentObj *doc) +{ + IOleCommandTarget *cmdtrg; + HRESULT hres; + + if(!doc->is_webbrowser) + return; + + /* Don't notify if we were in about: page */ + if(doc->basedoc.window->uri) { + DWORD scheme; + + hres = IUri_GetScheme(doc->basedoc.window->uri, &scheme); + if(SUCCEEDED(hres) && scheme == URL_SCHEME_ABOUT) + return; + } + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT vin; + + V_VT(&vin) = VT_I4; + V_I4(&vin) = 0; + + IOleCommandTarget_Exec(cmdtrg, &CGID_Explorer, CMDID_EXPLORER_UPDATEHISTORY, 0, &vin, NULL); + IOleCommandTarget_Release(cmdtrg); + } +} + void set_current_uri(HTMLWindow *window, IUri *uri) { if(window->uri) { @@ -96,11 +128,12 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) HRESULT hres; if(This->mon) { + if(This->doc_obj) + notify_travellog_update(This->doc_obj); IMoniker_Release(This->mon); This->mon = NULL; } - if(!mon) return; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 83f44f4..3f356e4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5113,7 +5113,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(Exec_UPDATECOMMANDS); CLEAR_CALLED(Exec_SETTITLE); if(flags & DWL_EXPECT_HISTUPDATE) - todo_wine CHECK_CALLED(Exec_Explorer_38); + CHECK_CALLED(Exec_Explorer_38); todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!is_js) {

1 0

Jacek Caban : ieframe: Added InternetExplorer::GoBack implementation.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 82c826f6fc7a7684cad99501a9a5670b29188720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c826f6fc7a7684cad99501a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:16:26 2012 +0100 ieframe: Added InternetExplorer::GoBack implementation. --- dlls/ieframe/ie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 3cd54bc..c7357e9 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -142,8 +142,8 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId static HRESULT WINAPI InternetExplorer_GoBack(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_back(&This->doc_host->doc_host); } static HRESULT WINAPI InternetExplorer_GoForward(IWebBrowser2 *iface)

1 0

Jacek Caban : mshtml: Added ITravelLogClient stub implementation.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: e174d1d31bd5c77f7d4c27f74392ff1747a13a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e174d1d31bd5c77f7d4c27f74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 15:10:25 2012 +0100 mshtml: Added ITravelLogClient stub implementation. --- dlls/mshtml/htmlwindow.c | 60 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + dlls/mshtml/tests/htmldoc.c | 1 + 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 654f2e0..7848b76 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -168,6 +168,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; + }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { + TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); + *ppv = &This->ITravelLogClient_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1945,6 +1948,62 @@ static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { HTMLPrivateWindow_GetAddressBarUrl }; +static inline HTMLWindow *impl_from_ITravelLogClient(ITravelLogClient *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, ITravelLogClient_iface); +} + +static HRESULT WINAPI TravelLogClient_QueryInterface(ITravelLogClient *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI TravelLogClient_AddRef(ITravelLogClient *iface) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI TravelLogClient_Release(ITravelLogClient *iface) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI TravelLogClient_FindWindowByIndex(ITravelLogClient *iface, DWORD dwID, IUnknown **ppunk) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%d %p)\n", This, dwID, ppunk); + return E_NOTIMPL; +} + +static HRESULT WINAPI TravelLogClient_GetWindowData(ITravelLogClient *iface, IStream *pStream, LPWINDOWDATA pWinData) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%p %p)\n", This, pStream, pWinData); + return E_NOTIMPL; +} + +static HRESULT WINAPI TravelLogClient_LoadHistoryPosition(ITravelLogClient *iface, LPWSTR pszUrlLocation, DWORD dwPosition) +{ + HTMLWindow *This = impl_from_ITravelLogClient(iface); + FIXME("(%p)->(%s %d)\n", This, debugstr_w(pszUrlLocation), dwPosition); + return E_NOTIMPL; +} + +static const ITravelLogClientVtbl TravelLogClientVtbl = { + TravelLogClient_QueryInterface, + TravelLogClient_AddRef, + TravelLogClient_Release, + TravelLogClient_FindWindowByIndex, + TravelLogClient_GetWindowData, + TravelLogClient_LoadHistoryPosition +}; + static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IDispatchEx_iface); @@ -2385,6 +2444,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->IHTMLPrivateWindow_iface.lpVtbl = &HTMLPrivateWindowVtbl; window->IDispatchEx_iface.lpVtbl = &WindowDispExVtbl; window->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; + window->ITravelLogClient_iface.lpVtbl = &TravelLogClientVtbl; window->ref = 1; window->doc_obj = doc_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 684d396..90fab6d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -27,6 +27,7 @@ #include "dispex.h" #include "objsafe.h" #include "htiframe.h" +#include "tlogstg.h" #include "wine/list.h" #include "wine/unicode.h" @@ -294,6 +295,7 @@ struct HTMLWindow { IHTMLPrivateWindow IHTMLPrivateWindow_iface; IDispatchEx IDispatchEx_iface; IServiceProvider IServiceProvider_iface; + ITravelLogClient ITravelLogClient_iface; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 710b1f5..a847998 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -34,6 +34,7 @@ #include "mshtml_test.h" #include "objsafe.h" #include "htiface.h" +#include "tlogstg.h" static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); @@ -253,6 +254,7 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow3, &IID_IDispatchEx, &IID_IServiceProvider, + &IID_ITravelLogClient, NULL }; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 85fbd9b..0177c16 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -42,6 +42,7 @@ #include "perhist.h" #include "shobjidl.h" #include "htiface.h" +#include "tlogstg.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

1 0