August 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Allow filtering on RECT textures.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 531ec2267b853710ee16fa8b922f98de8e40d565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531ec2267b853710ee16fa8b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 21:38:53 2009 +0200 wined3d: Allow filtering on RECT textures. There is no reason to disable linear filtering, we just cannot use mipmapping. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/texture.c | 10 +++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ea9431e..5e66f34 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -185,6 +185,14 @@ const struct min_lookup minMipLookup_noFilter[] = {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* LINEAR */ }; +const struct min_lookup minMipLookup_noMip[] = +{ + /* NONE POINT LINEAR */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* NONE */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* POINT */ + {{GL_LINEAR, GL_LINEAR, GL_LINEAR }}, /* LINEAR */ +}; + const GLenum magLookup[] = { /* NONE POINT LINEAR */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f0b980..dd8f32e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -223,7 +223,15 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->cond_np2 = TRUE; - texture->baseTexture.minMipLookup = minMipLookup_noFilter; + + if(texture->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) + { + texture->baseTexture.minMipLookup = minMipLookup_noMip; + } + else + { + texture->baseTexture.minMipLookup = minMipLookup_noFilter; + } } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dbac4e..fefc540 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -178,6 +178,7 @@ struct min_lookup const struct min_lookup minMipLookup[WINED3DTEXF_LINEAR + 1]; const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_LINEAR + 1]; +const struct min_lookup minMipLookup_noMip[WINED3DTEXF_LINEAR + 1]; const GLenum magLookup[WINED3DTEXF_LINEAR + 1]; const GLenum magLookup_noFilter[WINED3DTEXF_LINEAR + 1];

1 0

Stefan Dösinger : wined3d: Remove redundant TRACEs.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 52d28655216e4a14c982eed8c20f10d8259574cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d28655216e4a14c982eed8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 17:09:11 2009 +0200 wined3d: Remove redundant TRACEs. These made sense before we had the quirk table. Nowadys the quirk table contains quirk description strings that print out whether or not any apple specific quirks are applied. The traces in match_apple just spam the log because this code is run multiple times for many quirks. --- dlls/wined3d/directx.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b971855..ea9431e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -519,14 +519,10 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re && gl_info->supported[APPLE_FLUSH_RENDER] && gl_info->supported[APPLE_YCBCR_422]) { - TRACE_(d3d_caps)("GL_APPLE_fence, GL_APPLE_client_storage, GL_APPLE_flush_render and GL_ycbcr_422 are supported.\n"); - TRACE_(d3d_caps)("Activating MacOS fixups.\n"); return TRUE; } else { - TRACE_(d3d_caps)("Apple extensions are not supported.\n"); - TRACE_(d3d_caps)("Not activating MacOS fixups.\n"); return FALSE; } }

1 0

Francois Gouget : jscript: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 85c5d3e28b1827bb120a0743840a231f74385e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c5d3e28b1827bb120a07438… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 30 20:19:58 2009 +0200 jscript: Add a trailing '\n' to a FIXME(). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index aaa54ea..1651aeb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -421,7 +421,7 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR hres = array_to_args(arg_array, lcid, ei, caller, &args); jsdisp_release(arg_array); }else { - FIXME("throw TypeError"); + FIXME("throw TypeError\n"); hres = E_FAIL; } }

1 0

Francois Gouget : jscript: Make Arguments_value() static.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 870f1a274f3cd744e6df3ff45e30f0ea5231f486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870f1a274f3cd744e6df3ff45… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 30 20:19:50 2009 +0200 jscript: Make Arguments_value() static. --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e8bfe75..aaa54ea 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -85,7 +85,7 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, return S_OK; } -HRESULT Arguments_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Arguments_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n");

1 0

