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

Maarten Lankhorst : includes: Make vmrender.idl C++ friendly.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: a664043e1d1e93bcbe26162616b045c810f3a514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a664043e1d1e93bcbe2616261… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 11 19:52:18 2009 +0200 includes: Make vmrender.idl C++ friendly. C++ doesn't like: GUID GUID; which is valid in C, so replace with struct _GUID GUID; --- include/vmrender.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vmrender.idl b/include/vmrender.idl index 360b5fe..3c3fd7b 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -213,7 +213,7 @@ interface IVMRMixerControl : IUnknown typedef struct tagVMRGUID { - GUID *pGUID, GUID; + struct _GUID *pGUID, GUID; } VMRGUID; #define VMRDEVICENAMELEN 32

1 0

Kai Blin : secur32: Revert "secur32: Work around ntlm_auth in Samba 3.0. 28a being broken for cached credentials".
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: e6ac20e8146b6cd2e7f4e244924384fd41f3adfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ac20e8146b6cd2e7f4e2449… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 11 22:08:02 2009 +0200 secur32: Revert "secur32: Work around ntlm_auth in Samba 3.0.28a being broken for cached credentials". This reverts commit 7788c8ed0d84be2537280c188fb07fb7118b3883, as well as commit ec443be73800258f8c921ace0f15e250617e98f0. Due to erroneous user input, these commits actually broke more than they fixed. --- dlls/secur32/ntlm.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 2f0c5aa..7e44dd7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -471,6 +471,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if((phContext == NULL) && (pInput == NULL)) { static char helper_protocol[] = "--helper-protocol=ntlmssp-client-1"; + static CHAR credentials_argv[] = "--use-cached-creds"; SEC_CHAR *client_argv[5]; int pwlen = 0; @@ -549,10 +550,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } username = ntlm_GetUsernameArg(ui->wkui1_username, -1); - FIXME("using ntlm_auth cached credentials not supported\n"); + TRACE("using cached credentials\n"); client_argv[2] = username; - client_argv[3] = NULL; + client_argv[3] = credentials_argv; client_argv[4] = NULL; } } @@ -644,8 +645,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(fContextReq & ISC_REQ_DELEGATE) ctxt_attr |= ISC_RET_DELEGATE; - /* If no password is given, use an empty password instead. This is the - * SMB way to do "anonymous" authentication. */ + /* If no password is given, try to use cached credentials. Fall back to an empty + * password if this failed. */ if(!password && !ntlm_cred->password) { lstrcpynA(buffer, "OK", max_len-1); @@ -654,17 +655,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( cleanup_helper(helper); goto isc_end; } - /* If the helper replied with "PW", give an empty password. */ + /* If the helper replied with "PW", using cached credentials failed */ if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - lstrcpynA(buffer, "PW AA==", max_len-1); + ret = SEC_E_NO_CREDENTIALS; + goto isc_end; } - else - { - /* Just do a noop on the next run */ + else /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); - } } else {

1 0

Kai Blin : secur32: Load Negotiate provider again.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: dfb2b429a02ba289dc863373652b2ae0db65da4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb2b429a02ba289dc8633736… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 11 22:13:10 2009 +0200 secur32: Load Negotiate provider again. --- dlls/secur32/secur32.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 8f599f0..4171778 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -557,13 +557,11 @@ static void SECUR32_initializeProviders(void) cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* First load built-in providers */ SECUR32_initSchannelSP(); - /* Do not load Negotiate yet. This breaks for some user on the wine-users - * mailing list as of 2006-09-12. Without Negotiate, applications should - * fall back to NTLM and that should work.*/ -#if 0 - SECUR32_initNegotiateSP(); -#endif SECUR32_initNTLMSP(); + /* Load the Negotiate provider last so apps stumble over the working NTLM + * provider first. Attempting to fix bug #16905 while keeping the + * application reported on wine-users on 2006-09-12 working. */ + SECUR32_initNegotiateSP(); /* Now load providers from registry */ apiRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, securityProvidersKeyW, 0, KEY_READ, &key);

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_outerHTML implementation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: fbe9845890fa67ddc2974a879120af416b264c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe9845890fa67ddc2974a879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:17:19 2009 +0200 mshtml: Added IHTMLElement::get_outerHTML implementation. --- dlls/mshtml/htmlelem.c | 22 ++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 26 ++++++++++++++------------ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 170d5a0..84f6309 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -931,8 +931,26 @@ static HRESULT WINAPI HTMLElement_put_outerHTML(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_outerHTML(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString html_str; + HRESULT hres; + + WARN("(%p)->(%p) semi-stub\n", This, p); + + nsAString_Init(&html_str, NULL); + hres = nsnode_to_nsstring(This->node.nsnode, &html_str); + if(SUCCEEDED(hres)) { + const PRUnichar *html; + + nsAString_GetData(&html_str, &html); + *p = SysAllocString(html); + if(!*p) + hres = E_OUTOFMEMORY; + } + + nsAString_Finish(&html_str); + + TRACE("ret %s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLElement_put_outerText(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6f72271..7d21f5e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -562,7 +562,7 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); -void nsnode_to_nsstring(nsIDOMNode*,nsAString*); +HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*); void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); void add_nsevent_listener(NSContainer*,LPCWSTR); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a708fde..d6e3206 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -633,7 +633,7 @@ nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv) return nsres; } -static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode *nsnode, nsAString *str) +static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode *nsnode, nsAString *str) { nsIDOMNodeList *node_list = NULL; PRBool has_children = FALSE; @@ -645,7 +645,7 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsres = nsIDOMNode_GetNodeType(nsnode, &type); if(NS_FAILED(nsres)) { ERR("GetType failed: %08x\n", nsres); - return; + return E_FAIL; } switch(type) { @@ -711,35 +711,37 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIContentSerializer_AppendElementEnd(serializer, nselem, str); nsIDOMElement_Release(nselem); } + + return S_OK; } -void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) +HRESULT nsnode_to_nsstring(nsIDOMNode *nsnode, nsAString *str) { nsIContentSerializer *serializer; - nsIDOMNode *nsnode; nsresult nsres; + HRESULT hres; nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_HTMLSERIALIZER_CONTRACTID, NULL, &IID_nsIContentSerializer, (void**)&serializer); if(NS_FAILED(nsres)) { ERR("Could not get nsIContentSerializer: %08x\n", nsres); - return; + return E_FAIL; } nsres = nsIContentSerializer_Init(serializer, 0, 100, NULL, FALSE, FALSE /* FIXME */); if(NS_FAILED(nsres)) ERR("Init failed: %08x\n", nsres); - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); - nsnode_to_nsstring_rec(serializer, nsnode, str); - nsIDOMNode_Release(nsnode); - - nsres = nsIContentSerializer_Flush(serializer, str); - if(NS_FAILED(nsres)) - ERR("Flush failed: %08x\n", nsres); + hres = nsnode_to_nsstring_rec(serializer, nsnode, str); + if(SUCCEEDED(hres)) { + nsres = nsIContentSerializer_Flush(serializer, str); + if(NS_FAILED(nsres)) + ERR("Flush failed: %08x\n", nsres); + } nsIContentSerializer_Release(serializer); + return hres; } void get_editor_controller(NSContainer *This)

1 0

Jacek Caban : mshtml: Ignore DOCUMENT_TYPE_NODE nodes in nsnode_to_nsstring .
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 60db5edaf5b1d4df5a5e666fd76ba8e5a7236987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60db5edaf5b1d4df5a5e666fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:16:54 2009 +0200 mshtml: Ignore DOCUMENT_TYPE_NODE nodes in nsnode_to_nsstring. --- dlls/mshtml/nsembed.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e70131f..a708fde 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -676,6 +676,9 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIDOMDocument_Release(nsdoc); break; } + case DOCUMENT_TYPE_NODE: + WARN("Ignoring DOCUMENT_TYPE_NODE\n"); + break; case DOCUMENT_FRAGMENT_NODE: break; default:

1 0

Jacek Caban : mshtml: Call IDocHostUIHandler::TranslateUrl from OnURIOpen.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 7a2e3a7b02fe47d6ecb3c9e919acdd007fc18dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2e3a7b02fe47d6ecb3c9e91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:16:31 2009 +0200 mshtml: Call IDocHostUIHandler::TranslateUrl from OnURIOpen. --- dlls/mshtml/nsembed.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0464e05..e70131f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1179,6 +1179,33 @@ static nsrefcnt NSAPI nsURIContentListener_Release(nsIURIContentListener *iface) return nsIWebBrowserChrome_Release(NSWBCHROME(This)); } +static BOOL translate_url(HTMLDocument *doc, nsIWineURI *nsuri) +{ + OLECHAR *new_url = NULL, *url; + BOOL ret = FALSE; + LPCWSTR wine_url; + HRESULT hres; + + if(!doc->hostui) + return FALSE; + + nsIWineURI_GetWineURL(nsuri, &wine_url); + + url = heap_strdupW(wine_url); + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); + heap_free(url); + if(hres != S_OK || !new_url) + return FALSE; + + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + + CoTaskMemFree(new_url); + return ret; +} + static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface, nsIURI *aURI, PRBool *_retval) { @@ -1222,12 +1249,15 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener IMoniker_Release(mon); } + + *_retval = FALSE; + }else if(This->doc) { + *_retval = translate_url(This->doc, wine_uri); } nsIWineURI_Release(wine_uri); - *_retval = FALSE; - return This->content_listener + return !*_retval && This->content_listener ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) : NS_OK; }

