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

Jacek Caban : mshtml: Added nsIChannel::GetRequestHeader implementation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 753ecebe9b74b30338add85b8c6f210d0889cb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753ecebe9b74b30338add85b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:39:49 2010 +0200 mshtml: Added nsIChannel::GetRequestHeader implementation. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 09e125f..019bc61 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1051,9 +1051,9 @@ static nsresult NSAPI nsChannel_GetRequestHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_nsacstr(aHeader), _retval); + TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aHeader), _retval); - return NS_ERROR_NOT_IMPLEMENTED; + return get_channel_http_header(&This->request_headers, aHeader, _retval); } static nsresult NSAPI nsChannel_SetRequestHeader(nsIHttpChannel *iface,

1 0

Thomas Mullaly : urlmon: Implemented a parser for URI query strings.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 36b1006c6b30a3fc5ca1ffe066b98c226cbb9ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b1006c6b30a3fc5ca1ffe06… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 26 20:30:21 2010 -0400 urlmon: Implemented a parser for URI query strings. --- dlls/urlmon/tests/uri.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 47 +++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index be43751..9a0e6ff 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2861,6 +2861,66 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* Unknown scheme types can have invalid % encoded data in query string. */ + { "zip://www.winehq.org/tests/..?query=%xx&return=y", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN|Uri_HAS_HOST| + Uri_HAS_DOMAIN|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"zip://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/?query=%xx&return=y",S_OK,TRUE}, + {"?query=%xx&return=y",S_OK,TRUE}, + {"zip://www.winehq.org/tests/..?query=%xx&return=y",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } + }, + /* Known scheme types can have invalid % encoded data with the right flags. */ + { "http://www.winehq.org/tests/..?query=%xx&return=y", Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN|Uri_HAS_HOST| + Uri_HAS_DOMAIN|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_PORT|Uri_HAS_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"http://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"http://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/?query=%xx&return=y",S_OK,TRUE}, + {"?query=%xx&return=y",S_OK,TRUE}, + {"http://www.winehq.org/tests/..?query=%xx&return=y",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {80,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } } }; @@ -2913,7 +2973,9 @@ static const invalid_uri invalid_uri_tests[] = { {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE}, /* Not allowed to have invalid % encoded data in opaque URI path. */ {"news:test%XX",0,FALSE}, - {"mailto:wine(a)winehq%G8.com",0,FALSE} + {"mailto:wine(a)winehq%G8.com",0,FALSE}, + /* Known scheme types can't have invalid % encoded data in query string. */ + {"http://google.com/?query=te%xx",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4950331..c63cffa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -120,6 +120,9 @@ typedef struct { const WCHAR *path; DWORD path_len; + + const WCHAR *query; + DWORD query_len; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -1738,6 +1741,45 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Attempts to parse the query string from the URI. + * + * NOTES: + * If NO_DECODE_EXTRA_INFO flag is set, then invalid percent encoded + * data is allowed appear in the query string. For unknown scheme types + * invalid percent encoded data is allowed to appear reguardless. + */ +static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + + if(**ptr != '?') { + TRACE("(%p %p %x): URI didn't contain a query string.\n", ptr, data, flags); + return TRUE; + } + + data->query = *ptr; + + ++(*ptr); + while(**ptr && **ptr != '#') { + if(**ptr == '%' && known_scheme && + !(flags & Uri_CREATE_NO_DECODE_EXTRA_INFO)) { + if(!check_pct_encoded(ptr)) { + *ptr = data->query; + data->query = NULL; + return FALSE; + } else + continue; + } + + ++(*ptr); + } + + data->query_len = *ptr - data->query; + + TRACE("(%p %p %x): Parsed query string %s len=%d\n", ptr, data, flags, + debugstr_wn(data->query, data->query_len), data->query_len); + return TRUE; +} + /* Parses and validates the components of the specified by data->uri * and stores the information it parses into 'data'. * @@ -1758,7 +1800,10 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_hierpart(pptr, data, flags)) return FALSE; - /* TODO: Parse query and fragment (if the URI has one). */ + if(!parse_query(pptr, data, flags)) + return FALSE; + + /* TODO: Parse fragment (if the URI has one). */ TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE;

1 0

Sven Baars : shdocvw: Update the Dutch translation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 811c705ad9e81f2131ea3b6583569f4b897dacc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811c705ad9e81f2131ea3b658… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Aug 3 21:50:32 2010 +0200 shdocvw: Update the Dutch translation. --- dlls/shdocvw/Nl.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc index 2237c5f..418a36d 100644 --- a/dlls/shdocvw/Nl.rc +++ b/dlls/shdocvw/Nl.rc @@ -60,3 +60,18 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Terug" + IDS_TB_FORWARD "Vooruit" + IDS_TB_STOP "Stoppen" + IDS_TB_REFRESH "Vernieuwen" + IDS_TB_HOME "Startpagina" + IDS_TB_PRINT "Printen" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adres" +}