Jacek Caban : shdocvw: Added IWebBrowser2::get_ReadyState implementation.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: d24690c8cf7b4110a41697c807eb398c438144fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24690c8cf7b4110a41697c80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 30 01:02:34 2009 +0200 shdocvw: Added IWebBrowser2::get_ReadyState implementation. --- dlls/shdocvw/tests/webbrowser.c | 24 ++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 5 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index c9658a4..b3e6e66 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -171,6 +171,17 @@ static void _test_LocationURL(unsigned line, IUnknown *unk, LPCWSTR exurl) IWebBrowser2_Release(wb); } +#define test_ready_state(ex) _test_ready_state(__LINE__,ex); +static void _test_ready_state(unsigned line, READYSTATE exstate) +{ + READYSTATE state; + HRESULT hres; + + hres = IWebBrowser2_get_ReadyState(wb, &state); + ok_(__FILE__,line)(hres == S_OK, "get_ReadyState failed: %08x\n", hres); + ok_(__FILE__,line)(state == exstate, "ReadyState = %d, expected %d\n", state, exstate); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI OleCommandTarget_QueryInterface(IOleCommandTarget *iface, @@ -594,6 +605,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe ok(pDispParams->rgvarg == NULL, "rgvarg=%p, expected NULL\n", pDispParams->rgvarg); ok(pDispParams->cArgs == 0, "cArgs=%d, expected 0\n", pDispParams->cArgs); + test_ready_state(READYSTATE_LOADING); break; case DISPID_BEFORENAVIGATE2: @@ -604,6 +616,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_OnBeforeNavigate(pDispParams->rgvarg+6, pDispParams->rgvarg+5, pDispParams->rgvarg+4, pDispParams->rgvarg+3, pDispParams->rgvarg+2, pDispParams->rgvarg+1, pDispParams->rgvarg); + test_ready_state(READYSTATE_LOADING); break; case DISPID_SETSECURELOCKICON: @@ -635,6 +648,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe ok(pDispParams->rgvarg == NULL, "rgvarg=%p, expected NULL\n", pDispParams->rgvarg); ok(pDispParams->cArgs == 0, "cArgs=%d, expected 0\n", pDispParams->cArgs); + test_ready_state(READYSTATE_LOADING); break; case DISPID_ONMENUBAR: @@ -680,6 +694,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe case DISPID_NAVIGATECOMPLETE2: CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); /* FIXME */ + test_ready_state(READYSTATE_LOADING); break; case DISPID_PROGRESSCHANGE: @@ -690,6 +705,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe case DISPID_DOCUMENTCOMPLETE: CHECK_EXPECT(Invoke_DOCUMENTCOMPLETE); /* FIXME */ + test_ready_state(READYSTATE_COMPLETE); break; case 282: /* FIXME */ @@ -2094,6 +2110,7 @@ static void test_Navigate2(IUnknown *unk) return; test_LocationURL(unk, emptyW); + test_ready_state(READYSTATE_UNINITIALIZED); V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(about_blankW); @@ -2149,6 +2166,8 @@ static void test_Navigate2(IUnknown *unk) VariantClear(&url); IWebBrowser2_Release(webbrowser); + + test_ready_state(READYSTATE_LOADING); } static void test_download(void) @@ -2157,6 +2176,8 @@ static void test_download(void) is_downloading = TRUE; + test_ready_state(READYSTATE_LOADING); + SET_EXPECT(Exec_SETPROGRESSMAX); SET_EXPECT(Exec_SETPROGRESSPOS); SET_EXPECT(Exec_SETDOWNLOADSTATE_1); @@ -2201,6 +2222,8 @@ static void test_download(void) todo_wine CHECK_CALLED(GetDropTarget); todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); + + test_ready_state(READYSTATE_COMPLETE); } static void test_olecmd(IUnknown *unk, BOOL loaded) @@ -2316,6 +2339,7 @@ static void test_WebBrowser(BOOL do_download) ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); test_QueryInterface(unk); + test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk); test_LocationURL(unk, emptyW); test_ConnectionPoint(unk, TRUE); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index e54e9ee..323e9ad 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -776,9 +776,10 @@ static HRESULT WINAPI WebBrowser_ShowBrowserBar(IWebBrowser2 *iface, VARIANT *pv static HRESULT WINAPI WebBrowser_get_ReadyState(IWebBrowser2 *iface, READYSTATE *lpReadyState) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, lpReadyState); - *lpReadyState = READYSTATE_COMPLETE; + TRACE("(%p)->(%p)\n", This, lpReadyState); + + *lpReadyState = This->doc_host.ready_state; return S_OK; }

