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

Jacek Caban : mshtml: Store request method in nsChannel.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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: Added nsIChannel::GetRequestMethod implementation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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: Added support for custom post data type.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Sven Baars : shdocvw: Update the Dutch translation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Thomas Mullaly : urlmon: Implemented a parser for URI query strings.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Thomas Mullaly : urlmon: Implemented canonicalization of query strings.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: fdfcfc6aa05ea03138ce298f85906448b2ee9fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfcfc6aa05ea03138ce298f8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:03:47 2010 -0400 urlmon: Implemented canonicalization of query strings. --- dlls/urlmon/tests/uri.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 74 +++++++++++++++++ 2 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdfcfc6aa05ea03138ce2…

1 0

Aurimas Fišeras : shdocvw: Updated Lithuanian translation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 35e60aa3e06ab603f2a0ae567b5a40b282a960b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e60aa3e06ab603f2a0ae567… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 2 19:30:22 2010 +0300 shdocvw: Updated Lithuanian translation. --- dlls/shdocvw/Lt.rc | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc index e35a2d8..16074b6 100644 --- a/dlls/shdocvw/Lt.rc +++ b/dlls/shdocvw/Lt.rc @@ -28,7 +28,7 @@ STYLE DS_MODALFRAME | WS_CAPTION CAPTION "Atverti URL" FONT 8, "MS Shell Dlg" { - LTEXT "Nurodykite URL, kurį norite atverti su Internet Explorer",-1,30, 5, 150,15 + LTEXT "Nurodykite URL, kurį norite atverti su interneto naršykle",-1,30, 5, 150,15 LTEXT "Atverti:", -1, 2, 32, 25, 15 EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 160, 13 DEFPUSHBUTTON "&Gerai", IDOK, 30, 50, 50, 15 @@ -53,8 +53,28 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES } + POPUP "&Adresynas" + { + MENUITEM "Į&rašyti į adresyną..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Žinynas" { - MENUITEM "&Apie Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "&Apie interneto naršyklę...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Atgal" + IDS_TB_FORWARD "Pirmyn" + IDS_TB_STOP "Stabdyti" + IDS_TB_REFRESH "Atnaujinti" + IDS_TB_HOME "Pradžia" + IDS_TB_PRINT "Spausdinti" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresas" +}

1 0

Andrew Eikum : shell32: Add tests for SHChangeNotify functions.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 9f37536d6aa9cd53a77293e3c491295b0aeeab74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f37536d6aa9cd53a77293e3c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 3 14:23:43 2010 -0500 shell32: Add tests for SHChangeNotify functions. --- dlls/shell32/tests/shlfolder.c | 166 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 482a31d..6c0b6f2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3706,6 +3706,171 @@ static void test_ParseDisplayNamePBC(void) IShellFolder_Release(psf); } +static const CHAR testwindow_class[] = "testwindow"; +#define WM_USER_NOTIFY (WM_APP+1) + +static struct { + const char *id; + BOOL exp_notify; + UINT signal; + const WCHAR *path_1; + const WCHAR *path_2; +} exp_data; + +static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + UINT signal = (UINT)lparam; + + switch(msg){ + case WM_USER_NOTIFY: + if(exp_data.exp_notify){ + LPCITEMIDLIST *pidls = (LPCITEMIDLIST*)wparam; + + ok(exp_data.signal == signal, + "%s: expected notification type %x, got: %x\n", + exp_data.id, exp_data.signal, signal); + + trace("verifying pidls for: %s\n", exp_data.id); + verify_pidl(pidls[0], exp_data.path_1); + verify_pidl(pidls[1], exp_data.path_2); + + exp_data.exp_notify = FALSE; + }else + ok(exp_data.exp_notify, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); + return 0; + } + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +static void register_testwindow_class(void) +{ + WNDCLASSEXA cls; + ATOM ret; + + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = 0; + cls.lpfnWndProc = testwindow_wndproc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = testwindow_class; + + SetLastError(0); + ret = RegisterClassExA(&cls); + ok(ret != 0, "RegisterClassExA failed: %d\n", GetLastError()); +} + +/* SHCNF_FLUSH doesn't seem to work as advertised for SHCNF_PATHA, so we + * have to poll repeatedly for the message to appear */ +static void do_events(void) +{ + int c = 0; + while (exp_data.exp_notify && (c++ < 10)){ + MSG msg; + while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + if(exp_data.exp_notify) + Sleep(500); + } + trace("%s: took %d tries\n", exp_data.id, c); +} + +static void test_SHChangeNotify(void) +{ + HWND wnd; + ULONG notifyID; + HRESULT hr; + BOOL br, has_unicode; + SHChangeNotifyEntry entries[1]; + const CHAR root_dirA[] = "C:\\shell32_cn_test"; + const WCHAR root_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t',0}; + const CHAR test_dirA[] = "C:\\shell32_cn_test\\test"; + const WCHAR test_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','\\','t','e','s','t',0}; + + CreateDirectoryW(NULL, NULL); + has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + + /* set up the root directory & window */ + br = CreateDirectoryA(root_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + + register_testwindow_class(); + + wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, + CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, + NULL, NULL, GetModuleHandleA(NULL), 0); + ok(wnd != NULL, "Failed to make a window\n"); + + entries[0].pidl = NULL; + if(has_unicode) + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + else + hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister(wnd, SHCNRF_ShellLevel, + SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* MKDIR */ + br = CreateDirectoryA(test_dirA, NULL); + ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); + + if(has_unicode){ + exp_data.id = "MKDIR PATHW"; + exp_data.signal = SHCNE_MKDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + }else + win_skip("skipping WCHAR tests\n"); + + exp_data.id = "MKDIR PATHA"; + exp_data.signal = SHCNE_MKDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + + /* RMDIR */ + br = RemoveDirectoryA(test_dirA); + ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); + + if(has_unicode){ + exp_data.id = "RMDIR PATHW"; + exp_data.signal = SHCNE_RMDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW | SHCNF_FLUSH, test_dirW, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + }else + win_skip("skipping WCHAR tests\n"); + + exp_data.id = "RMDIR PATHA"; + exp_data.signal = SHCNE_RMDIR; + exp_data.exp_notify = TRUE; + exp_data.path_1 = test_dirW; + exp_data.path_2 = NULL; + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHA | SHCNF_FLUSH, test_dirA, NULL); + do_events(); + ok(exp_data.exp_notify == FALSE, "Expected wndproc to be called\n"); + + SHChangeNotifyDeregister(notifyID); + DestroyWindow(wnd); + + br = RemoveDirectoryA(root_dirA); + ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -3736,6 +3901,7 @@ START_TEST(shlfolder) test_SHGetIDListFromObject(); test_SHGetItemFromObject(); test_ShellItemCompare(); + test_SHChangeNotify(); OleUninitialize(); }