1 0

Jacek Caban : mshtml: Added support for custom post data type.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 22679a2419597fd65de45a3b0c4c132623bf2a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22679a2419597fd65de45a3b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:40:56 2010 +0200 mshtml: Added support for custom post data type. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 71 +++++++++++++++++++++++++++++++---------- dlls/mshtml/nsio.c | 24 +++++++++++--- 3 files changed, 73 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1e7bac8..2db2410 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -462,6 +462,7 @@ typedef struct { nsWineURI *uri; nsIInputStream *post_data_stream; + BOOL parse_stream; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; nsISupports *owner; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 239fbea..5cd63c1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 Jacek Caban for CodeWeavers + * Copyright 2006-2010 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 @@ -679,20 +679,48 @@ static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) return S_OK; } +static HRESULT read_post_data_stream(nsIInputStream *stream, HGLOBAL *post_data, + ULONG *post_data_len) +{ + PRUint32 data_len = 0, available = 0; + char *data; + nsresult nsres; + + nsres = nsIInputStream_Available(stream, &available); + if(NS_FAILED(nsres)) + return E_FAIL; + + data = GlobalAlloc(0, available+1); + if(!data) + return E_OUTOFMEMORY; + + nsres = nsIInputStream_Read(stream, data, available, &data_len); + if(NS_FAILED(nsres)) { + GlobalFree(data); + return E_FAIL; + } + + data[data_len] = 0; + *post_data = data; + *post_data_len = data_len; + return S_OK; +} + static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, HGLOBAL *post_data_ret, ULONG *post_data_len_ret) { - PRUint32 post_data_len = 0, available = 0; + ULONG post_data_len; HGLOBAL post_data = NULL; LPWSTR headers = NULL; DWORD headers_len = 0, len; const char *ptr, *ptr2, *post_data_end; - - nsIInputStream_Available(post_data_stream, &available); - post_data = GlobalAlloc(0, available+1); - nsIInputStream_Read(post_data_stream, post_data, available, &post_data_len); + HRESULT hres; - TRACE("post_data = %s\n", debugstr_an(post_data, post_data_len)); + hres = read_post_data_stream(post_data_stream, &post_data, &post_data_len); + if(FAILED(hres)) { + FIXME("read_post_data_stream failed: %08x\n", hres); + return; + } ptr = ptr2 = post_data; post_data_end = (const char*)post_data+post_data_len; @@ -1088,20 +1116,27 @@ static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { - WCHAR *headers; - HRESULT hres; + if(This->nschannel->parse_stream) { + WCHAR *headers; - parse_post_data(This->nschannel->post_data_stream, &headers, &This->bsc.post_data, &This->bsc.post_data_len); + parse_post_data(This->nschannel->post_data_stream, &headers, + &This->bsc.post_data, &This->bsc.post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(headers), - debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); + hres = parse_headers(headers, &This->nschannel->request_headers); + heap_free(headers); + if(FAILED(hres)) + return hres; + }else { + hres = read_post_data_stream(This->nschannel->post_data_stream, + &This->bsc.post_data, &This->bsc.post_data_len); + if(FAILED(hres)) + return hres; + } - hres = parse_headers(headers, &This->nschannel->request_headers); - heap_free(headers); - if(FAILED(hres)) - return hres; + TRACE("post_data = %s\n", debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); } return S_OK; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 13dbc44..d288a6b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1323,17 +1323,31 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, nsChannel *This = NSUPCHANNEL_THIS(iface); const char *content_type; - TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); + static const WCHAR content_typeW[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',0}; - if(This->post_data_stream) - nsIInputStream_Release(This->post_data_stream); + TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); + This->parse_stream = TRUE; if(aContentType) { nsACString_GetData(aContentType, &content_type); - if(*content_type) - FIXME("Unsupported aContentType argument: %s\n", debugstr_a(content_type)); + if(*content_type) { + WCHAR *ct; + + ct = heap_strdupAtoW(content_type); + if(!ct) + return NS_ERROR_UNEXPECTED; + + set_http_header(&This->request_headers, content_typeW, + sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); + heap_free(ct); + This->parse_stream = FALSE; + } } + if(This->post_data_stream) + nsIInputStream_Release(This->post_data_stream); + if(aContentLength != -1) FIXME("Unsupported acontentLength = %d\n", aContentLength);

1 0

Jacek Caban : mshtml: Added nsIChannel::GetRequestMethod implementation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: ac65368835a668c6760905cade95274ab94ef05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac65368835a668c6760905cad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:40:30 2010 +0200 mshtml: Added nsIChannel::GetRequestMethod implementation. --- dlls/mshtml/nsio.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index db6b9eb..13dbc44 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1041,9 +1041,10 @@ static nsresult NSAPI nsChannel_GetRequestMethod(nsIHttpChannel *iface, nsACStri { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aRequestMethod); + TRACE("(%p)->(%p)\n", This, aRequestMethod); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_SetData(aRequestMethod, request_method_strings[This->request_method]); + return NS_OK; } static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface,

1 0

Jacek Caban : mshtml: Store request method in nsChannel.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 0085383fc765fb10624de4423df074b404bae099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0085383fc765fb10624de4423… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:40:20 2010 +0200 mshtml: Store request method in nsChannel. --- dlls/mshtml/mshtml_private.h | 8 ++++++++ dlls/mshtml/nsio.c | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fcdb792..1e7bac8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -446,6 +446,13 @@ typedef struct nsWineURI nsWineURI; HRESULT set_wine_url(nsWineURI*,LPCWSTR); nsresult on_start_uri_open(NSContainer*,nsIURI*,PRBool*); +/* Keep sync with request_method_strings in nsio.c */ +typedef enum { + METHOD_GET, + METHOD_PUT, + METHOD_POST +} REQUEST_METHOD; + typedef struct { const nsIHttpChannelVtbl *lpHttpChannelVtbl; const nsIUploadChannelVtbl *lpUploadChannelVtbl; @@ -463,6 +470,7 @@ typedef struct { char *content_type; char *charset; PRUint32 response_status; + REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; UINT url_scheme; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 24b14c3..db6b9eb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 Jacek Caban for CodeWeavers + * Copyright 2006-2010 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 @@ -51,6 +51,8 @@ static nsINetUtil *net_util; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +static const char *request_method_strings[] = {"GET", "PUT", "POST"}; + struct nsWineURI { const nsIURLVtbl *lpIURLVtbl; @@ -1048,10 +1050,21 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, const nsACString *aRequestMethod) { nsChannel *This = NSCHANNEL_THIS(iface); + const char *method; + unsigned i; - TRACE("(%p)->(%s): Returning NS_OK\n", This, debugstr_nsacstr(aRequestMethod)); + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRequestMethod)); - return NS_OK; + nsACString_GetData(aRequestMethod, &method); + for(i=0; i < sizeof(request_method_strings)/sizeof(*request_method_strings); i++) { + if(!strcasecmp(method, request_method_strings[i])) { + This->request_method = i; + return NS_OK; + } + } + + ERR("Invalid method %s\n", debugstr_a(method)); + return NS_ERROR_UNEXPECTED; } static nsresult NSAPI nsChannel_GetReferrer(nsIHttpChannel *iface, nsIURI **aReferrer) @@ -1329,6 +1342,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, if(aStream) nsIInputStream_AddRef(aStream); + This->request_method = METHOD_POST; return NS_OK; } @@ -2640,6 +2654,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI ret->lpIHttpChannelInternalVtbl = &nsHttpChannelInternalVtbl; ret->ref = 1; ret->uri = wine_uri; + ret->request_method = METHOD_GET; list_init(&ret->response_headers); list_init(&ret->request_headers);

