February 2006 - Wine-commits

Jacek Caban : shdocvw: Added client site's IServiceProvider interface.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: ad5d88c67a7999ef380e48e5ea1011217e192a0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad5d88c67a7999ef380e48e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 11:53:31 2006 +0100 shdocvw: Added client site's IServiceProvider interface. --- dlls/shdocvw/client.c | 65 ++++++++++++++++++++++++++++++++++++++++++------ dlls/shdocvw/shdocvw.h | 2 + 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 45b2b98..981132a 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -56,6 +56,9 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = CLDISP(This); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = CLSERVPROV(This); } if(*ppv) { @@ -372,7 +375,7 @@ static HRESULT WINAPI ClDispatch_GetType } static HRESULT WINAPI ClDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) + ITypeInfo **ppTInfo) { WebBrowser *This = DISP_THIS(iface); FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); @@ -380,7 +383,7 @@ static HRESULT WINAPI ClDispatch_GetType } static HRESULT WINAPI ClDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, - UINT cNames, LCID lcid, DISPID *rgDispId) + UINT cNames, LCID lcid, DISPID *rgDispId) { WebBrowser *This = DISP_THIS(iface); FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, @@ -389,8 +392,8 @@ static HRESULT WINAPI ClDispatch_GetIDsO } static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WebBrowser *This = DISP_THIS(iface); FIXME("(%p)->(%ld %s %ld %04x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), @@ -410,12 +413,58 @@ static const IDispatchVtbl DispatchVtbl ClDispatch_Invoke }; +#define SERVPROV_THIS(iface) DEFINE_THIS(WebBrowser, ClServiceProvider, iface) + +static HRESULT WINAPI ClServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, + void **ppv) +{ + WebBrowser *This = SERVPROV_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI ClServiceProvider_AddRef(IServiceProvider *iface) +{ + WebBrowser *This = SERVPROV_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI ClServiceProvider_Release(IServiceProvider *iface) +{ + WebBrowser *This = SERVPROV_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + WebBrowser *This = SERVPROV_THIS(iface); + + if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { + TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv); + return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv); + } + + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +#undef SERVPROV_THIS + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ClServiceProvider_QueryInterface, + ClServiceProvider_AddRef, + ClServiceProvider_Release, + ClServiceProvider_QueryService +}; + void WebBrowser_ClientSite_Init(WebBrowser *This) { - This->lpOleClientSiteVtbl = &OleClientSiteVtbl; - This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; - This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; - This->lpDispatchVtbl = &DispatchVtbl; + This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; + This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + This->lpDispatchVtbl = &DispatchVtbl; + This->lpClServiceProviderVtbl = &ServiceProviderVtbl; This->view = NULL; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 03ba7c2..470d170 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -87,6 +87,7 @@ typedef struct { const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl; const IDispatchVtbl *lpDispatchVtbl; + const IServiceProviderVtbl *lpClServiceProviderVtbl; /* Interfaces of InPlaceFrame object */ @@ -145,6 +146,7 @@ typedef struct { #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpClOleCommandTargetVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) +#define CLSERVPROV(x) ((IServiceProvider*) &(x)->lpClServiceProviderVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl)

1 0

Jacek Caban : shdocvw: Navigate2 rewrite.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 0dbbd90c6a8346569316fc00b07d4817556167d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0dbbd90c6a8346569316fc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 11:53:21 2006 +0100 shdocvw: Navigate2 rewrite. --- dlls/shdocvw/navigate.c | 274 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 1 dlls/shdocvw/webbrowser.c | 68 ++++------- 3 files changed, 296 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0dbbd90c6a834656931…

1 0

Jacek Caban : shdocvw: Added beginning IHlinkFrame::Navigate implementation .
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: f98843e8cc5b165dbc724bf8213e2827ad65ca94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f98843e8cc5b165dbc724bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 11:52:40 2006 +0100 shdocvw: Added beginning IHlinkFrame::Navigate implementation. --- dlls/shdocvw/navigate.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 252 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 32e59fa..dd6c7a3 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban for CodeWeavers + * Copyright 2006 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 @@ -16,13 +16,236 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include "wine/debug.h" #include "wine/unicode.h" #include "shdocvw.h" +#include "mshtml.h" +#include "exdispid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static void dump_BINDINFO(BINDINFO *bi) +{ + static const char *BINDINFOF_str[] = { + "#0", + "BINDINFOF_URLENCODESTGMEDDATA", + "BINDINFOF_URLENCODEDEXTRAINFO" + }; + + static const char *BINDVERB_str[] = { + "BINDVERB_GET", + "BINDVERB_POST", + "BINDVERB_PUT", + "BINDVERB_CUSTOM" + }; + + TRACE("\n" + "BINDINFO = {\n" + " %ld, %s,\n" + " {%ld, %p, %p},\n" + " %s,\n" + " %s,\n" + " %s,\n" + " %ld, %08lx, %ld, %ld\n" + " {%ld %p %x},\n" + " %s\n" + " %p, %ld\n" + "}\n", + + bi->cbSize, debugstr_w(bi->szExtraInfo), + bi->stgmedData.tymed, bi->stgmedData.u.hGlobal, bi->stgmedData.pUnkForRelease, + bi->grfBindInfoF > BINDINFOF_URLENCODEDEXTRAINFO + ? "unknown" : BINDINFOF_str[bi->grfBindInfoF], + bi->dwBindVerb > BINDVERB_CUSTOM + ? "unknown" : BINDVERB_str[bi->dwBindVerb], + debugstr_w(bi->szCustomVerb), + bi->cbStgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage, + bi->securityAttributes.nLength, + bi->securityAttributes.lpSecurityDescriptor, + bi->securityAttributes.bInheritHandle, + debugstr_guid(&bi->iid), + bi->pUnk, bi->dwReserved + ); +} + + +static void on_before_navigate2(WebBrowser *This, PBYTE post_data, ULONG post_data_len, + LPWSTR headers, VARIANT_BOOL *cancel) +{ + VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; + DISPPARAMS dispparams; + VARIANTARG params[7]; + + dispparams.cArgs = 7; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL|VT_BYREF; + V_BOOLREF(params) = cancel; + + V_VT(params+1) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+1) = &var_headers; + V_VT(&var_headers) = VT_BSTR; + V_BSTR(&var_headers) = headers; + + V_VT(params+2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+2) = &var_post_data2; + V_VT(&var_post_data2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(&var_post_data2) = &var_post_data; + VariantInit(&var_post_data); + + if(post_data_len) { + SAFEARRAYBOUND bound = {post_data_len, 0}; + void *data; + + V_VT(&var_post_data) = VT_UI1|VT_ARRAY; + V_ARRAY(&var_post_data) = SafeArrayCreate(VT_UI1, 1, &bound); + + SafeArrayAccessData(V_ARRAY(&var_post_data), &data); + memcpy(data, post_data, post_data_len); + SafeArrayUnaccessData(V_ARRAY(&var_post_data)); + } + + V_VT(params+3) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+3) = &var_frame_name; + V_VT(&var_frame_name) = VT_BSTR; + V_BSTR(&var_frame_name) = NULL; + + V_VT(params+4) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+4) = &var_flags; + V_VT(&var_flags) = VT_I4; + V_I4(&var_flags) = 0; + + V_VT(params+5) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+5) = &var_url; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocString(This->url); + + V_VT(params+6) = (VT_DISPATCH); + V_DISPATCH(params+6) = (IDispatch*)WEBBROWSER2(This); + + call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); + + if(post_data_len) + SafeArrayDestroy(V_ARRAY(&var_post_data)); + +} + +static HRESULT navigate(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx, + IBindStatusCallback *callback) +{ + 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); + + if(FAILED(hres)) { + WARN("Could not create HTMLDocument: %08lx\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistMoniker, (void**)&persist); + if(FAILED(hres)) + return hres; + + if(FAILED(hres)) { + IPersistMoniker_Release(persist); + return hres; + } + + hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); + IPersistMoniker_Release(persist); + if(FAILED(hres)) { + WARN("Load failed: %08lx\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); + if(FAILED(hres)) + return hres; + + hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); + IOleObject_Release(oleobj); + + PostMessageW(This->doc_view_hwnd, WB_WM_NAVIGATE2, 0, 0); + + return hres; +} + +HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx, + IBindStatusCallback *callback) +{ + IHttpNegotiate *http_negotiate; + PBYTE post_data = NULL; + ULONG post_data_len = 0; + LPWSTR headers = NULL; + VARIANT_BOOL cancel = VARIANT_FALSE; + BINDINFO bindinfo; + DWORD bindf = 0; + HRESULT hres; + + IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); + TRACE("navigating to %s\n", debugstr_w(This->url)); + + hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, + (void**)&http_negotiate); + if(SUCCEEDED(hres)) { + static const WCHAR null_string[] = {0}; + + IHttpNegotiate_BeginningTransaction(http_negotiate, null_string, null_string, 0, + &headers); + IHttpNegotiate_Release(http_negotiate); + } + + memset(&bindinfo, 0, sizeof(bindinfo)); + bindinfo.cbSize = sizeof(bindinfo); + + hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); + if(bindinfo.dwBindVerb == BINDVERB_POST) { + post_data_len = bindinfo.cbStgmedData; + if(post_data_len) + post_data = bindinfo.stgmedData.u.hGlobal; + } + + on_before_navigate2(This, post_data, post_data_len, headers, &cancel); + + CoTaskMemFree(headers); + ReleaseBindInfo(&bindinfo); + + if(cancel) { + FIXME("navigation canceled\n"); + return S_OK; + } + + return navigate(This, mon, bindctx, callback); +} + #define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface) static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) @@ -63,8 +286,34 @@ static HRESULT WINAPI HlinkFrame_Navigat IBindStatusCallback *pibsc, IHlink *pihlNavigate) { WebBrowser *This = HLINKFRAME_THIS(iface); - FIXME("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate); - return E_NOTIMPL; + IMoniker *mon; + LPWSTR location = NULL; + BINDINFO bi = {0}; + DWORD bindf = 0; + + TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate); + + if(grfHLNF) + FIXME("unsupported grfHLNF=%08lx\n", grfHLNF); + + /* Windows calls GetTargetFrameName here. */ + + memset(&bi, 0, sizeof(bi)); + bi.cbSize = sizeof(bi); + + IBindStatusCallback_GetBindInfo(pibsc, &bindf, &bi); + dump_BINDINFO(&bi); + + IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location); + + if(location) { + FIXME("location = %s\n", debugstr_w(location)); + CoTaskMemFree(location); + } + + /* Windows calls GetHlinkSite here */ + + return navigate_hlink(This, mon, pbc, pibsc); } static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF,

1 0

Jacek Caban : mshtml: Added hack to allow pass post data to IPersistMoniker ::Load.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 4b511edf8d5ab2a0ab0fe08d762ec2ded445bcd0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b511edf8d5ab2a0ab0fe08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 11:52:33 2006 +0100 mshtml: Added hack to allow pass post data to IPersistMoniker::Load. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsembed.c | 27 ++++++++++++ dlls/mshtml/nsiface.idl | 11 +++++ dlls/mshtml/persist.c | 94 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 131 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 52968bc..2bc9560 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -158,6 +158,8 @@ PRUint32 nsACString_GetData(const nsACSt void nsACString_SetData(nsACString*,const char*); void nsACString_Destroy(nsACString*); +nsIInputStream *create_nsstream(const char*,PRInt32); + IHlink *Hlink_Create(void); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 809c273..dbe0d56 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" #define NS_PROFILE_CONTRACTID "@mozilla.org/profile/manager;1" +#define NS_STRINGSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1" #define APPSTARTUP_TOPIC "app-startup" @@ -388,6 +389,32 @@ void nsACString_Destroy(nsACString *str) HeapFree(GetProcessHeap(), 0, str); } +nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) +{ + nsIStringInputStream *ret; + nsresult nsres; + + if(!pCompMgr) + return NULL; + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, + NS_STRINGSTREAM_CONTRACTID, NULL, &IID_nsIStringInputStream, + (void**)&ret); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIStringInputStream\n"); + return NULL; + } + + nsres = nsIStringInputStream_SetData(ret, data, data_len); + if(NS_FAILED(nsres)) { + ERR("AdoptData failed: %08lx\n", nsres); + nsIStringInputStream_Release(ret); + return NULL; + } + + return (nsIInputStream*)ret; +} + void close_gecko() { TRACE("()\n"); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 382e7b9..a54df54 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -145,6 +145,17 @@ interface nsIInputStream : nsISupports [ object, + uuid(450cd2d4-f0fd-424d-b365-b1251f80fd53) +] +interface nsIStringInputStream : nsIInputStream +{ + nsresult SetData(const char *data, PRInt32 dataLen); + nsresult AdoptData(char *data, PRInt32 dataLen); + nsresult ShareData(const char *data, PRInt32 dataLen); +} + +[ + object, uuid(07a22cc0-0ce5-11d3-9331-00104ba0fd40) ] interface nsIURI : nsISupports diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ae883a0..7649ee6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -32,6 +32,7 @@ #include "shlguid.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "mshtml_private.h" @@ -221,6 +222,8 @@ static HRESULT WINAPI BindStatusCallback return E_NOTIMPL; } +#undef STATUSCLB_THIS + static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, @@ -238,12 +241,14 @@ static const IBindStatusCallbackVtbl Bin static BindStatusCallback *BindStatusCallback_Create(HTMLDocument *doc, LPOLESTR url) { BindStatusCallback *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindStatusCallback)); + ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; ret->ref = 0; ret->url = url; ret->doc = doc; ret->stream = NULL; IHTMLDocument2_AddRef(HTMLDOC(doc)); + return ret; } @@ -285,6 +290,80 @@ static HRESULT WINAPI PersistMoniker_IsD return E_NOTIMPL; } +static nsIInputStream *get_post_data_stream(IBindCtx *bctx) +{ + nsIInputStream *ret = NULL; + IBindStatusCallback *callback; + IHttpNegotiate *http_negotiate; + BINDINFO bindinfo; + DWORD bindf = 0; + DWORD post_len = 0, headers_len = 0; + LPWSTR headers = NULL; + WCHAR emptystr[] = {0}; + char *data; + HRESULT hres; + + static WCHAR _BSCB_Holder_[] = + {'_','B','S','C','B','_','H','o','l','d','e','r','_',0}; + + + /* FIXME: This should be done in URLMoniker */ + if(!bctx) + return NULL; + + hres = IBindCtx_GetObjectParam(bctx, _BSCB_Holder_, (IUnknown**)&callback); + if(FAILED(hres)) + return NULL; + + hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, + (void**)&http_negotiate); + if(SUCCEEDED(hres)) { + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, emptystr, + emptystr, 0, &headers); + IHttpNegotiate_Release(http_negotiate); + + if(SUCCEEDED(hres) && headers) + headers_len = WideCharToMultiByte(CP_ACP, 0, headers, -1, NULL, 0, NULL, NULL); + } + + memset(&bindinfo, 0, sizeof(bindinfo)); + bindinfo.cbSize = sizeof(bindinfo); + + hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); + + if(SUCCEEDED(hres) && bindinfo.dwBindVerb == BINDVERB_POST) + post_len = bindinfo.cbStgmedData-1; + + if(headers_len || post_len) { + int len = headers_len; + + static const char content_length[] = "Content-Length: %lu\r\n\r\n"; + + data = HeapAlloc(GetProcessHeap(), 0, headers_len+post_len+sizeof(content_length)+8); + + if(headers_len) { + WideCharToMultiByte(CP_ACP, 0, headers, -1, data, -1, NULL, NULL); + CoTaskMemFree(headers); + } + + if(post_len) { + sprintf(data+headers_len-1, content_length, post_len); + len = strlen(data); + + memcpy(data+len, bindinfo.stgmedData.u.hGlobal, post_len); + } + + TRACE("data = %s\n", debugstr_an(data, len+post_len)); + + ret = create_nsstream(data, strlen(data)); + } + + ReleaseBindInfo(&bindinfo); + IBindStatusCallback_Release(callback); + + return ret; +} + static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, IMoniker *pimkName, LPBC pibc, DWORD grfMode) { @@ -358,15 +437,23 @@ static HRESULT WINAPI PersistMoniker_Loa * It uses Gecko's LoadURI instead of IMoniker's BindToStorage. Should we improve * it (to do so we'd have to use not frozen interfaces)? */ + + nsIInputStream *post_data_stream = get_post_data_stream(pibc);; + This->nscontainer->load_call = TRUE; nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, url, - LOAD_FLAGS_NONE, NULL, NULL, NULL); + LOAD_FLAGS_NONE, NULL, post_data_stream, NULL); This->nscontainer->load_call = FALSE; - if(NS_SUCCEEDED(nsres)) + if(post_data_stream) + nsIInputStream_Release(post_data_stream); + + if(NS_SUCCEEDED(nsres)) { + CoTaskMemFree(url); return S_OK; - else + }else { WARN("LoadURI failed: %08lx\n", nsres); + } } /* FIXME: Use grfMode */ @@ -378,6 +465,7 @@ static HRESULT WINAPI PersistMoniker_Loa IBinding_Abort(This->status_callback->binding); callback = This->status_callback = BindStatusCallback_Create(This, url); + CoTaskMemFree(url); if(pibc) { pbind = pibc;

1 0

Jacek Caban : mshtml: Added ref counting to NSContainer.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 4acea60922128283e2b10f2e202fb428206b3abc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4acea60922128283e2b10f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 11:51:44 2006 +0100 mshtml: Added ref counting to NSContainer. - Added ref counting to NSContainer. - Better destroying of NSContainer. --- dlls/mshtml/htmldoc.c | 8 ++ dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/nsembed.c | 135 +++++++++++++++++++++++++++--------------- dlls/mshtml/nsio.c | 2 + 4 files changed, 100 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4acea60922128283e2b…

1 0

Juan Lang : crypt32: Rename a variable for clarity.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: db73ae9e3d81c964d7427a4b38a73c8d1cf1e834 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db73ae9e3d81c964d7427a4… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 15 11:51:24 2006 +0100 crypt32: Rename a variable for clarity. --- dlls/crypt32/cert.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 787f079..c48a5dd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -282,7 +282,7 @@ typedef struct _WINE_STORE_LIST_ENTRY typedef struct _WINE_COLLECTION_CERT_CONTEXT { WINE_CERT_CONTEXT_REF cert; - PWINE_STORE_LIST_ENTRY entry; + PWINE_STORE_LIST_ENTRY storeEntry; PWINE_CERT_CONTEXT_REF childContext; } WINE_COLLECTION_CERT_CONTEXT, *PWINE_COLLECTION_CERT_CONTEXT; @@ -648,7 +648,7 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Coll { /* Initialize to empty for now, just make sure the size is right */ CRYPT_InitCertRef((PWINE_CERT_CONTEXT_REF)ret, context, store); - ret->entry = NULL; + ret->storeEntry = NULL; ret->childContext = NULL; } return (PWINE_CERT_CONTEXT_REF)ret; @@ -705,7 +705,7 @@ static PWINE_COLLECTION_CERT_CONTEXT CRY child->context, store); if (ret) { - ret->entry = storeEntry; + ret->storeEntry = storeEntry; ret->childContext = child; } else @@ -740,7 +740,7 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Coll if (prevEntry) { EnterCriticalSection(&cs->cs); - ret = CRYPT_CollectionAdvanceEnum(cs, prevEntry->entry, prevEntry); + ret = CRYPT_CollectionAdvanceEnum(cs, prevEntry->storeEntry, prevEntry); LeaveCriticalSection(&cs->cs); } else @@ -752,7 +752,7 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Coll storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY, entry); - ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, prevEntry); + ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, NULL); } else {

1 0

Juan Lang : crypt32: Output string type in trace.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 09b6cf971ff1de7574dcb7c18d297cab34bb7922 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09b6cf971ff1de7574dcb7c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 15 11:51:16 2006 +0100 crypt32: Output string type in trace. --- dlls/crypt32/str.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index a35ce21..d34c9da 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -108,7 +108,6 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dw return ret; } - DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, DWORD dwStrType, LPSTR psz, DWORD csz) { @@ -123,7 +122,8 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert BOOL bRet; CERT_NAME_INFO *info; - TRACE("(%ld, %p, %p, %ld)\n", dwCertEncodingType, pName, psz, csz); + TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType, + psz, csz); if (dwStrType & unsupportedFlags) FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags); @@ -219,7 +219,8 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert BOOL bRet; CERT_NAME_INFO *info; - TRACE("(%ld, %p, %p, %ld)\n", dwCertEncodingType, pName, psz, csz); + TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType, + psz, csz); if (dwStrType & unsupportedFlags) FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags);