1 0

Jacek Caban : mshtml: Don't write null byte in IPersist*::Save functions.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 520f41b2591959c77fa6e51ea45ee1fa475cf976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520f41b2591959c77fa6e51ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:15:59 2009 +0200 mshtml: Don't write null byte in IPersist*::Save functions. --- dlls/mshtml/persist.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index c8a0c57..55bccc2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -337,7 +337,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO return S_OK; } -static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) +static HRESULT get_doc_string(HTMLDocument *This, char **str) { nsIDOMNode *nsnode; LPCWSTR strw; @@ -362,9 +362,7 @@ static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) nsAString_GetData(&nsstr, &strw); TRACE("%s\n", debugstr_w(strw)); - *len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); - *str = heap_alloc(*len); - WideCharToMultiByte(CP_ACP, 0, strw, -1, *str, *len, NULL, NULL); + *str = heap_strdupWtoA(strw); nsAString_Finish(&nsstr); @@ -583,7 +581,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileNam { HTMLDocument *This = PERSISTFILE_THIS(iface); char *str; - DWORD len, written=0; + DWORD written=0; HANDLE file; HRESULT hres; @@ -596,9 +594,9 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileNam return E_FAIL; } - hres = get_doc_string(This, &str, &len); + hres = get_doc_string(This, &str); if(SUCCEEDED(hres)) - WriteFile(file, str, len, &written, NULL); + WriteFile(file, str, strlen(str), &written, NULL); CloseHandle(file); return hres; @@ -698,16 +696,16 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM { HTMLDocument *This = PERSTRINIT_THIS(iface); char *str; - DWORD len, written=0; + DWORD written=0; HRESULT hres; TRACE("(%p)->(%p %x)\n", This, pStm, fClearDirty); - hres = get_doc_string(This, &str, &len); + hres = get_doc_string(This, &str); if(FAILED(hres)) return hres; - hres = IStream_Write(pStm, str, len, &written); + hres = IStream_Write(pStm, str, strlen(str), &written); if(FAILED(hres)) FIXME("Write failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use correct macro in HTMLInputTextElement::get_value.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 0d5899548fa8a235be8a769609ce2fc4d5503c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5899548fa8a235be8a76960… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:15:30 2009 +0200 mshtml: Use correct macro in HTMLInputTextElement::get_value. --- dlls/mshtml/htmlinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index eaffae5..df7cb5f 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -839,7 +839,7 @@ static HRESULT WINAPI HTMLInputTextElement_get_value(IHTMLInputTextElement *ifac TRACE("(%p)->(%p)\n", This, p); - return IHTMLInputTextElement_get_value(HTMLINPUT(This), p); + return IHTMLInputElement_get_value(HTMLINPUT(This), p); } static HRESULT WINAPI HTMLInputTextElement_put_name(IHTMLInputTextElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IBindStatusCallback::OnResponse implementation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 3768ae73365175f8bf32639ec0a11edda413c49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3768ae73365175f8bf32639ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:15:07 2009 +0200 mshtml: Added IBindStatusCallback::OnResponse implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/nsio.c | 7 ++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6ab70f2..6f72271 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -377,6 +377,7 @@ typedef struct { nsIURI *original_uri; char *content_type; char *charset; + PRUint32 response_status; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8b1b27e..ad3abc5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -58,6 +58,7 @@ typedef struct { HRESULT (*stop_binding)(BSCallback*,HRESULT); HRESULT (*read_data)(BSCallback*,IStream*); HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); + HRESULT (*on_response)(BSCallback*,DWORD); } BSCallbackVtbl; struct BSCallback { @@ -473,9 +474,11 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) { BSCallback *This = HTTPNEG_THIS(iface); - FIXME("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - return E_NOTIMPL; + + return This->vtbl->on_response(This, dwResponseCode); } static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, @@ -798,6 +801,11 @@ static HRESULT BufferBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR return S_OK; } +static HRESULT BufferBSC_on_response(BSCallback *bsc, DWORD response_code) +{ + return S_OK; +} + #undef BUFFERBSC_THIS static const BSCallbackVtbl BufferBSCVtbl = { @@ -806,6 +814,7 @@ static const BSCallbackVtbl BufferBSCVtbl = { BufferBSC_stop_binding, BufferBSC_read_data, BufferBSC_on_progress, + BufferBSC_on_response }; @@ -887,6 +896,10 @@ 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)) @@ -1009,6 +1022,14 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW return S_OK; } +static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code) +{ + nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + + This->nschannel->response_status = response_code; + return S_OK; +} + #undef NSCHANNELBSC_THIS static const BSCallbackVtbl nsChannelBSCVtbl = { @@ -1017,6 +1038,7 @@ static const BSCallbackVtbl nsChannelBSCVtbl = { nsChannelBSC_stop_binding, nsChannelBSC_read_data, nsChannelBSC_on_progress, + nsChannelBSC_on_response }; nsChannelBSC *create_channelbsc(IMoniker *mon) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7c402b2..087afdf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -980,10 +980,15 @@ static nsresult NSAPI nsChannel_GetResponseStatus(nsIHttpChannel *iface, PRUint3 TRACE("(%p)->(%p)\n", This, aResponseStatus); + if(This->response_status) { + *aResponseStatus = This->response_status; + return NS_OK; + } + if(This->http_channel) return nsIHttpChannel_GetResponseStatus(This->http_channel, aResponseStatus); - return NS_ERROR_NOT_IMPLEMENTED; + return NS_ERROR_UNEXPECTED; } static nsresult NSAPI nsChannel_GetResponseStatusText(nsIHttpChannel *iface,

