January 2008 - Wine-Commits

Jacek Caban : shdocvw: Added OnStopBinding implementation and use it in http_load_hack.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: cc8ed9a3714e5f36ca0b4af8499d8a838931ab64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8ed9a3714e5f36ca0b4af84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:40:17 2008 +0100 shdocvw: Added OnStopBinding implementation and use it in http_load_hack. --- dlls/shdocvw/navigate.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 90f8fe0..6f35a06 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static const WCHAR emptyW[] = {0}; + typedef struct { const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; const IHttpNegotiateVtbl *lpHttpNegotiateVtbl; @@ -214,14 +216,16 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac { BindStatusCallback *This = BINDSC_THIS(iface); - FIXME("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + + set_status_text(This, emptyW); if(This->doc_host) { IOleClientSite_Release(CLIENTSITE(This->doc_host)); This->doc_host = NULL; } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, @@ -512,8 +516,10 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback } hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist); - if(FAILED(hres)) + if(FAILED(hres)) { + IUnknown_Release(doc); return hres; + } hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); IPersistMoniker_Release(persist); @@ -525,14 +531,7 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback IUnknown_Release(doc); - if(This->frame) { - static const WCHAR empty[] = {0}; - - IOleInPlaceFrame_SetStatusText(This->frame, empty); /* FIXME */ - } - - return hres; - + return IBindStatusCallback_OnStopBinding(callback, hres, NULL); } static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, @@ -572,8 +571,6 @@ static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG hres = bind_to_object(This, mon, This->url, bindctx, callback); - IBindStatusCallback_OnStopBinding(callback, hres, NULL); - IBindStatusCallback_Release(callback); IBindCtx_Release(bindctx);

1 0

Jacek Caban : shdocvw: Added OnProgress implementation.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: f79771cb6cfe8bcfa5547bb6d06837de0f7b0860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79771cb6cfe8bcfa5547bb6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:39:01 2008 +0100 shdocvw: Added OnProgress implementation. --- dlls/shdocvw/navigate.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index e9c3db1..90f8fe0 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -90,6 +90,14 @@ static void dump_BINDINFO(BINDINFO *bi) ); } +static void set_status_text(BindStatusCallback *This, LPCWSTR str) +{ + if(!This->doc_host || !This->doc_host->frame) + return; + + IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); +} + #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -178,8 +186,26 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BindStatusCallback *This = BINDSC_THIS(iface); - FIXME("(%p)->(%d %d %d %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, + + TRACE("(%p)->(%d %d %d %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + + switch(ulStatusCode) { + case BINDSTATUS_BEGINDOWNLOADDATA: + set_status_text(This, szStatusText); /* FIXME: "Start downloading from site: %s" */ + return S_OK; + case BINDSTATUS_ENDDOWNLOADDATA: + set_status_text(This, szStatusText); /* FIXME: "Downloading from site: %s" */ + return S_OK; + case BINDSTATUS_CLASSIDAVAILABLE: + case BINDSTATUS_MIMETYPEAVAILABLE: + case BINDSTATUS_BEGINSYNCOPERATION: + case BINDSTATUS_ENDSYNCOPERATION: + return S_OK; + default: + FIXME("status code %u\n", ulStatusCode); + } + return E_NOTIMPL; }

1 0

Jacek Caban : shdocvw: Added OnObjectAvailable implementation.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: e3fb7ba8a98aca516e52705e2fe5ba7cc5841c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fb7ba8a98aca516e52705e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:38:01 2008 +0100 shdocvw: Added OnObjectAvailable implementation. --- dlls/shdocvw/navigate.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 4fff84a..43aa3b2 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -232,8 +232,36 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * REFIID riid, IUnknown *punk) { BindStatusCallback *This = BINDSC_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); - return E_NOTIMPL; + 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); + + /* FIXME: Call SetAdvise */ + /* FIXME: Call Invoke(DISPID_READYSTATE) */ + }else { + FIXME("Could not get IOleObject iface: %08x\n", hres); + } + + PostMessageW(This->doc_host->hwnd, WB_WM_NAVIGATE2, 0, 0); + + return S_OK; } #undef BSC_THIS

1 0

Jacek Caban : shdocvw: Return correct variables in GetBindInfo.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: d273150b693270c85e4c16b9d4021825f6e30dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d273150b693270c85e4c16b9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:36:48 2008 +0100 shdocvw: Return correct variables in GetBindInfo. --- dlls/shdocvw/navigate.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index f72888c..8b9697c 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -203,18 +203,16 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, { BindStatusCallback *This = BINDSC_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); + TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); - memset(pbindinfo, 0, sizeof(BINDINFO)); - pbindinfo->cbSize = sizeof(BINDINFO); - - pbindinfo->cbstgmedData = This->post_data_len; + *grfBINDF = BINDF_ASYNCHRONOUS; if(This->post_data) { pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->cbstgmedData = This->post_data_len; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)BINDSC(This); IBindStatusCallback_AddRef(BINDSC(This)); }

1 0