1 0

Jacek Caban : mshtml: Moved HTTP headers list freeing to separated function .
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: dd0894c7ab10d2648afff4afeec56091cddad4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0894c7ab10d2648afff4afe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:37:00 2010 +0200 mshtml: Moved HTTP headers list freeing to separated function. --- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/nsio.c | 25 +++++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 46886d8..4f0df7d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -467,11 +467,11 @@ typedef struct { UINT url_scheme; } nsChannel; -struct ResponseHeader { +typedef struct ResponseHeader { struct list entry; WCHAR *header; WCHAR *data; -}; +} http_header_t; typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0aad37a..8d4fe0a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -311,6 +311,18 @@ static inline BOOL is_http_channel(nsChannel *This) return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; } +static void free_http_headers(struct list *list) +{ + http_header_t *iter, *iter_next; + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_next, list, http_header_t, entry) { + list_remove(&iter->entry); + heap_free(iter->header); + heap_free(iter->data); + heap_free(iter); + } +} + #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef riid, void **result) @@ -364,8 +376,6 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) { - struct ResponseHeader *header, *next_hdr; - nsIURI_Release(NSURI(This->uri)); if(This->owner) nsISupports_Release(This->owner); @@ -377,16 +387,11 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIInterfaceRequestor_Release(This->notif_callback); if(This->original_uri) nsIURI_Release(This->original_uri); - heap_free(This->content_type); - heap_free(This->charset); - LIST_FOR_EACH_ENTRY_SAFE(header, next_hdr, &This->response_headers, struct ResponseHeader, entry) { - list_remove(&header->entry); - heap_free(header->header); - heap_free(header->data); - heap_free(header); - } + free_http_headers(&This->response_headers); + heap_free(This->content_type); + heap_free(This->charset); heap_free(This); }

1 0

Jacek Caban : mshtml: Moved getting HTTP header to separated function.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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