1 0

Mike McCormack : ole32: Added a test showing OLE storage's IStorage/ IStream refcounting
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 5c3b0df71668ede7c7ea377033bbc8d6a59d650c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c3b0df71668ede7c7ea377… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Feb 15 11:51:05 2006 +0100 ole32: Added a test showing OLE storage's IStorage/IStream refcounting behaviour. --- dlls/ole32/tests/storage32.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index af2b1ba..07aaf11 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -566,6 +566,51 @@ static void test_storage_suminfo(void) DeleteFileW(filename); } +static void test_storage_refcount(void) +{ + static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szDot[] = { '.',0 }; + WCHAR filename[MAX_PATH]; + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + LARGE_INTEGER pos; + ULARGE_INTEGER upos; + STATSTG stat; + + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + return; + + DeleteFileW(filename); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* now create a stream */ + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + todo_wine { + r = IStorage_Release( stg ); + ok (r == 0, "storage not released\n"); + + pos.QuadPart = 0; + r = IStream_Seek( stm, pos, 0, &upos ); + ok (r == STG_E_REVERTED, "seek should fail\n"); + + r = IStream_Stat( stm, &stat, STATFLAG_DEFAULT ); + ok (r == STG_E_REVERTED, "stat should fail\n"); + } + + r = IStream_Release(stm); + ok (r == 0, "stream not released\n"); + + DeleteFileW(filename); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -573,4 +618,5 @@ START_TEST(storage32) test_storage_stream(); test_open_storage(); test_storage_suminfo(); + test_storage_refcount(); }