Jacek Caban : shdocvw: Always create BindStatusCallback object.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 6a4c916716a08a130f912862f968efbf4a1ab155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c916716a08a130f912862f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:37:28 2008 +0100 shdocvw: Always create BindStatusCallback object. --- dlls/shdocvw/navigate.c | 92 +++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 43 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 8b9697c..4fff84a 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2007 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 @@ -436,30 +436,18 @@ static BOOL try_application_url(LPCWSTR url) return ShellExecuteExW(&exec_info); } -static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) +static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback *callback, IBindCtx *bindctx) { IOleObject *oleobj; IPersistMoniker *persist; - VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; - if(cancel) { - FIXME("Cancel\n"); - return S_OK; - } - - IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, - (IUnknown*)CLIENTSITE(This)); - /* * FIXME: * We should use URLMoniker's BindToObject instead creating HTMLDocument here. * This should be fixed when mshtml.dll and urlmon.dll will be good enough. */ - if(This->document) - deactivate_document(This); - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&This->document); @@ -473,9 +461,6 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) if(FAILED(hres)) return hres; - if(This->frame) - IOleInPlaceFrame_EnableModeless(This->frame, FALSE); /* FIXME */ - hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); IPersistMoniker_Release(persist); @@ -483,7 +468,6 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) static const WCHAR empty[] = {0}; IOleInPlaceFrame_SetStatusText(This->frame, empty); /* FIXME */ - IOleInPlaceFrame_EnableModeless(This->frame, TRUE); /* FIXME */ } if(FAILED(hres)) { @@ -504,36 +488,47 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) } -static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, ULONG post_data_len, +static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, + IBindStatusCallback *callback) +{ + HRESULT hres; + + IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, + (IUnknown*)CLIENTSITE(This)); + + if(This->frame) + IOleInPlaceFrame_EnableModeless(This->frame, FALSE); + + hres = http_load_hack(This, mon, callback, bindctx); + + if(This->frame) + IOleInPlaceFrame_EnableModeless(This->frame, TRUE); + + return S_OK; +} + +static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG post_data_len, LPWSTR headers) { IBindStatusCallback *callback; - IMoniker *mon; IBindCtx *bindctx; HRESULT hres; - if(!This->hwnd) - create_doc_view_hwnd(This); - - hres = CreateURLMoniker(NULL, url, &mon); - if(FAILED(hres)) { - WARN("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); TRACE("navigating to %s\n", debugstr_w(This->url)); + if(This->document) + deactivate_document(This); + callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers); CreateAsyncBindCtx(0, callback, 0, &bindctx); - hres = navigate(This, mon, bindctx); + hres = bind_to_object(This, mon, This->url, bindctx, callback); IBindStatusCallback_OnStopBinding(callback, hres, NULL); IBindStatusCallback_Release(callback); IBindCtx_Release(bindctx); - IMoniker_Release(mon); return hres; } @@ -541,6 +536,7 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { + IMoniker *mon; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -548,6 +544,12 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("navigating to %s\n", debugstr_w(url)); + hres = CreateURLMoniker(NULL, url, &mon); + if(FAILED(hres)) { + WARN("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + if((Flags && V_VT(Flags) != VT_EMPTY) || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n", @@ -571,8 +573,12 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("Headers: %s\n", debugstr_w(headers)); } - hres = bind_url_to_object(This, url, post_data, post_data_len, headers); + if(!This->hwnd) + create_doc_view_hwnd(This); + + hres = navigate_mon(This, mon, post_data, post_data_len, headers); + IMoniker_Release(mon); if(post_data) SafeArrayUnaccessData(V_ARRAY(PostData)); @@ -617,23 +623,23 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, } on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel); - - CoTaskMemFree(headers); - ReleaseBindInfo(&bindinfo); + CoTaskMemFree(url); if(cancel) { FIXME("navigation canceled\n"); - CoTaskMemFree(url); - return S_OK; - } + hres = S_OK; + }else { + /* FIXME: We should do it after BindToObject call */ + if(try_application_url(url)) + return S_OK; - /* FIXME: We should do it after BindToObject call */ - if(try_application_url(url)) - return S_OK; + hres = navigate_mon(This, mon, post_data, post_data_len, headers); + } - This->url = url; + CoTaskMemFree(headers); + ReleaseBindInfo(&bindinfo); - return navigate(This, mon, bindctx); + return hres; } HRESULT go_home(DocHost *This)

1 0

Jacek Caban : shdocvw: Return S_OK in OnStartBinding.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: c42a7789323a6a9e66a5af230fd34a95dcc4e0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42a7789323a6a9e66a5af230… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:36:27 2008 +0100 shdocvw: Return S_OK in OnStartBinding. --- dlls/shdocvw/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index e932b77..f72888c 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -152,8 +152,10 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa DWORD dwReserved, IBinding *pbind) { BindStatusCallback *This = BINDSC_THIS(iface); - FIXME("(%p)->(%d %p)\n", This, dwReserved, pbind); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); + + return S_OK; } static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface,

1 0

Jacek Caban : shdocvw: Added missing OnObjectAvailable function.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 4a5339ae5f08c9eb6698606eaaa45fe4c22c1219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5339ae5f08c9eb6698606ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:35:42 2008 +0100 shdocvw: Added missing OnObjectAvailable function. --- dlls/shdocvw/navigate.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 429a71e..ecb6727 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -217,6 +217,14 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return E_NOTIMPL; } +static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, IUnknown *punk) +{ + BindStatusCallback *This = BINDSC_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); + return E_NOTIMPL; +} + #undef BSC_THIS static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { @@ -229,7 +237,8 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_OnProgress, BindStatusCallback_OnStopBinding, BindStatusCallback_GetBindInfo, - BindStatusCallback_OnDataAvailable + BindStatusCallback_OnDataAvailable, + BindStatusCallback_OnObjectAvailable }; #define HTTPNEG_THIS(iface) DEFINE_THIS(BindStatusCallback, HttpNegotiate, iface)

