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

Detlef Riekenberg : include: Add a closing bracket.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 51aef89beafd3e22b0cb0acf0b464ea213c43df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51aef89beafd3e22b0cb0acf0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:25:10 2010 +0200 include: Add a closing bracket. --- include/winsock2.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index ea20ceb..5d5bd60 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -550,7 +550,7 @@ typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*); typedef ULONG (WINAPI *LPFN_HTONL)(ULONG); typedef WS(u_short) (WINAPI *LPFN_HTONS)(WS(u_short)); typedef ULONG (WINAPI *LPFN_INET_ADDR)(const char*); -typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr); +typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr)); typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,LONG,ULONG*); typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int); typedef ULONG (WINAPI *LPFN_NTOHL)(ULONG);

1 0

Anders Jonsson : cryptui: Fix typos in English resources.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: e8994599dcebb948d5c219bf7dda13546e70a0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8994599dcebb948d5c219bf7… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:24:12 2010 +0200 cryptui: Fix typos in English resources. --- dlls/cryptui/cryptui_En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index a608210..bd158d2 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -118,10 +118,10 @@ STRINGTABLE IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" IDS_CERT_MGR "Certificates" IDS_FRIENDLY_NAME_NONE "<None>" - IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" + IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" - IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messges" + IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages" IDS_PURPOSE_IPSEC "Allows secure communication over the Internet" IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time" IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list"

1 0