1 0

Jacek Caban : mshtml: Allow customization of BeginningTransaction.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 508aec93c103f0e02eb5105707dfa3dcd98eb8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508aec93c103f0e02eb510570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:39:04 2010 +0200 mshtml: Allow customization of BeginningTransaction. --- dlls/mshtml/navigate.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3f83456..fc37f4d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -63,6 +63,7 @@ typedef struct { HRESULT (*read_data)(BSCallback*,IStream*); HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); HRESULT (*on_response)(BSCallback*,DWORD,LPCWSTR); + HRESULT (*beginning_transaction)(BSCallback*,WCHAR**); } BSCallbackVtbl; struct BSCallback { @@ -468,19 +469,26 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { BSCallback *This = HTTPNEG_THIS(iface); - DWORD size; + HRESULT hres; TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); - if(!This->headers) { - *pszAdditionalHeaders = NULL; - return S_OK; - } + *pszAdditionalHeaders = NULL; - size = (strlenW(This->headers)+1)*sizeof(WCHAR); - *pszAdditionalHeaders = CoTaskMemAlloc(size); - memcpy(*pszAdditionalHeaders, This->headers, size); + hres = This->vtbl->beginning_transaction(This, pszAdditionalHeaders); + if(hres != S_FALSE) + return hres; + + if(This->headers) { + DWORD size; + + size = (strlenW(This->headers)+1)*sizeof(WCHAR); + *pszAdditionalHeaders = CoTaskMemAlloc(size); + if(!*pszAdditionalHeaders) + return E_OUTOFMEMORY; + memcpy(*pszAdditionalHeaders, This->headers, size); + } return S_OK; } @@ -864,6 +872,11 @@ static HRESULT BufferBSC_on_response(BSCallback *bsc, DWORD response_code, return S_OK; } +static HRESULT BufferBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) +{ + return S_FALSE; +} + #undef BUFFERBSC_THIS static const BSCallbackVtbl BufferBSCVtbl = { @@ -873,7 +886,8 @@ static const BSCallbackVtbl BufferBSCVtbl = { BufferBSC_stop_binding, BufferBSC_read_data, BufferBSC_on_progress, - BufferBSC_on_response + BufferBSC_on_response, + BufferBSC_beginning_transaction }; @@ -1158,6 +1172,11 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, return S_OK; } +static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) +{ + return S_FALSE; +} + #undef NSCHANNELBSC_THIS static const BSCallbackVtbl nsChannelBSCVtbl = { @@ -1167,7 +1186,8 @@ static const BSCallbackVtbl nsChannelBSCVtbl = { nsChannelBSC_stop_binding, nsChannelBSC_read_data, nsChannelBSC_on_progress, - nsChannelBSC_on_response + nsChannelBSC_on_response, + nsChannelBSC_beginning_transaction }; HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD post_data_size, nsChannelBSC **retval)