1 0

Mike McCormack : include: Add WT_ defines for use with RegisterWaitForSingleObject.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: 948c49cbde80268d502ca20775838748f7a69a0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=948c49cbde80268d502ca20… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Feb 15 11:50:58 2006 +0100 include: Add WT_ defines for use with RegisterWaitForSingleObject. --- include/winnt.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5fd19f7..199383b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1774,6 +1774,18 @@ typedef CONTEXT *PCONTEXT; #define MAXIMUM_WAIT_OBJECTS 64 #define MAXIMUM_SUSPEND_COUNT 127 +#define WT_EXECUTEDEFAULT 0x00 +#define WT_EXECUTEINIOTHREAD 0x01 +#define WT_EXECUTEINUITHREAD 0x02 +#define WT_EXECUTEINWAITTHREAD 0x04 +#define WT_EXECUTEONLYONCE 0x08 +#define WT_EXECUTELONGFUNCTION 0x10 +#define WT_EXECUTEINTIMERTHREAD 0x20 +#define WT_EXECUTEINPERSISTENTIOTHREAD 0x40 +#define WT_EXECUTEINPERSISTENTTHREAD 0x80 +#define WT_EXECUTEINLONGTHREAD 0x10 +#define WT_EXECUTEDELETEWAIT 0x08 + /* * From OS/2 2.0 exception handling

