March 2010 - Wine-commits - list.winehq.org

Jörg Höhle : winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 9079109a4531359d4023bbbfc80d9a6c77696383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9079109a4531359d4023bbbfc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 13 22:47:08 2010 +0100 winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode. --- dlls/user32/input.c | 6 ++-- dlls/user32/message.c | 2 +- dlls/winex11.drv/keyboard.c | 63 +++++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9079109a4531359d4023b…

1 0

André Hentschel : oleaut32: Fix localized date parsing .
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 71f24431b987d70053063a9f206913e7fff53edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f24431b987d70053063a9f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 19:57:27 2010 +0100 oleaut32: Fix localized date parsing. --- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0c23a11..6742fce 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3435,10 +3435,10 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ - /* test a none english data string */ + /* test a non-english data string */ DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); - DFS("02.01.1970"); todo_wine EXPECT_DBL(25570.0); + DFS("02.01.1970"); EXPECT_DBL(25570.0); DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6d604f3..580209b 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7607,6 +7607,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd break; case 0x3: /* TTT TTTDD TTTDDD */ + if (iDate && dp.dwCount == 3) + { + /* DDD */ + if ((dp.dwFlags[0] & (DP_AM|DP_PM)) || (dp.dwFlags[1] & (DP_AM|DP_PM)) || + (dp.dwFlags[2] & (DP_AM|DP_PM))) + hRet = DISP_E_TYPEMISMATCH; + break; + } if (dp.dwCount > 4 && ((dp.dwFlags[3] & (DP_AM|DP_PM)) || (dp.dwFlags[4] & (DP_AM|DP_PM)) || (dp.dwFlags[5] & (DP_AM|DP_PM))))

1 0

André Hentschel : oleaut32: Fix localized date and time parsing.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: a360c98187856039b0c5365997d6994f95eb4d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360c98187856039b0c536599… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 19:59:16 2010 +0100 oleaut32: Fix localized date and time parsing. --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6742fce..79b6b93 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3439,7 +3439,7 @@ static void test_VarDateFromStr(void) DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); DFS("02.01.1970"); EXPECT_DBL(25570.0); - DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); + DFS("02.01.1970 00:00:00"); EXPECT_DBL(25570.0); } static void test_VarDateCopy(void) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 580209b..da1288d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7707,6 +7707,13 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount -= 3; break; + case 0x1B: /* localized DDDTTT */ + if (!iDate) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } + /* .. fall through .. */ case 0x18: /* DDDTTT */ if ((dp.dwFlags[0] & (DP_AM|DP_PM)) || (dp.dwFlags[1] & (DP_AM|DP_PM)) || (dp.dwFlags[2] & (DP_AM|DP_PM)))

1 0

Jeremy White : Switch the information to the new Slackware package maintainer.
by Jeremy Newman 04 Mar '10

04 Mar '10