1 0

Jacek Caban : shdocvw: Store DocHost in BindStatusCallback.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 3ebdcb847d7c9f7087d024409a10f67f29a37f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebdcb847d7c9f7087d024409… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:36:04 2008 +0100 shdocvw: Store DocHost in BindStatusCallback. --- dlls/shdocvw/navigate.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index ecb6727..e932b77 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -36,6 +36,8 @@ typedef struct { LONG ref; + DocHost *doc_host; + HGLOBAL post_data; LPWSTR headers; ULONG post_data_len; @@ -135,6 +137,8 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->doc_host) + IOleClientSite_Release(CLIENTSITE(This->doc_host)); if(This->post_data) GlobalFree(This->post_data); heap_free(This->headers); @@ -181,7 +185,14 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac HRESULT hresult, LPCWSTR szError) { BindStatusCallback *This = BINDSC_THIS(iface); + FIXME("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + + if(This->doc_host) { + IOleClientSite_Release(CLIENTSITE(This->doc_host)); + This->doc_host = NULL; + } + return E_NOTIMPL; } @@ -299,8 +310,8 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = { HttpNegotiate_OnResponse }; -static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, - ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) +static IBindStatusCallback *create_callback(DocHost *doc_host, PBYTE post_data, + ULONG post_data_len, LPWSTR headers) { BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback)); @@ -312,6 +323,9 @@ static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, ret->post_data_len = post_data_len; ret->headers = NULL; + ret->doc_host = doc_host; + IOleClientSite_AddRef(CLIENTSITE(doc_host)); + if(post_data) { ret->post_data = GlobalAlloc(0, post_data_len); memcpy(ret->post_data, post_data, post_data_len); @@ -496,7 +510,6 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U IBindStatusCallback *callback; IMoniker *mon; IBindCtx *bindctx; - VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; if(!This->hwnd) @@ -511,12 +524,14 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); TRACE("navigating to %s\n", debugstr_w(This->url)); - callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); + callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers); CreateAsyncBindCtx(0, callback, 0, &bindctx); - IBindStatusCallback_Release(callback); hres = navigate(This, mon, bindctx); + IBindStatusCallback_OnStopBinding(callback, hres, NULL); + + IBindStatusCallback_Release(callback); IBindCtx_Release(bindctx); IMoniker_Release(mon);

1 0

Dmitry Timoshkov : winecfg: Don' t mix the strings in unix and windows locales.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 2ae3945d3d96cbcbeb9eaf004e58a56693e97417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae3945d3d96cbcbeb9eaf004… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 3 21:29:24 2008 +0800 winecfg: Don't mix the strings in unix and windows locales. --- programs/winecfg/driveui.c | 20 ++++++------ programs/winecfg/theme.c | 67 +++++++++++++++++++++++++++++++------------ programs/winecfg/winecfg.h | 16 ++++++++++- 3 files changed, 73 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ae3945d3d96cbcbeb9ea…

1 0

Alistair Leslie-Hughes : msxml3: Return E_INVALIDARG when value is NULL.
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 7c1a7491ec2a3520fb114977ede5be961ef65ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1a7491ec2a3520fb114977e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 3 16:02:36 2008 +1100 msxml3: Return E_INVALIDARG when value is NULL. --- dlls/msxml3/node.c | 3 +++ dlls/msxml3/tests/domdoc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 63f3ad5..7122f7d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -219,6 +219,9 @@ static HRESULT WINAPI xmlnode_get_nodeValue( TRACE("%p %p\n", This, value); + if(!value) + return E_INVALIDARG; + V_BSTR(value) = NULL; V_VT(value) = VT_NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c226ad3..9c5e680 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -545,6 +545,10 @@ static void test_domnode( void ) VariantInit(&var); ok( V_VT(&var) == VT_EMPTY, "variant init failed\n"); + + r = IXMLDOMNode_get_nodeValue( doc, NULL ); + ok(r == E_INVALIDARG, "get_nodeValue ret %08x\n", r ); + r = IXMLDOMNode_get_nodeValue( doc, &var ); ok( r == S_FALSE, "nextNode returned wrong code\n"); ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n");

1 0