1 0

Paul Vriens : winecfg: Update Dutch resources.
by Alexandre Julliard 15 Feb '06

15 Feb '06

Module: wine Branch: refs/heads/master Commit: ae39454d5ad89ca391572511f0d377fa04a39945 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae39454d5ad89ca39157251… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Feb 15 11:50:26 2006 +0100 winecfg: Update Dutch resources. --- programs/winecfg/Nl.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index e935695..6d0e61c 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -175,7 +175,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " Uiterlijk ",IDC_STATIC,8,4,244,106 LTEXT "Thema:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Thema installeren...",IDC_THEME_INSTALL,152,38,93,14 @@ -183,12 +183,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Tekstgrootte:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 /* FIXME */ CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 - EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + CONTROL "Verwijs naar:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,60,13 + EDITTEXT IDC_EDIT_SFPATH,75,195,125,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Bladeren...",IDC_BROWSE_SFPATH,205,195,40,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -197,12 +197,12 @@ BEGIN IDS_TAB_APPLICATIONS "Toepassingen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Stations" - IDS_CHOOSE_PATH "Select the unix target folder, please." + IDS_CHOOSE_PATH "Selecteer a.u.b. de unix map." IDS_HIDE_ADVANCED "Verberg uitgebreid" IDS_SHOW_ADVANCED "Toon uitgebreid" IDS_NOTHEME "(Geen Thema)" IDS_TAB_GRAPHICS "Graphics" /* FIXME */ - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integratie" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "Info" IDS_WINECFG_TITLE "Wine configuratie"

1 0