1 0

Jacek Caban : mshtml: Moved headers parsing to separated function.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 8ca78fa171b0d57b9d7fb9d710939529c2831c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca78fa171b0d57b9d7fb9d71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:38:53 2010 +0200 mshtml: Moved headers parsing to separated function. --- dlls/mshtml/navigate.c | 73 +++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 935a3b9..3f83456 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -638,6 +638,39 @@ static void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } +static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) +{ + const WCHAR *header, *header_end, *colon, *value; + HRESULT hres; + + header = headers; + while(*header) { + if(header[0] == '\r' && header[1] == '\n' && !header[2]) + break; + for(colon = header; *colon && *colon != ':' && *colon != '\r'; colon++); + if(*colon != ':') + return E_FAIL; + + value = colon+1; + while(*value == ' ') + value++; + if(!*value) + return E_FAIL; + + for(header_end = value+1; *header_end && *header_end != '\r'; header_end++); + + hres = set_http_header(headers_list, header, colon-header, value, header_end-value); + if(FAILED(hres)) + return hres; + + header = header_end; + if(header[0] == '\r' && header[1] == '\n') + header += 2; + } + + return S_OK; +} + static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, HGLOBAL *post_data_ret, ULONG *post_data_len_ret) { @@ -1109,38 +1142,16 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, This->nschannel->response_status = response_code; if(response_headers) { - const WCHAR *hdr_start, *hdr_end; - - hdr_start = strchrW(response_headers, '\r'); - while(hdr_start) { - const WCHAR *colon, *value; - - hdr_start += 2; - hdr_end = strchrW(hdr_start, '\r'); - if(!hdr_end) { - WARN("Header doesn't end with CRLF: %s\n", wine_dbgstr_w(hdr_start)); - break; - } - if(hdr_end == hdr_start) - break; - - for(colon = hdr_start; *colon != ':' && colon != hdr_end; ++colon); - if(*colon != ':') { - WARN("Header missing colon: %s\n", wine_dbgstr_w(hdr_start)); - hdr_start = strchrW(hdr_start, '\r'); - continue; - } - - value = colon+1; - while(*value == ' ') - value++; - - hres = set_http_header(&This->nschannel->response_headers, hdr_start, colon-hdr_start, - value, hdr_end-value); - if(FAILED(hres)) + const WCHAR *headers; + + headers = strchrW(response_headers, '\r'); + if(headers && headers[1] == '\n') { + headers += 2; + hres = parse_headers(headers, &This->nschannel->response_headers); + if(FAILED(hres)) { + WARN("parsing headers failed: %08x\n", hres); return hres; - - hdr_start = strchrW(hdr_start, '\r'); + } } }

1 0

Jacek Caban : mshtml: Moved setting HTTP header to separated function.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 6ae84b0b911659196c1eb84045332e7c3716c000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae84b0b911659196c1eb8404… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:38:37 2010 +0200 mshtml: Moved setting HTTP header to separated function. --- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/navigate.c | 40 +++++++++------------------------------- dlls/mshtml/nsio.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5067b66..d1d0d05 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -467,12 +467,14 @@ typedef struct { UINT url_scheme; } nsChannel; -typedef struct ResponseHeader { +typedef struct { struct list entry; WCHAR *header; WCHAR *data; } http_header_t; +HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int); + typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e477989..935a3b9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1104,6 +1104,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, LPCWSTR response_headers) { nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + HRESULT hres; This->nschannel->response_status = response_code; @@ -1112,9 +1113,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, hdr_start = strchrW(response_headers, '\r'); while(hdr_start) { - const WCHAR *colon; - struct ResponseHeader *new_header; - int len; + const WCHAR *colon, *value; hdr_start += 2; hdr_end = strchrW(hdr_start, '\r'); @@ -1132,35 +1131,14 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, continue; } - new_header = heap_alloc(sizeof(struct ResponseHeader)); - if(!new_header) - return E_OUTOFMEMORY; - - len = colon - hdr_start; - new_header->header = heap_alloc((len + 1) * sizeof(WCHAR)); - if(!new_header->header) { - heap_free(new_header); - return E_OUTOFMEMORY; - } - memcpy(new_header->header, hdr_start, len * sizeof(WCHAR)); - new_header->header[len] = 0; - - colon++; - while(*colon == ' ') - colon++; - - len = hdr_end - colon; - new_header->data = heap_alloc((len + 1) * sizeof(WCHAR)); - if(!new_header->data) { - heap_free(new_header->header); - heap_free(new_header); - return E_OUTOFMEMORY; - } - memcpy(new_header->data, colon, len * sizeof(WCHAR)); - new_header->data[len] = 0; + value = colon+1; + while(*value == ' ') + value++; - list_add_head(&This->nschannel->response_headers, &new_header->entry); - TRACE("Adding header to list: (%s):(%s)\n", wine_dbgstr_w(new_header->header), wine_dbgstr_w(new_header->data)); + hres = set_http_header(&This->nschannel->response_headers, hdr_start, colon-hdr_start, + value, hdr_end-value); + if(FAILED(hres)) + return hres; hdr_start = strchrW(hdr_start, '\r'); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fa0aa8d..9bef7f0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -350,6 +350,43 @@ static nsresult get_channel_http_header(struct list *headers, const nsACString * return NS_OK; } +HRESULT set_http_header(struct list *headers, const WCHAR *name, int name_len, + const WCHAR *value, int value_len) +{ + http_header_t *header; + + TRACE("%s: %s\n", debugstr_wn(name, name_len), debugstr_wn(value, value_len)); + + header = find_http_header(headers, name, name_len); + if(header) { + WCHAR *new_data; + + new_data = heap_strndupW(value, value_len); + if(!new_data) + return E_OUTOFMEMORY; + + heap_free(header->data); + header->data = new_data; + }else { + header = heap_alloc(sizeof(http_header_t)); + if(!header) + return E_OUTOFMEMORY; + + header->header = heap_strndupW(name, name_len); + header->data = heap_strndupW(value, value_len); + if(!header->header || !header->data) { + heap_free(header->header); + heap_free(header->data); + heap_free(header); + return E_OUTOFMEMORY; + } + + list_add_tail(headers, &header->entry); + } + + return S_OK; +} + static void free_http_headers(struct list *list) { http_header_t *iter, *iter_next;

1 0

Jacek Caban : mshtml: Moved getting HTTP header to separated function.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: b1c6f41da9db7e7b832ce2246378403b367883bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c6f41da9db7e7b832ce2246… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:38:11 2010 +0200 mshtml: Moved getting HTTP header to separated function. --- dlls/mshtml/mshtml_private.h | 13 ++++++++ dlls/mshtml/nsio.c | 65 +++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4f0df7d..5067b66 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -943,6 +943,19 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strndupW(LPCWSTR str, unsigned len) +{ + LPWSTR ret = NULL; + + if(str) { + ret = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } + + return ret; +} + static inline char *heap_strdupA(const char *str) { char *ret = NULL; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8d4fe0a..fa0aa8d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -311,6 +311,45 @@ static inline BOOL is_http_channel(nsChannel *This) return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; } +static http_header_t *find_http_header(struct list *headers, const WCHAR *name, int len) +{ + http_header_t *iter; + + LIST_FOR_EACH_ENTRY(iter, headers, http_header_t, entry) { + if(!strcmpiW(iter->header, name)) + return iter; + } + + return NULL; +} + +static nsresult get_channel_http_header(struct list *headers, const nsACString *header_name_str, + nsACString *_retval) +{ + const char *header_namea; + http_header_t *header; + WCHAR *header_name; + char *data; + + nsACString_GetData(header_name_str, &header_namea); + header_name = heap_strdupAtoW(header_namea); + if(!header_name) + return NS_ERROR_UNEXPECTED; + + header = find_http_header(headers, header_name, strlenW(header_name)); + heap_free(header_name); + if(!header) + return NS_ERROR_NOT_AVAILABLE; + + data = heap_strdupWtoA(header->data); + if(!data) + return NS_ERROR_UNEXPECTED; + + nsACString_SetData(_retval, data); + heap_free(data); + return NS_OK; +} + static void free_http_headers(struct list *list) { http_header_t *iter, *iter_next; @@ -1079,34 +1118,10 @@ static nsresult NSAPI nsChannel_GetResponseHeader(nsIHttpChannel *iface, const nsACString *header, nsACString *_retval) { nsChannel *This = NSCHANNEL_THIS(iface); - const char *header_str; - WCHAR *header_wstr; - struct ResponseHeader *this_header; TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(header), _retval); - nsACString_GetData(header, &header_str); - header_wstr = heap_strdupAtoW(header_str); - if(!header_wstr) - return NS_ERROR_UNEXPECTED; - - LIST_FOR_EACH_ENTRY(this_header, &This->response_headers, struct ResponseHeader, entry) { - if(!strcmpW(this_header->header, header_wstr)) { - char *data = heap_strdupWtoA(this_header->data); - if(!data) { - heap_free(header_wstr); - return NS_ERROR_UNEXPECTED; - } - nsACString_SetData(_retval, data); - heap_free(data); - heap_free(header_wstr); - return NS_OK; - } - } - - heap_free(header_wstr); - - return NS_ERROR_NOT_AVAILABLE; + return get_channel_http_header(&This->response_headers, header, _retval); } static nsresult NSAPI nsChannel_SetResponseHeader(nsIHttpChannel *iface,

1 0