January 2012 - Wine-commits

Jacek Caban : ieframe: Added support for SID_SHTMLWindow in WebBrowser:: QueryService.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 39c1298958dd38fe98931d9e0e2dbb98ca7a4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c1298958dd38fe98931d9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:55:52 2012 +0100 ieframe: Added support for SID_SHTMLWindow in WebBrowser::QueryService. --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++------ dlls/ieframe/webbrowser.c | 9 ++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 8c12d39..516e0b8 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2697,21 +2697,25 @@ static void test_olecmd(IUnknown *unk, BOOL loaded) static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; + IUnknown *iface; HRESULT hres; - IUnknown *ret = NULL; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; - hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&ret); + hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&iface); ok(hres == E_FAIL, "QueryService returned %08x, expected E_FAIL\n", hres); - ok(ret == NULL, "ret returned %p, expected NULL\n", ret); + ok(!iface, "QueryService returned %p, expected NULL\n", iface); if(hres == S_OK) - { - IUnknown_Release(ret); - } + IUnknown_Release(iface); + + hres = IServiceProvider_QueryService(servprov, &SID_SHTMLWindow, &IID_IHTMLWindow2, (LPVOID*)&iface); + ok(hres == S_OK, "QueryService returned %08x, expected S_OK\n", hres); + ok(iface != NULL, "QueryService returned NULL\n"); + if(hres == S_OK) + IUnknown_Release(iface); IServiceProvider_Release(servprov); } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 706600d..ff026db 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1143,16 +1143,19 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider { WebBrowser *This = impl_from_IServiceProvider(iface); - if(*ppv) - ppv = NULL; + if(IsEqualGUID(&SID_SHTMLWindow, riid)) { + TRACE("(%p)->(SID_SHTMLWindow)\n", This); + return IHTMLWindow2_QueryInterface(&This->doc_host.html_window.IHTMLWindow2_iface, riid, ppv); + } if(IsEqualGUID(&IID_IBrowserService2, riid)) { TRACE("(%p)->(IID_IBrowserService2 return E_FAIL)\n", This); + *ppv = NULL; return E_FAIL; } FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - + *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : ieframe: Store embedder iface as IWebBrowser2 in DocHost.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: a8816f51d8c5e67f88cbcf98400e1859ed1dac6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8816f51d8c5e67f88cbcf984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:05 2012 +0100 ieframe: Store embedder iface as IWebBrowser2 in DocHost. --- dlls/ieframe/client.c | 6 +++--- dlls/ieframe/dochost.c | 8 ++++---- dlls/ieframe/ieframe.h | 4 ++-- dlls/ieframe/iexplore.c | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/ieframe/shellbrowser.c | 6 +++--- dlls/ieframe/webbrowser.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index 6a567ae..dd1d9db 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -471,7 +471,7 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); - hr = IDispatch_QueryInterface(This->disp, &IID_IOleObject, (void**)&wb_obj); + hr = IWebBrowser2_QueryInterface(This->wb, &IID_IOleObject, (void**)&wb_obj); if(SUCCEEDED(hr)) { hr = IOleObject_GetClientSite(wb_obj, &clientsite); if(SUCCEEDED(hr)) { @@ -663,12 +663,12 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IShellBrowser, guidService)) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ebc5978..d59c335 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -91,7 +91,7 @@ static void notif_complete(DocHost *This, DISPID dispid) V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->disp; + V_DISPATCH(params+1) = (IDispatch*)This->wb; V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); @@ -871,13 +871,13 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_OnRequestEdit }; -void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* container) +void DocHost_Init(DocHost *This, IWebBrowser2 *wb, const IDocHostContainerVtbl* container) { This->IDocHostUIHandler2_iface.lpVtbl = &DocHostUIHandler2Vtbl; This->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; This->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; - This->disp = disp; + This->wb = wb; This->container_vtbl = container; This->ready_state = READYSTATE_UNINITIALIZED; @@ -886,7 +886,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); - ConnectionPointContainer_Init(&This->cps, (IUnknown*)disp); + ConnectionPointContainer_Init(&This->cps, (IUnknown*)wb); IEHTMLWindow_Init(This); NewWindowManager_Init(This); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b7a7b02..60a65fb 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -118,7 +118,7 @@ struct DocHost { /* Interfaces of InPlaceFrame object */ IOleInPlaceFrame IOleInPlaceFrame_iface; - IDispatch *disp; + IWebBrowser2 *wb; IDispatch *client_disp; IDocHostUIHandler *hostui; @@ -231,7 +231,7 @@ void WebBrowser_ClassInfo_Init(WebBrowser*) DECLSPEC_HIDDEN; void WebBrowser_OleObject_Destroy(WebBrowser*) DECLSPEC_HIDDEN; -void DocHost_Init(DocHost*,IDispatch*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; +void DocHost_Init(DocHost*,IWebBrowser2*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; void DocHost_Release(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Init(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Release(DocHost*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index cbab8f5..2d9bca3 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,7 +789,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) ret->doc_host->ref = 1; ret->doc_host->ie = ret; - DocHost_Init(&ret->doc_host->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); InternetExplorer_WebBrowser_Init(ret); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index a12b195..6a74d2e 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -329,7 +329,7 @@ void handle_navigation_error(DocHost* doc_host, HRESULT hres, BSTR url, IHTMLWin V_BSTR(&var_url) = url; V_VT(params+4) = VT_DISPATCH; - V_DISPATCH(params+4) = doc_host->disp; + V_DISPATCH(params+4) = (IDispatch*)doc_host->wb; call_sink(doc_host->cps.wbe2, DISPID_NAVIGATEERROR, &dispparams); SysFreeString(V_BSTR(&var_frame_name)); @@ -551,7 +551,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->disp; + V_DISPATCH(params+6) = (IDispatch*)This->wb; call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index b97f3f9..86bba68 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -706,7 +706,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->doc_host->disp; + V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); @@ -751,7 +751,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; @@ -812,7 +812,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index ff026db..2d4d818 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1252,7 +1252,7 @@ static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void ret->ref = 1; ret->version = version; - DocHost_Init(&ret->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE;

1 0

Jacek Caban : ieframe: Added semi-stub IHTMLWindow2::close implementation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: c3f681788b7dad81ce6948969d704e51251e38dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f681788b7dad81ce6948969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:26 2012 +0100 ieframe: Added semi-stub IHTMLWindow2::close implementation. --- dlls/ieframe/iehtmlwnd.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iehtmlwnd.c b/dlls/ieframe/iehtmlwnd.c index 1d1f214..04f6dfa 100644 --- a/dlls/ieframe/iehtmlwnd.c +++ b/dlls/ieframe/iehtmlwnd.c @@ -215,8 +215,13 @@ static HRESULT WINAPI IEHTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory static HRESULT WINAPI IEHTMLWindow2_close(IHTMLWindow2 *iface) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + FIXME("(%p) semi-stub\n", This); + + if(!This->doc_host->wb) + return E_UNEXPECTED; + + return IWebBrowser2_put_Visible(This->doc_host->wb, VARIANT_FALSE); } static HRESULT WINAPI IEHTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : ieframe: Added implementation of AggregatedNavigation2.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 5fb52f2db0875d3faf0c7b36757d575f48ba3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb52f2db0875d3faf0c7b367… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:41 2012 +0100 ieframe: Added implementation of AggregatedNavigation2. --- dlls/ieframe/navigate.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 6a74d2e..8d2636b 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1302,9 +1302,25 @@ static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 * IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation) { HlinkFrame *This = impl_from_ITargetFramePriv2(iface); - FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + IMoniker *mon; + HRESULT hres; + + TRACE("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), pUri, debugstr_w(pszLocation)); - return E_NOTIMPL; + + /* + * NOTE: This is an undocumented function. It seems to be working the way it's implemented, + * but I couldn't get its tests working. It's used by mshtml to load content in a new + * instance of browser. + */ + + hres = CreateURLMonikerEx2(NULL, pUri, &mon, 0); + if(FAILED(hres)) + return hres; + + hres = navigate_hlink(This->doc_host, mon, pbc, pibsc); + IMoniker_Release(mon); + return hres; } static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = {

1 0

Jacek Caban : mshtml: Added IHTMLWindow::open implementation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: d870b8c3e37f91e885dabc99eca4b0e05539e486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d870b8c3e37f91e885dabc99e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:54 2012 +0100 mshtml: Added IHTMLWindow::open implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 43 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 57 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 4 --- 5 files changed, 100 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 0d7a3a7..dfb14cf 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -108,6 +108,7 @@ HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +HRESULT navigate_new_window(HTMLWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f907776..654f2e0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "mshtmdid.h" #include "shlguid.h" +#include "shobjidl.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -776,9 +777,47 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, BSTR features, VARIANT_BOOL replace, IHTMLWindow2 **pomWindowResult) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), + INewWindowManager *new_window_mgr; + IUri *uri; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); - return E_NOTIMPL; + + if(!This->doc_obj) + return E_UNEXPECTED; + + if(name && *name == '_') { + FIXME("Unsupported name %s\n", debugstr_w(name)); + return E_NOTIMPL; + } + + hres = do_query_service((IUnknown*)This->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, + (void**)&new_window_mgr); + if(FAILED(hres)) { + FIXME("No INewWindowManager\n"); + return E_NOTIMPL; + } + + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, This->url, + features, !!replace, This->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + INewWindowManager_Release(new_window_mgr); + This->doc_obj->has_popup = TRUE; + if(FAILED(hres)) { + *pomWindowResult = NULL; + return S_OK; + } + + if(This->uri) + hres = CoInternetCombineUrlEx(This->uri, url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); + else + hres = CreateUri(url, 0, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = navigate_new_window(This, uri, name, pomWindowResult); + IUri_Release(uri); + return hres; } static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0c6d73f..5480435 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -466,6 +466,7 @@ struct HTMLDocumentObj { BOOL is_webbrowser; BOOL container_locked; BOOL focus; + BOOL has_popup; INT download_state; USERMODE usermode; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bfee591..f5375e4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -33,6 +33,8 @@ #include "shlguid.h" #include "wininet.h" #include "shlwapi.h" +#include "htiface.h" +#include "shdeprecated.h" #include "wine/debug.h" @@ -44,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" +static const WCHAR emptyW[] = {0}; + struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -1977,6 +1981,59 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE return S_OK; } +HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret) +{ + IWebBrowser2 *web_browser; + IHTMLWindow2 *new_window; + IBindCtx *bind_ctx; + nsChannelBSC *bsc; + HRESULT hres; + + hres = create_channelbsc(NULL, NULL, NULL, 0, &bsc); + if(FAILED(hres)) + return hres; + + hres = CreateAsyncBindCtx(0, &bsc->bsc.IBindStatusCallback_iface, NULL, &bind_ctx); + if(FAILED(hres)) { + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + return hres; + } + + hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_LOCAL_SERVER, + &IID_IWebBrowser2, (void**)&web_browser); + if(SUCCEEDED(hres)) { + ITargetFramePriv2 *target_frame_priv; + + hres = IWebBrowser_QueryInterface(web_browser, &IID_ITargetFramePriv2, (void**)&target_frame_priv); + if(SUCCEEDED(hres)) { + hres = ITargetFramePriv2_AggregatedNavigation2(target_frame_priv, + HLNF_DISABLEWINDOWRESTRICTIONS|HLNF_OPENINNEWWINDOW, bind_ctx, &bsc->bsc.IBindStatusCallback_iface, + name, uri, emptyW); + ITargetFramePriv2_Release(target_frame_priv); + + if(SUCCEEDED(hres)) + hres = do_query_service((IUnknown*)web_browser, &SID_SHTMLWindow, &IID_IHTMLWindow2, (void**)&new_window); + } + if(FAILED(hres)) { + IWebBrowser2_Quit(web_browser); + IWebBrowser2_Release(web_browser); + } + }else { + WARN("Could not create InternetExplorer instance: %08x\n", hres); + } + + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + IBindCtx_Release(bind_ctx); + if(FAILED(hres)) + return hres; + + IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); + IWebBrowser2_Release(web_browser); + + *ret = new_window; + return S_OK; +} + HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschannel, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d72eb1b..174b448 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5194,19 +5194,15 @@ static void test_open_window(IHTMLDocument2 *doc) CHECK_CALLED(TranslateUrl); if(!called_EvaluateNewWindow) { - todo_wine win_skip("INewWindowManager not supported\n"); if(SUCCEEDED(hres) && new_window) IHTMLWindow2_Release(new_window); IHTMLWindow2_Release(window); return; } - todo_wine CHECK_CALLED(EvaluateNewWindow); - todo_wine ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine ok(new_window == NULL, "new_window != NULL\n"); IHTMLWindow2_Release(window);

1 0

Jacek Caban : mshtml: Added more IHTMLWindow2::open tests.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: c7cc9a1a5d1b57b2fd9a4c09d4bec28e9763c759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cc9a1a5d1b57b2fd9a4c09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:57:07 2012 +0100 mshtml: Added more IHTMLWindow2::open tests. --- dlls/mshtml/tests/htmldoc.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 174b448..fb615fb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -41,6 +41,7 @@ #include "shdeprecated.h" #include "perhist.h" #include "shobjidl.h" +#include "htiface.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -199,7 +200,7 @@ static BOOL inplace_deactivated, open_call; static BOOL complete, loading_js, loading_hash; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; -static BOOL support_wbapp; +static BOOL support_wbapp, allow_new_window; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -828,10 +829,10 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac ok(!strcmp_wa(pszUrlContext, "about:replace"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); ok(!fReplace, "fReplace = %x\n", fReplace); - ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags); + ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %x\n", dwFlags); ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); - return E_FAIL; + return allow_new_window ? S_OK : E_FAIL; } static const INewWindowManagerVtbl NewWindowManagerVtbl = { @@ -5162,12 +5163,14 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre nav_url = prev_nav_url; } -static void test_open_window(IHTMLDocument2 *doc) +static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) { IHTMLWindow2 *window, *new_window; BSTR name, url; HRESULT hres; + allow_new_window = !do_block; + hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); @@ -5203,7 +5206,16 @@ static void test_open_window(IHTMLDocument2 *doc) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); - ok(new_window == NULL, "new_window != NULL\n"); + + if(do_block) { + ok(!new_window, "new_window != NULL\n"); + }else { + ok(new_window != NULL, "new_window == NULL\n"); + + trace("WINDOW %p\n", new_window); + hres = IHTMLWindow2_close(new_window); + ok(hres == S_OK, "close failed: %08x\n", hres); + } IHTMLWindow2_Release(window); } @@ -6535,7 +6547,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE); test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE); - test_open_window(doc); + test_open_window(doc, TRUE); + if(!support_wbapp) /* FIXME */ + test_open_window(doc, FALSE); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Nikolay Sivov : msxml3: Some put_dataType() tests for nodes without typed data.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: ebf91350cdac3e9f3fdb8b1ae26473221f0fe5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf91350cdac3e9f3fdb8b1ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 9 00:21:53 2012 +0300 msxml3: Some put_dataType() tests for nodes without typed data. --- dlls/msxml3/cdata.c | 4 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/tests/domdoc.c | 77 ++++++++++++++++++++++++++++---------------- 6 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 0058314..c6d1f8c 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _domcdata +typedef struct { xmlnode node; IXMLDOMCDATASection IXMLDOMCDATASection_iface; @@ -436,7 +436,7 @@ static HRESULT WINAPI domcdata_put_dataType( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 5663632..f1f94c6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -435,7 +435,7 @@ static HRESULT WINAPI domcomment_put_dataType( { domcomment *This = impl_from_IXMLDOMComment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 435712c..cedd258 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -433,7 +433,7 @@ static HRESULT WINAPI domfrag_put_dataType( { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index b6b0ae4..313fc2e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -428,7 +428,7 @@ static HRESULT WINAPI entityref_put_dataType( { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 23027a1..332d97c 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -506,7 +506,7 @@ static HRESULT WINAPI dom_pi_put_dataType( { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if(!p) return E_INVALIDARG; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d737d7f..5ed8715 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6777,10 +6777,26 @@ static put_datatype_t put_datatype_data[] = { { NULL } }; -static void test_nodeTypeTests( void ) +typedef struct { + DOMNodeType type; + HRESULT hr; +} put_datatype_notype_t; + +static put_datatype_notype_t put_dt_notype[] = { + { NODE_PROCESSING_INSTRUCTION, E_FAIL }, + { NODE_DOCUMENT_FRAGMENT, E_FAIL }, + { NODE_ENTITY_REFERENCE, E_FAIL }, + { NODE_CDATA_SECTION, E_FAIL }, + { NODE_COMMENT, E_FAIL }, + { NODE_INVALID } +}; + +static void test_put_dataType( void ) { + const put_datatype_notype_t *ptr2 = put_dt_notype; const put_datatype_t *ptr = put_datatype_data; IXMLDOMElement *root, *element; + BSTR nameW, type1W, type2W; IXMLDOMDocument *doc; HRESULT hr; @@ -6831,6 +6847,38 @@ static void test_nodeTypeTests( void ) IXMLDOMElement_Release(element); + /* try to set type for node without a type */ + nameW = _bstr_("testname"); + type1W = _bstr_("string"); + type2W = _bstr_("number"); + while (ptr2->type != NODE_INVALID) + { + IXMLDOMNode *node; + VARIANT type; + + V_VT(&type) = VT_I2; + V_I2(&type) = ptr2->type; + + hr = IXMLDOMDocument_createNode(doc, type, nameW, NULL, &node); + EXPECT_HR(hr, S_OK); + if(hr == S_OK) + { + hr = IXMLDOMElement_appendChild(root, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_put_dataType(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMNode_put_dataType(node, type1W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + hr = IXMLDOMNode_put_dataType(node, type2W); + ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr); + + IXMLDOMNode_Release(node); + } + ptr2++; + } + IXMLDOMElement_Release(root); IXMLDOMDocument_Release(doc); free_bstrs(); @@ -8490,32 +8538,6 @@ static void test_setAttributeNode(void) free_bstrs(); } -static void test_put_dataType(void) -{ - IXMLDOMCDATASection *cdata; - IXMLDOMDocument *doc; - VARIANT_BOOL b; - HRESULT hr; - - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b ); - ok( hr == S_OK, "loadXML failed\n"); - ok( b == VARIANT_TRUE, "failed to load XML string\n"); - - hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("test"), &cdata); - ok( hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("number")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("string")); - ok( hr == E_FAIL, "got 0x%08x\n", hr); - IXMLDOMCDATASection_Release(cdata); - - IXMLDOMDocument_Release(doc); - free_bstrs(); -} - static void test_createNode(void) { IXMLDOMDocument *doc; @@ -11062,7 +11084,6 @@ START_TEST(domdoc) test_XSLPattern(); test_cloneNode(); test_xmlTypes(); - test_nodeTypeTests(); test_save(); test_testTransforms(); test_namespaces();

1 0

Pablo Saratxaga : kernel32: Corrections to Walloon locale.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 7c34c4d23995f8fed7fcb9a4556662d953c9e51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c34c4d23995f8fed7fcb9a45… Author: Pablo Saratxaga <pablo(a)walon.org> Date: Sun Jan 8 00:05:01 2012 +0100 kernel32: Corrections to Walloon locale. --- dlls/kernel32/nls/wal.nls | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls index be1f6f7..f4c2878 100644 --- a/dlls/kernel32/nls/wal.nls +++ b/dlls/kernel32/nls/wal.nls @@ -67,9 +67,9 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVCTRYNAME "BEL" LOCALE_SABBREVDAYNAME1 "lon" LOCALE_SABBREVDAYNAME2 "m�r" - LOCALE_SABBREVDAYNAME3 "mer" + LOCALE_SABBREVDAYNAME3 "mie" LOCALE_SABBREVDAYNAME4 "dju" - LOCALE_SABBREVDAYNAME5 "vin" + LOCALE_SABBREVDAYNAME5 "v�n" LOCALE_SABBREVDAYNAME6 "sem" LOCALE_SABBREVDAYNAME7 "dim" LOCALE_SABBREVLANGNAME "WAL" @@ -77,7 +77,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME2 "fev" LOCALE_SABBREVMONTHNAME3 "m�s" LOCALE_SABBREVMONTHNAME4 "avr" - LOCALE_SABBREVMONTHNAME5 "mae" + LOCALE_SABBREVMONTHNAME5 "may" LOCALE_SABBREVMONTHNAME6 "djn" LOCALE_SABBREVMONTHNAME7 "djl" LOCALE_SABBREVMONTHNAME8 "awo" @@ -86,14 +86,14 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME11 "n�v" LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Beljike" + LOCALE_SCOUNTRY "Beldjike" LOCALE_SCURRENCY "�" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "londi" LOCALE_SDAYNAME2 "m�rdi" - LOCALE_SDAYNAME3 "merkidi" + LOCALE_SDAYNAME3 "mierkidi" LOCALE_SDAYNAME4 "djudi" - LOCALE_SDAYNAME5 "vinrdi" + LOCALE_SDAYNAME5 "v�nrdi" LOCALE_SDAYNAME6 "semdi" LOCALE_SDAYNAME7 "dimegne" LOCALE_SDECIMAL "," @@ -110,12 +110,12 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "djanv�" - LOCALE_SMONTHNAME2 "f�vr�" - LOCALE_SMONTHNAME3 "m�s" + LOCALE_SMONTHNAME2 "fevr�" + LOCALE_SMONTHNAME3 "m�ss" LOCALE_SMONTHNAME4 "avri" - LOCALE_SMONTHNAME5 "maey" + LOCALE_SMONTHNAME5 "may" LOCALE_SMONTHNAME6 "djun" - LOCALE_SMONTHNAME7 "djulet" + LOCALE_SMONTHNAME7 "djulete" LOCALE_SMONTHNAME8 "awousse" LOCALE_SMONTHNAME9 "setimbe" LOCALE_SMONTHNAME10 "oct�be" @@ -124,10 +124,10 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "wa-BE" - LOCALE_SNATIVECTRYNAME "Beljike" + LOCALE_SNATIVECTRYNAME "Beldjike" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "Walon (Beljike)" + LOCALE_SNATIVEDISPLAYNAME "Walon (Beldjike)" LOCALE_SNATIVELANGNAME "Walon" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN ""

1 0

Daniel Lehman : msvcrt: Sync _wtempnam with _tempnam.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 85559848ff32840eaf7d69e019ee0cc7a1ca910c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85559848ff32840eaf7d69e01… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 12:24:06 2012 -0800 msvcrt: Sync _wtempnam with _tempnam. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c4ba546..cde8a81 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2371,7 +2371,11 @@ char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix) */ MSVCRT_wchar_t * CDECL MSVCRT__wtempnam(const MSVCRT_wchar_t *dir, const MSVCRT_wchar_t *prefix) { + static const MSVCRT_wchar_t tmpW[] = {'T','M','P',0}; MSVCRT_wchar_t tmpbuf[MAX_PATH]; + const MSVCRT_wchar_t *tmp_dir = MSVCRT__wgetenv(tmpW); + + if (tmp_dir) dir = tmp_dir; TRACE("dir (%s) prefix (%s)\n",debugstr_w(dir),debugstr_w(prefix)); if (GetTempFileNameW(dir,prefix,0,tmpbuf))

1 0

Daniel Lehman : msvcrt: Add struct and prototypes for existing _findfirst64 and _findnext64.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: e0f1bac434b896297277cac34fb53206714c7d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f1bac434b896297277cac34… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 12:24:50 2012 -0800 msvcrt: Add struct and prototypes for existing _findfirst64 and _findnext64. --- include/msvcrt/io.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index c7ba9ab..ad5c507 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -47,6 +47,16 @@ struct _finddatai64_t __int64 DECLSPEC_ALIGN(8) size; char name[260]; }; + +struct _finddata64_t +{ + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; #endif /* _FINDDATA_T_DEFINED */ #ifndef _WFINDDATA_T_DEFINED @@ -88,8 +98,10 @@ __msvcrt_long __cdecl _filelength(int); int __cdecl _findclose(intptr_t); intptr_t __cdecl _findfirst(const char*,struct _finddata_t*); intptr_t __cdecl _findfirsti64(const char*, struct _finddatai64_t*); +intptr_t __cdecl _findfirst64(const char*, struct _finddata64_t*); int __cdecl _findnext(intptr_t,struct _finddata_t*); int __cdecl _findnexti64(intptr_t, struct _finddatai64_t*); +int __cdecl _findnext64(intptr_t, struct _finddata64_t*); intptr_t __cdecl _get_osfhandle(int); int __cdecl _isatty(int); int __cdecl _locking(int,int,__msvcrt_long);

1 0