Frédéric Delanoy : shdocvw: Update French translation.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 82d8c52e39661952d1eab3ea3ef789c95dd6584b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d8c52e39661952d1eab3ea3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 3 02:16:52 2010 +0200 shdocvw: Update French translation. --- dlls/shdocvw/Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index 94b4a7e..b7326bb 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -55,6 +55,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES } + POPUP "&Favoris" + { + MENUITEM "&Ajouter aux favoris..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Aide" { MENUITEM "À &propos d'Internet Explorer...", ID_BROWSE_ABOUT

1 0

Luca Bennati : shdocvw: Update Italian translation.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 44aa9a7d938ad077eea9495acf3ebbcd5ca3de99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa9a7d938ad077eea9495ac… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Aug 3 08:51:17 2010 +0200 shdocvw: Update Italian translation. --- dlls/shdocvw/It.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/It.rc b/dlls/shdocvw/It.rc index 8d5782e..d7cc14c 100644 --- a/dlls/shdocvw/It.rc +++ b/dlls/shdocvw/It.rc @@ -54,6 +54,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Proprietà...", ID_BROWSE_PROPERTIES } + POPUP "&Preferiti" + { + MENUITEM "&Aggiungi ai Preferiti..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Aiuto" { MENUITEM "&Informazioni su Internet Explorer...", ID_BROWSE_ABOUT

1 0

Thomas Mullaly : urlmon: Implemented function to the file extension of a file in a URI path.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: eb6e23e1de0c05f10288a1493b5c98fda9f87d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6e23e1de0c05f10288a1493… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 18:19:48 2010 -0400 urlmon: Implemented function to the file extension of a file in a URI path. --- dlls/urlmon/uri.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 07e9944..20a2d87 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -61,6 +61,7 @@ typedef struct { INT path_start; DWORD path_len; + INT extension_offset; } Uri; typedef struct { @@ -535,6 +536,18 @@ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) { return len; } +/* Attempts to find the file extension in a given path. */ +static INT find_file_extension(const WCHAR *path, DWORD path_len) { + const WCHAR *end; + + for(end = path+path_len-1; end >= path && *end != '/' && *end != '\\'; --end) { + if(*end == '.') + return end-path; + } + + return -1; +} + /* Computes the location where the elision should occur in the IPv6 * address using the numerical values of each component stored in * 'values'. If the address shouldn't contain an elision then 'index' @@ -2576,6 +2589,12 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, return FALSE; } + if(uri->path_start > -1 && !computeOnly) + /* Finding file extensions happens for both types of URIs. */ + uri->extension_offset = find_file_extension(uri->canon_uri+uri->path_start, uri->path_len); + else + uri->extension_offset = -1; + return TRUE; }

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetExtension.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 07e7a117ca119e629d784b0b2b98eb8e9bf7f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e7a117ca119e629d784b0b2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 18:36:49 2010 -0400 urlmon: Implemented IUri_GetExtension. --- dlls/urlmon/tests/uri.c | 230 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 33 ++++++-- 2 files changed, 141 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07e7a117ca119e629d784…

1 0

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

Aug. 3, 2010

Module: wine Branch: master Commit: c510a13db515b44bf1cdce12381714a63a253d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c510a13db515b44bf1cdce123… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Aug 2 23:53:59 2010 +0200 shdocvw: Update the Dutch translation. --- dlls/shdocvw/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc index d01c579..2237c5f 100644 --- a/dlls/shdocvw/Nl.rc +++ b/dlls/shdocvw/Nl.rc @@ -50,6 +50,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Eigenschappen...", ID_BROWSE_PROPERTIES } + POPUP "&Favorieten" + { + MENUITEM "&Toevoegen aan Favorieten..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Help" { MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT

1 0

Detlef Riekenberg : shdocvw: Do not trim the last character, when using the iexplore open menu.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: a4e01951579da52b7facc245aad5d5f869ba4aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e01951579da52b7facc245a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:32:29 2010 +0200 shdocvw: Do not trim the last character, when using the iexplore open menu. --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index bef25ab..b794a8b 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -251,7 +251,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocStringLen(NULL, len); - GetWindowTextW(hwndurl, V_BSTR(&url), len); + GetWindowTextW(hwndurl, V_BSTR(&url), len + 1); IWebBrowser2_Navigate2(WEBBROWSER2(This), &url, NULL, NULL, NULL, NULL); SysFreeString(V_BSTR(&url));

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPath.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 1e09e44510dcc56007ed7f91913666601eb52b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e09e44510dcc56007ed7f919… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:21:05 2010 -0400 urlmon: Implemented IUri_GetPath. --- dlls/urlmon/tests/uri.c | 188 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++++-- 2 files changed, 113 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e09e44510dcc56007ed7…

1 0

Thomas Mullaly : urlmon: Implemented a path parser for opaque URIs.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 93d79ee18ee6bd7ebda63dc8c0557fd62c042e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d79ee18ee6bd7ebda63dc8c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 18 20:50:12 2010 -0400 urlmon: Implemented a path parser for opaque URIs. --- dlls/urlmon/tests/uri.c | 33 ++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7cd11ff..acf6905 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2245,6 +2245,34 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "urn:excepts:bad:%XY:encoded", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"urn:excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"urn:excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"excepts:bad:%XY:encoded",S_OK,TRUE}, + {"excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"urn:excepts:bad:%XY:encoded",S_OK,FALSE}, + {"urn",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -2294,7 +2322,10 @@ static const invalid_uri invalid_uri_tests[] = { /* Invalid port with IPv6 address. */ {"http://[::ffff]:32xy",0,FALSE}, /* Not allowed to have backslashes with NO_CANONICALIZE. */ - {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE} + {"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} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9ab1dda..1b98b1a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1553,6 +1553,37 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f return TRUE; } +/* Parses the path of a opaque URI (much less strict then the parser + * for a hierarchical URI). + * + * NOTE: + * Windows allows invalid % encoded data to appear in opaque URI paths + * for unknown scheme types. + */ +static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + + data->path = *ptr; + + while(!is_path_delim(**ptr)) { + if(**ptr == '%' && known_scheme) { + if(!check_pct_encoded(ptr)) { + *ptr = data->path; + data->path = NULL; + return FALSE; + } else + continue; + } + + ++(*ptr); + } + + data->path_len = *ptr - data->path; + TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + return TRUE; +} + /* Determines how the URI should be parsed after the scheme information. * * If the scheme is followed, by "//" then, it is treated as an hierarchical URI @@ -1615,7 +1646,9 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Treating URI as an opaque URI.\n", ptr, data, flags); data->is_opaque = TRUE; - /* TODO: Handle opaque URI's, parse path. */ + if(!parse_path_opaque(ptr, data, flags)) + return FALSE; + return TRUE; }

1 0