1 0

Jacek Caban : shdocvw: Use IPropertyNotifySink to track ready state and complete notification.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 8c7ec916a714009256ec9a64ce359a8f32191619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7ec916a714009256ec9a64c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 30 01:02:03 2009 +0200 shdocvw: Use IPropertyNotifySink to track ready state and complete notification. --- dlls/shdocvw/dochost.c | 144 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/navigate.c | 2 + dlls/shdocvw/shdocvw.h | 4 + 3 files changed, 142 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6dedd07..f3035e1 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -47,7 +47,7 @@ LRESULT process_dochost_task(DocHost *This, LPARAM lparam) return 0; } -static void navigate_complete(DocHost *This) +static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; VARIANTARG params[2]; @@ -67,8 +67,9 @@ static void navigate_complete(DocHost *This) V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); - call_sink(This->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); - call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + TRACE("%d >>>\n", dispid); + call_sink(This->cps.wbe2, dispid, &dispparams); + TRACE("%d <<<\n", dispid); SysFreeString(V_BSTR(&url)); This->busy = VARIANT_FALSE; @@ -94,12 +95,103 @@ static void object_available(DocHost *This) hres = IHlinkTarget_Navigate(hlink, 0, NULL); IHlinkTarget_Release(hlink); - if(FAILED(hres)) { + if(FAILED(hres)) FIXME("Navigate failed\n"); +} + +static HRESULT get_doc_ready_state(DocHost *This, READYSTATE *ret) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + IDispatch *disp; + EXCEPINFO ei; + VARIANT var; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return hres; + + hres = IDispatch_Invoke(disp, DISPID_READYSTATE, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, + &dp, &var, &ei, NULL); + IDispatch_Release(disp); + if(FAILED(hres)) { + WARN("Invoke(DISPID_READYSTATE failed: %08x\n", hres); + return hres; + } + + if(V_VT(&var) != VT_I4) { + WARN("V_VT(var) = %d\n", V_VT(&var)); + VariantClear(&var); + return E_FAIL; + } + + *ret = V_I4(&var); + return S_OK; +} + +static void advise_prop_notif(DocHost *This, BOOL set) +{ + IConnectionPointContainer *cp_container; + IConnectionPoint *cp; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IConnectionPointContainer, (void**)&cp_container); + if(FAILED(hres)) + return; + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, &IID_IPropertyNotifySink, &cp); + IConnectionPointContainer_Release(cp_container); + if(FAILED(hres)) return; + + if(set) + hres = IConnectionPoint_Advise(cp, (IUnknown*)PROPNOTIF(This), &This->prop_notif_cookie); + else + hres = IConnectionPoint_Unadvise(cp, This->prop_notif_cookie); + IConnectionPoint_Release(cp); + + if(SUCCEEDED(hres)) + This->is_prop_notif = set; +} + +static void update_ready_state(DocHost *This, READYSTATE ready_state) +{ + if(ready_state > READYSTATE_LOADING && This->ready_state <= READYSTATE_LOADING) { + notif_complete(This, DISPID_NAVIGATECOMPLETE2); + This->ready_state = ready_state; } - navigate_complete(This); + if(ready_state == READYSTATE_COMPLETE && This->ready_state < READYSTATE_COMPLETE) { + This->ready_state = READYSTATE_COMPLETE; + notif_complete(This, DISPID_DOCUMENTCOMPLETE); + } +} + +typedef struct { + task_header_t header; + IUnknown *doc; + READYSTATE ready_state; +} ready_state_task_t; + +static void ready_state_proc(DocHost *This, task_header_t *_task) +{ + ready_state_task_t *task = (ready_state_task_t*)_task; + + if(task->doc == This->document) + update_ready_state(This, task->ready_state); + + IUnknown_Release(task->doc); +} + +static void push_ready_state_task(DocHost *This, READYSTATE ready_state) +{ + ready_state_task_t *task = heap_alloc(sizeof(ready_state_task_t)); + + IUnknown_AddRef(This->document); + task->doc = This->document; + task->ready_state = ready_state; + + push_dochost_task(This, &task->header, ready_state_proc, FALSE); } static void object_available_proc(DocHost *This, task_header_t *task) @@ -109,6 +201,7 @@ static void object_available_proc(DocHost *This, task_header_t *task) HRESULT dochost_object_available(DocHost *This, IUnknown *doc) { + READYSTATE ready_state; task_header_t *task; IOleObject *oleobj; HRESULT hres; @@ -135,11 +228,18 @@ HRESULT dochost_object_available(DocHost *This, IUnknown *doc) } /* FIXME: Call SetAdvise */ - /* FIXME: Call Invoke(DISPID_READYSTATE) */ task = heap_alloc(sizeof(*task)); push_dochost_task(This, task, object_available_proc, FALSE); + hres = get_doc_ready_state(This, &ready_state); + if(SUCCEEDED(hres)) { + if(ready_state == READYSTATE_COMPLETE) + push_ready_state_task(This, READYSTATE_COMPLETE); + else + advise_prop_notif(This, TRUE); + } + return S_OK; } @@ -214,6 +314,9 @@ void deactivate_document(DocHost *This) IHlinkTarget *hlink = NULL; HRESULT hres; + if(This->is_prop_notif) + advise_prop_notif(This, FALSE); + if(This->view) IOleDocumentView_UIActivate(This->view, FALSE); @@ -566,8 +669,30 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) { DocHost *This = PROPNOTIF_THIS(iface); - FIXME("(%p)->(%d)\n", This, dispID); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dispID); + + switch(dispID) { + case DISPID_READYSTATE: { + READYSTATE ready_state; + HRESULT hres; + + hres = get_doc_ready_state(This, &ready_state); + if(FAILED(hres)) + return hres; + + if(ready_state == READYSTATE_COMPLETE) + advise_prop_notif(This, FALSE); + + push_ready_state_task(This, ready_state); + break; + } + default: + FIXME("unimplemented dispid %d\n", dispID); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) @@ -608,6 +733,9 @@ void DocHost_Init(DocHost *This, IDispatch *disp) This->silent = VARIANT_FALSE; This->offline = VARIANT_FALSE; + This->ready_state = READYSTATE_UNINITIALIZED; + This->is_prop_notif = FALSE; + DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 9bd2445..ec23fcc 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -549,6 +549,8 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; + This->ready_state = READYSTATE_LOADING; + on_before_navigate2(This, bsc->url, bsc->post_data, bsc->post_data_len, bsc->headers, &cancel); if(cancel) { FIXME("Navigation canceled\n"); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index f5cace1..9a51121 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -102,6 +102,10 @@ struct DocHost { VARIANT_BOOL offline; VARIANT_BOOL busy; + READYSTATE ready_state; + DWORD prop_notif_cookie; + BOOL is_prop_notif; + ConnectionPointContainer cps; };

1 0

Jacek Caban : mshtml: Always call OnStartRequest before OnStopRequest.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 9e30813595d3700cd135ae8fd0d69c723fa85f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e30813595d3700cd135ae8fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 30 01:01:16 2009 +0200 mshtml: Always call OnStartRequest before OnStopRequest. --- dlls/mshtml/navigate.c | 50 +++++++++++++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 0980686..1a0d5eb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -879,6 +879,38 @@ struct nsChannelBSC { nsProtocolStream *nsstream; }; +static void on_start_nsrequest(nsChannelBSC *This) +{ + nsresult nsres; + + /* FIXME: it's needed for http connections from BindToObject. */ + if(!This->nschannel->response_status) + This->nschannel->response_status = 200; + + nsres = nsIStreamListener_OnStartRequest(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + if(NS_FAILED(nsres)) + FIXME("OnStartRequest failed: %08x\n", nsres); +} + +static void on_stop_nsrequest(nsChannelBSC *This) +{ + nsresult nsres; + + if(!This->nslistener) + return; + + if(!This->bsc.readed) { + TRACE("No data read! Calling OnStartRequest\n"); + on_start_nsrequest(This); + } + + nsres = nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), + This->nscontext, NS_OK); + if(NS_FAILED(nsres)) + WARN("OnStopRequest failed: %08x\n", nsres); +} + static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { DWORD read; @@ -914,14 +946,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) && (BYTE)This->nsstream->buf[1] == 0xfe) This->nschannel->charset = heap_strdupA(UTF16_STR); - /* FIXME: it's needed for http connections from BindToObject. */ - if(!This->nschannel->response_status) - This->nschannel->response_status = 200; - - nsres = nsIStreamListener_OnStartRequest(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - if(NS_FAILED(nsres)) - FIXME("OnStartRequest failed: %08x\n", nsres); + on_start_nsrequest(This); /* events are reset when a new document URI is loaded, so re-initialise them here */ if(This->bsc.doc && This->bsc.doc->bscallback == This && This->bsc.doc->nscontainer) { @@ -948,15 +973,6 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return S_OK; } -static void on_stop_nsrequest(nsChannelBSC *This) -{ - if(!This->nslistener) - return; - - nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, NS_OK); -} - static void add_nsrequest(nsChannelBSC *This) { nsresult nsres;

1 0

Jacek Caban : shdocvw: Move OnObjectAvailable implementation to dochost.c.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 7b156524809a0dd4802153c6fbd7009dc64d8b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b156524809a0dd4802153c6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 30 01:00:53 2009 +0200 shdocvw: Move OnObjectAvailable implementation to dochost.c. --- dlls/shdocvw/dochost.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/shdocvw/navigate.c | 38 +------------------------------------- dlls/shdocvw/shdocvw.h | 2 +- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index a3d3b3c..6dedd07 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -20,6 +20,7 @@ #include "shdocvw.h" #include "hlink.h" #include "exdispid.h" +#include "mshtml.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -73,7 +74,7 @@ static void navigate_complete(DocHost *This) This->busy = VARIANT_FALSE; } -void object_available(DocHost *This) +static void object_available(DocHost *This) { IHlinkTarget *hlink; HRESULT hres; @@ -99,8 +100,47 @@ void object_available(DocHost *This) } navigate_complete(This); +} + +static void object_available_proc(DocHost *This, task_header_t *task) +{ + object_available(This); +} + +HRESULT dochost_object_available(DocHost *This, IUnknown *doc) +{ + task_header_t *task; + IOleObject *oleobj; + HRESULT hres; + + IUnknown_AddRef(doc); + This->document = doc; + + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + if(SUCCEEDED(hres)) { + CLSID clsid; - return; + hres = IOleObject_GetUserClassID(oleobj, &clsid); + if(SUCCEEDED(hres)) + TRACE("Got clsid %s\n", + IsEqualGUID(&clsid, &CLSID_HTMLDocument) ? "CLSID_HTMLDocument" : debugstr_guid(&clsid)); + + hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); + if(FAILED(hres)) + FIXME("SetClientSite failed: %08x\n", hres); + + IOleObject_Release(oleobj); + }else { + FIXME("Could not get IOleObject iface: %08x\n", hres); + } + + /* FIXME: Call SetAdvise */ + /* FIXME: Call Invoke(DISPID_READYSTATE) */ + + task = heap_alloc(sizeof(*task)); + push_dochost_task(This, task, object_available_proc, FALSE); + + return S_OK; } static LRESULT resize_document(DocHost *This, LONG width, LONG height) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 4b17d33..9bd2445 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -22,7 +22,6 @@ #include "wine/debug.h" #include "shdocvw.h" -#include "mshtml.h" #include "exdispid.h" #include "shellapi.h" #include "winreg.h" @@ -270,49 +269,14 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return E_NOTIMPL; } -static void object_available_proc(DocHost *This, task_header_t *task) -{ - object_available(This); -} - static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = BINDSC_THIS(iface); - task_header_t *task; - IOleObject *oleobj; - HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); - IUnknown_AddRef(punk); - This->doc_host->document = punk; - - hres = IUnknown_QueryInterface(punk, &IID_IOleObject, (void**)&oleobj); - if(SUCCEEDED(hres)) { - CLSID clsid; - - hres = IOleObject_GetUserClassID(oleobj, &clsid); - if(SUCCEEDED(hres)) - TRACE("Got clsid %s\n", - IsEqualGUID(&clsid, &CLSID_HTMLDocument) ? "CLSID_HTMLDocument" : debugstr_guid(&clsid)); - - hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This->doc_host)); - if(FAILED(hres)) - FIXME("SetClientSite failed: %08x\n", hres); - - IOleObject_Release(oleobj); - }else { - FIXME("Could not get IOleObject iface: %08x\n", hres); - } - - /* FIXME: Call SetAdvise */ - /* FIXME: Call Invoke(DISPID_READYSTATE) */ - - task = heap_alloc(sizeof(*task)); - push_dochost_task(This->doc_host, task, object_available_proc, FALSE); - - return S_OK; + return dochost_object_available(This->doc_host, punk); } #undef BSC_THIS diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index e28c98f..f5cace1 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -213,7 +213,7 @@ HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); -void object_available(DocHost*); +HRESULT dochost_object_available(DocHost*,IUnknown*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT go_home(DocHost*);

1 0

Jacek Caban : shdocvw: Added IPropertyNotifySink stub implementation.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: c8e34cf22f3641c7d43018b967497617f4e43705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e34cf22f3641c7d43018b96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 30 01:00:06 2009 +0200 shdocvw: Added IPropertyNotifySink stub implementation. --- dlls/shdocvw/client.c | 3 +++ dlls/shdocvw/dochost.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 2 ++ 3 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 14a7f90..a351bd1 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -60,6 +60,9 @@ static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID ri }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = CLDISP(This); + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); + *ppv = PROPNOTIF(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = SERVPROV(This); diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index dd6e712..a3d3b3c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -502,10 +502,56 @@ static const IDocHostUIHandler2Vtbl DocHostUIHandler2Vtbl = { DocHostUIHandler_GetOverrideKeyPath }; +#define PROPNOTIF_THIS(iface) DEFINE_THIS(DocHost, IPropertyNotifySink, iface) + +static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, + REFIID riid, void **ppv) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI PropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + DocHost *This = PROPNOTIF_THIS(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + DocHost *This = PROPNOTIF_THIS(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +#undef PROPNOTIF_THIS + +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PropertyNotifySink_QueryInterface, + PropertyNotifySink_AddRef, + PropertyNotifySink_Release, + PropertyNotifySink_OnChanged, + PropertyNotifySink_OnRequestEdit +}; + void DocHost_Init(DocHost *This, IDispatch *disp) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->lpIPropertyNotifySinkVtbl = &PropertyNotifySinkVtbl; This->disp = disp; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index b148611..e28c98f 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -78,6 +78,7 @@ struct DocHost { const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IDispatchVtbl *lpDispatchVtbl; + const IPropertyNotifySinkVtbl *lpIPropertyNotifySinkVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; /* Interfaces of InPlaceFrame object */ @@ -184,6 +185,7 @@ struct InternetExplorer { #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) +#define PROPNOTIF(x) ((IPropertyNotifySink*) &(x)->lpIPropertyNotifySinkVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl)

1 0

Riccardo Loti : clock: Fix typo in the Italian translation.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 4a6bbd039abb0f9b10b6b9f843b55b8901b629a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6bbd039abb0f9b10b6b9f84… Author: Riccardo Loti <contez(a)gmail.com> Date: Fri Aug 28 16:57:15 2009 +0200 clock: Fix typo in the Italian translation. --- programs/clock/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/It.rc b/programs/clock/It.rc index 8f59768..f8f01a6 100644 --- a/programs/clock/It.rc +++ b/programs/clock/It.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_MENU MENU { - POPUP "&Properiet�" { + POPUP "&Propriet�" { MENUITEM "Ana&logico", IDM_ANALOG MENUITEM "Digi&tale", IDM_DIGITAL MENUITEM SEPARATOR

1 0