1 0

Jacek Caban : mshtml: Added support for partial reads in read_stream_data.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 902829ea70b6ef9a25954e3c061c997c46f58b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902829ea70b6ef9a25954e3c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:14:48 2009 +0200 mshtml: Added support for partial reads in read_stream_data. --- dlls/mshtml/navigate.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb743f4..8b1b27e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -854,12 +854,12 @@ struct nsChannelBSC { static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { + DWORD read; nsresult nsres; HRESULT hres; if(!This->nslistener) { BYTE buf[1024]; - DWORD read; do { read = 0; @@ -873,17 +873,20 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) This->nsstream = create_nsprotocol_stream(); do { - hres = IStream_Read(stream, This->nsstream->buf, sizeof(This->nsstream->buf), - &This->nsstream->buf_size); - if(!This->nsstream->buf_size) + read = 0; + hres = IStream_Read(stream, This->nsstream->buf+This->nsstream->buf_size, + sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); + if(!read) break; - if(!This->bsc.readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { - This->nschannel->charset = heap_alloc(sizeof(UTF16_STR)); - memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); - } + This->nsstream->buf_size += read; if(!This->bsc.readed) { + if(This->nsstream->buf_size >= 2 + && (BYTE)This->nsstream->buf[0] == 0xff + && (BYTE)This->nsstream->buf[1] == 0xfe) + This->nschannel->charset = heap_strdupA(UTF16_STR); + nsres = nsIStreamListener_OnStartRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); if(NS_FAILED(nsres)) @@ -905,8 +908,10 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); - if(This->nsstream->buf_size) - FIXME("buffer is not empty!\n"); + if(This->nsstream->buf_size == sizeof(This->nsstream->buf)) { + ERR("buffer is full\n"); + break; + } }while(hres == S_OK); return S_OK;

1 0