Module: website Branch: master Commit: af0b581afe60c6ec55344324a1d9de0768e7c2b3 URL: http://source.winehq.org/git/website.git/?a=commit;h=af0b581afe60c6ec553443… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Mar 3 15:49:34 2010 -0600 Switch the information to the new Slackware package maintainer. --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/pl/download.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7730baf..6642219 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -128,7 +128,7 @@ erbeten hat, dass sie die Wine-Website hosten. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binär .tgz für Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download.template b/templates/en/download.template index 30bbacd..e58e5e1 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -115,7 +115,7 @@ requested in exchange for hosting the Wine web site. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Download Slackware packages</a> - binary .tgz for Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pl/download.template b/templates/pl/download.template index 6fa59be..a96e606 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -112,7 +112,7 @@ </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binarne .tgz dla Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Jacek Caban : mshtml: Properly handle IHlinkFrame::Navigate result.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 34944c89dd8060e4f4717246f5cbf3e3338533e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34944c89dd8060e4f4717246f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:54:44 2010 +0100 mshtml: Properly handle IHlinkFrame::Navigate result. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 24 +++++++++++++++++------- dlls/mshtml/nsio.c | 5 +++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index bf6561c..95ae5ae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -709,7 +709,7 @@ HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 941dc23..16d38a1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1253,7 +1253,7 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, - nsIInputStream *post_data_stream, DWORD hlnf) + nsIInputStream *post_data_stream, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; nsChannelBSC *callback; @@ -1263,16 +1263,18 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, IHlink *hlink; HRESULT hres; + *cancel = FALSE; + hres = IOleClientSite_QueryInterface(doc->doc_obj->client, &IID_IServiceProvider, (void**)&sp); if(FAILED(hres)) - return hres; + return S_OK; hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hlink_frame); IServiceProvider_Release(sp); if(FAILED(hres)) - return hres; + return S_OK; hres = create_channelbsc(NULL, NULL, NULL, 0, &callback); if(FAILED(hres)) { @@ -1304,8 +1306,9 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, } hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(&callback->bsc), hlink); - IMoniker_Release(mon); + *cancel = hres == S_OK; + hres = S_OK; } IHlinkFrame_Release(hlink_frame); @@ -1339,16 +1342,23 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, url, &translated_url); if(hres == S_OK) { + TRACE("%08x %s -> %s\n", hres, debugstr_w(url), debugstr_w(translated_url)); strcpyW(url, translated_url); CoTaskMemFree(translated_url); } } if(window->doc_obj && window == window->doc_obj->basedoc.window) { - hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0); - if(SUCCEEDED(hres)) + BOOL cancel; + + hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0, &cancel); + if(FAILED(hres)) + return hres; + + if(cancel) { + TRACE("Navigation handled by hlink frame\n"); return S_OK; - TRACE("hlink_frame_navigate failed: %08x\n", hres); + } } hres = create_doc_uri(window, url, &uri); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b95b9c1..f4e6f4b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -131,6 +131,7 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) { HTMLDocumentObj *doc = container->doc; DWORD hlnf = 0; + BOOL cancel; HRESULT hres; if(!doc) { @@ -148,8 +149,8 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf); - return hres != S_OK; + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf, &cancel); + return FAILED(hres) || cancel; } HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags)

1 0

Jacek Caban : mshtml: Load data from moniker in IPersistStreamInit::InitNew .
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 18423e8dd9c39f311dd8494c9cdfac2ed29fd387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18423e8dd9c39f311dd8494c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:55:00 2010 +0100 mshtml: Load data from moniker in IPersistStreamInit::InitNew. --- dlls/mshtml/persist.c | 24 ++---------------------- 1 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d903ac7..18013d3 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -683,44 +683,24 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) { HTMLDocument *This = PERSTRINIT_THIS(iface); IMoniker *mon; - HGLOBAL body; - LPSTREAM stream; HRESULT hres; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - static const WCHAR html_bodyW[] = {'<','H','T','M','L','>','<','/','H','T','M','L','>',0}; TRACE("(%p)\n", This); - body = GlobalAlloc(0, sizeof(html_bodyW)); - if(!body) - return E_OUTOFMEMORY; - memcpy(body, html_bodyW, sizeof(html_bodyW)); - hres = CreateURLMoniker(NULL, about_blankW, &mon); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); - GlobalFree(body); return hres; } hres = set_moniker(This, mon, NULL, FALSE); IMoniker_Release(mon); - if(FAILED(hres)) { - GlobalFree(body); - return hres; - } - - hres = CreateStreamOnHGlobal(body, TRUE, &stream); - if(FAILED(hres)) { - GlobalFree(body); + if(FAILED(hres)) return hres; - } - hres = channelbsc_load_stream(This->window->bscallback, stream); - - IStream_Release(stream); - return hres; + return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, NULL); } #undef PERSTRINIT_THIS

1 0

Jacek Caban : mshtml: Moved SZ_HTML_CLIENTSITE_OBJECTPARAM handling to IPersistMoniker::Load.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 2a092e212ba6ea715e5d68cc2c276575dc8fdb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a092e212ba6ea715e5d68cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:55:24 2010 +0100 mshtml: Moved SZ_HTML_CLIENTSITE_OBJECTPARAM handling to IPersistMoniker::Load. --- dlls/mshtml/persist.c | 59 ++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 18013d3..714e955 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -175,36 +175,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO nsWineURI *nsuri; HRESULT hres; - if(pibc) { - IUnknown *unk = NULL; - - /* FIXME: - * Use params: - * "__PrecreatedObject" - * "BIND_CONTEXT_PARAM" - * "__HTMLLOADOPTIONS" - * "__DWNBINDINFO" - * "URL Context" - * "CBinding Context" - * "_ITransData_Object_" - * "_EnumFORMATETC_" - */ - - IBindCtx_GetObjectParam(pibc, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, &unk); - if(unk) { - IOleClientSite *client = NULL; - - hres = IUnknown_QueryInterface(unk, &IID_IOleClientSite, (void**)&client); - if(SUCCEEDED(hres)) { - TRACE("Got client site %p\n", client); - IOleObject_SetClientSite(OLEOBJ(This), client); - IOleClientSite_Release(client); - } - - IUnknown_Release(unk); - } - } - set_ready_state(This->window, READYSTATE_LOADING); update_doc(This, UPDATE_TITLE); @@ -376,6 +346,35 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); + if(pibc) { + IUnknown *unk = NULL; + + /* FIXME: + * Use params: + * "__PrecreatedObject" + * "BIND_CONTEXT_PARAM" + * "__HTMLLOADOPTIONS" + * "__DWNBINDINFO" + * "URL Context" + * "_ITransData_Object_" + * "_EnumFORMATETC_" + */ + + IBindCtx_GetObjectParam(pibc, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, &unk); + if(unk) { + IOleClientSite *client = NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IOleClientSite, (void**)&client); + if(SUCCEEDED(hres)) { + TRACE("Got client site %p\n", client); + IOleObject_SetClientSite(OLEOBJ(This), client); + IOleClientSite_Release(client); + } + + IUnknown_Release(unk); + } + } + hres = set_moniker(This, pimkName, pibc, TRUE); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Call OnViewChange in set_downloading_proc.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 4ae97b169dbad3cbceecf3c1c630f4f468012200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae97b169dbad3cbceecf3c1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:55:43 2010 +0100 mshtml: Call OnViewChange in set_downloading_proc. --- dlls/mshtml/persist.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 714e955..49a3835 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -155,6 +155,9 @@ static void set_downloading_proc(task_t *_task) doc->download_state = 1; } + if(doc->view_sink) + IAdviseSink_OnViewChange(doc->view_sink, DVASPECT_CONTENT, -1); + if(doc->hostui) { IDropTarget *drop_target = NULL;

1 0

Jacek Caban : mshtml: Correctly handle document with already loaded moniker in set_moniker.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 8dd7b39603d8051af782276398a77aad4702eb4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd7b39603d8051af78227639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:56:01 2010 +0100 mshtml: Correctly handle document with already loaded moniker in set_moniker. --- dlls/mshtml/persist.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 49a3835..540b563 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -171,18 +171,13 @@ static void set_downloading_proc(task_t *_task) static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL set_download) { + download_proc_task_t *download_task; nsChannelBSC *bscallback; - LPOLESTR url = NULL; docobj_task_t *task; - download_proc_task_t *download_task; nsWineURI *nsuri; + LPOLESTR url; HRESULT hres; - set_ready_state(This->window, READYSTATE_LOADING); - update_doc(This, UPDATE_TITLE); - - HTMLDocument_LockContainer(This->doc_obj, TRUE); - hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); @@ -191,11 +186,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO TRACE("got url: %s\n", debugstr_w(url)); - set_current_mon(This->window, mon); - if(This->doc_obj->client) { VARIANT silent, offline; - IOleCommandTarget *cmdtrg = NULL; hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { @@ -213,6 +205,19 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO else if(V_BOOL(&silent)) FIXME("offline == true\n"); } + } + + if(This->window->mon) { + update_doc(This, UPDATE_TITLE|UPDATE_UI); + }else { + update_doc(This, UPDATE_TITLE); + set_current_mon(This->window, mon); + } + + set_ready_state(This->window, READYSTATE_LOADING); + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg = NULL; hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -244,6 +249,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(FAILED(hres)) return hres; + HTMLDocument_LockContainer(This->doc_obj, TRUE); + if(This->doc_obj->frame) { task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj;

1 0

Jacek Caban : mshtml: Added IHTMLPrivateWindow:: SuperNavigate implementation.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 9fbc3b6061f75380207da061e605cc9d5784420d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbc3b6061f75380207da061e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:56:21 2010 +0100 mshtml: Added IHTMLPrivateWindow::SuperNavigate implementation. --- dlls/mshtml/htmlwindow.c | 84 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 42 ++++++++++++++------- 3 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1df97b9..491625e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2010 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmdid.h" +#include "shlguid.h" #include "wine/debug.h" @@ -1672,9 +1673,84 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR arg4, VARIANT *post_data_var, VARIANT *headers_var, ULONG flags) { HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); - FIXME("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), - debugstr_w(arg4), debugstr_variant(post_data_var), debugstr_variant(headers_var), flags); - return E_NOTIMPL; + DWORD post_data_size = 0; + BYTE *post_data = NULL; + WCHAR *headers = NULL; + nsChannelBSC *bsc; + IMoniker *mon; + BSTR new_url; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), debugstr_w(arg4), + debugstr_variant(post_data_var), debugstr_variant(headers_var), flags); + + new_url = url; + if(This->doc_obj->hostui) { + OLECHAR *translated_url = NULL; + + hres = IDocHostUIHandler_TranslateUrl(This->doc_obj->hostui, 0, url, &translated_url); + if(hres == S_OK && translated_url) { + new_url = SysAllocString(translated_url); + CoTaskMemFree(translated_url); + } + } + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT in, out; + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = new_url; + V_VT(&out) = VT_BOOL; + V_BOOL(&out) = VARIANT_TRUE; + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &in, &out); + IOleCommandTarget_Release(cmdtrg); + if(SUCCEEDED(hres)) + VariantClear(&out); + } + } + + /* FIXME: Why not set_ready_state? */ + This->readystate = READYSTATE_UNINITIALIZED; + + hres = CreateURLMoniker(NULL, new_url, &mon); + if(new_url != url) + SysFreeString(new_url); + if(FAILED(hres)) + return hres; + + if(post_data_var) { + if(V_VT(post_data_var) == (VT_ARRAY|VT_UI1)) { + SafeArrayAccessData(V_ARRAY(post_data_var), (void**)&post_data); + post_data_size = V_ARRAY(post_data_var)->rgsabound[0].cElements; + } + } + + if(headers_var && V_VT(headers_var) != VT_EMPTY && V_VT(headers_var) != VT_ERROR) { + if(V_VT(headers_var) != VT_BSTR) + return E_INVALIDARG; + + headers = V_BSTR(headers_var); + } + + hres = create_channelbsc(mon, headers, post_data, post_data_size, &bsc); + if(post_data) + SafeArrayUnaccessData(V_ARRAY(post_data_var)); + if(FAILED(hres)) { + IMoniker_Release(mon); + return hres; + } + + hres = set_moniker(&This->doc_obj->basedoc, mon, NULL, bsc, TRUE); + if(SUCCEEDED(hres)) + hres = async_start_doc_binding(This, bsc); + + IUnknown_Release((IUnknown*)bsc); + IMoniker_Release(mon); + return hres; } static HRESULT WINAPI HTMLPrivateWindow_GetPendingUrl(IHTMLPrivateWindow *iface, BSTR *url) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 95ae5ae..30d1edb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -712,6 +712,7 @@ HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); +HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 540b563..720a58e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -169,11 +169,11 @@ static void set_downloading_proc(task_t *_task) } } -static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL set_download) +HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) { - download_proc_task_t *download_task; nsChannelBSC *bscallback; docobj_task_t *task; + download_proc_task_t *download_task; nsWineURI *nsuri; LPOLESTR url; HRESULT hres; @@ -222,11 +222,20 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + VARIANT var, out; + + if(!async_bsc) { + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + }else { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)HTMLWINDOW2(This->window); + V_VT(&out) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); + if(SUCCEEDED(hres)) + VariantClear(&out); + } IOleCommandTarget_Release(cmdtrg); } @@ -237,15 +246,20 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(FAILED(hres)) return hres; - hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); - if(FAILED(hres)) - return hres; + if(async_bsc) { + bscallback = async_bsc; + }else { + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); + if(FAILED(hres)) + return hres; + } hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) set_window_bscallback(This->window, bscallback); - IUnknown_Release((IUnknown*)bscallback); + if(bscallback != async_bsc) + IUnknown_Release((IUnknown*)bscallback); if(FAILED(hres)) return hres; @@ -385,7 +399,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } - hres = set_moniker(This, pimkName, pibc, TRUE); + hres = set_moniker(This, pimkName, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -646,7 +660,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } - hres = set_moniker(This, mon, NULL, TRUE); + hres = set_moniker(This, mon, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -704,7 +718,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) return hres; } - hres = set_moniker(This, mon, NULL, FALSE); + hres = set_moniker(This, mon, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0