wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Thomas Mullaly : urlmon/tests: Added more test data for scheme parsing and canonicalization.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 84baad06c61b7314aea64c56b7e1909138f93615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84baad06c61b7314aea64c56b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 21:43:46 2010 -0400 urlmon/tests: Added more test data for scheme parsing and canonicalization. --- dlls/urlmon/tests/uri.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 307 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84baad06c61b7314aea64…

1 0

Thomas Mullaly : urlmon: Implemented functionality for retrieving the scheme type of a IUri.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: a34700f0346ddad5f9347d604180769215311c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34700f0346ddad5f9347d604… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 21:41:19 2010 -0400 urlmon: Implemented functionality for retrieving the scheme type of a IUri. --- dlls/urlmon/tests/uri.c | 24 ++++++++++++------------ dlls/urlmon/uri.c | 22 +++++++++++++++------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 80a2593..d1e5163 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -112,7 +112,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, /* HOST_TYPE */ {80,S_OK,TRUE}, /* PORT */ - {URL_SCHEME_HTTP,S_OK,TRUE}, /* SCHEME */ + {URL_SCHEME_HTTP,S_OK,FALSE}, /* SCHEME */ {URLZONE_INVALID,E_NOTIMPL,FALSE} /* ZONE */ } }, @@ -141,7 +141,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -170,7 +170,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, @@ -199,7 +199,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE}, } }, @@ -229,7 +229,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_DNS,S_OK,TRUE}, {9999,S_OK,TRUE}, - {URL_SCHEME_FTP,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -257,7 +257,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_FILE,S_OK,TRUE}, + {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -285,7 +285,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_FILE,S_OK,TRUE}, + {URL_SCHEME_FILE,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -313,7 +313,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_UNKNOWN,S_OK,TRUE}, {0,S_FALSE,TRUE}, - {URL_SCHEME_UNKNOWN,S_OK,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -342,7 +342,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV4,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -371,7 +371,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -400,7 +400,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {21,S_OK,TRUE}, - {URL_SCHEME_FTP,S_OK,TRUE}, + {URL_SCHEME_FTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, @@ -429,7 +429,7 @@ static const uri_properties uri_tests[] = { { {Uri_HOST_IPV6,S_OK,TRUE}, {80,S_OK,TRUE}, - {URL_SCHEME_HTTP,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f99061f..36ba81c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -500,6 +500,8 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); if(!pcchProperty) @@ -520,7 +522,17 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW return E_INVALIDARG; } - return E_NOTIMPL; + switch(uriProp) { + case Uri_PROPERTY_SCHEME: + *pcchProperty = This->scheme_type; + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) @@ -718,12 +730,8 @@ static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pdwScheme); - - if(!pdwScheme) - return E_INVALIDARG; - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pdwScheme); + return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); } static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone)

1 0

Thomas Mullaly : urlmon: Implemented functionality for retrieving the scheme name of a IUri.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d4e69aec61824058fb0040ee97580415e3fd4086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e69aec61824058fb0040ee9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 21:33:42 2010 -0400 urlmon: Implemented functionality for retrieving the scheme name of a IUri. --- dlls/urlmon/tests/uri.c | 24 ++++++++++++------------ dlls/urlmon/uri.c | 29 ++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ddd35d8..80a2593 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -105,7 +105,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, /* PATH_AND_QUERY */ {"",S_FALSE,TRUE}, /* QUERY */ {"http://www.winehq.org/tests/../tests/../..",S_OK,FALSE}, /* RAW_URI */ - {"http",S_OK,TRUE}, /* SCHEME_NAME */ + {"http",S_OK,FALSE}, /* SCHEME_NAME */ {"",S_FALSE,TRUE}, /* USER_INFO */ {"",S_FALSE,TRUE} /* USER_NAME */ }, @@ -134,7 +134,7 @@ static const uri_properties uri_tests[] = { {"/tests",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"http://winehq.org/tests/.././tests",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -163,7 +163,7 @@ static const uri_properties uri_tests[] = { {"/?query=x&return=y",S_OK,TRUE}, {"?query=x&return=y",S_OK,TRUE}, {"HtTp://www.winehq.org/tests/..?query=x&return=y",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -192,7 +192,7 @@ static const uri_properties uri_tests[] = { {"/path/a/Forbidden'%3C%7C%3E%20Characters",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"hTTp://us%45r%3Ainfo@examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"usEr%3Ainfo",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE} }, @@ -222,7 +222,7 @@ static const uri_properties uri_tests[] = { {"/dir/foo%20bar.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"ftp://winepass:wine@ftp.winehq.org:9999/dir/foo bar.txt",S_OK,FALSE}, - {"ftp",S_OK,TRUE}, + {"ftp",S_OK,FALSE}, {"winepass:wine",S_OK,TRUE}, {"winepass",S_OK,TRUE} }, @@ -250,7 +250,7 @@ static const uri_properties uri_tests[] = { {"/c:/tests/foo%2520bar.mp3",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,FALSE}, - {"file",S_OK,TRUE}, + {"file",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -278,7 +278,7 @@ static const uri_properties uri_tests[] = { {"/tests/test%20file.README.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"FILE://localhost/test dir\\../tests/test%20file.README.txt",S_OK,FALSE}, - {"file",S_OK,TRUE}, + {"file",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -306,7 +306,7 @@ static const uri_properties uri_tests[] = { {"nothing:should:happen here",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"urn:nothing:should:happen here",S_OK,FALSE}, - {"urn",S_OK,TRUE}, + {"urn",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -335,7 +335,7 @@ static const uri_properties uri_tests[] = { {"/test%20dir/test.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -364,7 +364,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -393,7 +393,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"ftp://[::13.1.68.3]",S_OK,FALSE}, - {"ftp",S_OK,TRUE}, + {"ftp",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} }, @@ -422,7 +422,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,FALSE}, - {"http",S_OK,TRUE}, + {"http",S_OK,FALSE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, }, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index fc46def..f99061f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -416,6 +416,8 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST if(uriProp > Uri_PROPERTY_STRING_LAST) { /* Windows allocates an empty BSTR for invalid Uri_PROPERTY's. */ *pbstrProperty = SysAllocStringLen(NULL, 0); + if(!(*pbstrProperty)) + return E_OUTOFMEMORY; /* It only returns S_FALSE for the ZONE property... */ if(uriProp == Uri_PROPERTY_ZONE) @@ -438,6 +440,19 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST else hres = S_OK; break; + case Uri_PROPERTY_SCHEME_NAME: + if(This->scheme_start > -1) { + *pbstrProperty = SysAllocStringLen(This->canon_uri + This->scheme_start, This->scheme_len); + hres = S_OK; + } else { + *pbstrProperty = SysAllocStringLen(NULL, 0); + hres = S_FALSE; + } + + if(!(*pbstrProperty)) + hres = E_OUTOFMEMORY; + + break; default: FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); hres = E_NOTIMPL; @@ -470,6 +485,10 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D *pcchProperty = SysStringLen(This->raw_uri); hres = S_OK; break; + case Uri_PROPERTY_SCHEME_NAME: + *pcchProperty = This->scheme_len; + hres = (This->scheme_start > -1) ? S_OK : S_FALSE; + break; default: FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); hres = E_NOTIMPL; @@ -481,7 +500,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -648,12 +667,8 @@ static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pstrSchemeName); - - if(!pstrSchemeName) - return E_POINTER; - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pstrSchemeName); + return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); } static HRESULT WINAPI Uri_GetUserInfo(IUri *iface, BSTR *pstrUserInfo)

1 0

Thomas Mullaly : urlmon: Added a canonicalization function for the scheme of a URI.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 4de04ce8c7695b789aee407d7204458eb12e53ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de04ce8c7695b789aee407d7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 17:46:43 2010 -0400 urlmon: Added a canonicalization function for the scheme of a URI. --- dlls/urlmon/uri.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b0c6351..fc46def 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -28,8 +28,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IUriVtbl *lpIUriVtbl; LONG ref; + BSTR raw_uri; - BSTR raw_uri; + /* Information about the canonicalized URI's buffer. */ + WCHAR *canon_uri; + DWORD canon_size; + DWORD canon_len; + + INT scheme_start; + DWORD scheme_len; + URL_SCHEME scheme_type; } Uri; typedef struct { @@ -40,7 +48,6 @@ typedef struct { typedef struct { BSTR uri; - BOOL is_relative; const WCHAR *scheme; @@ -243,6 +250,109 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { return TRUE; } +/* Canonicalizes the scheme information specified in the parse_data using the specified flags. */ +static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + uri->scheme_start = -1; + uri->scheme_len = 0; + + if(!data->scheme) { + /* The only type of URI that doesn't have to have a scheme is a relative + * URI. + */ + if(!data->is_relative) { + FIXME("(%p %p %x): Unable to determine the scheme type of %s.\n", data, + uri, flags, debugstr_w(data->uri)); + return FALSE; + } + } else { + if(!computeOnly) { + DWORD i; + INT pos = uri->canon_len; + + for(i = 0; i < data->scheme_len; ++i) { + /* Scheme name must be lower case after canonicalization. */ + uri->canon_uri[i + pos] = tolowerW(data->scheme[i]); + } + + uri->canon_uri[i + pos] = ':'; + uri->scheme_start = pos; + + TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags, + debugstr_wn(uri->canon_uri, uri->scheme_len), data->scheme_len); + } + + /* This happens in both compute only and non-compute only. */ + uri->canon_len += data->scheme_len + 1; + uri->scheme_len = data->scheme_len; + } + return TRUE; +} + +/* Compute's what the length of the URI specified by the parse_data will be + * after canonicalization occurs using the specified flags. + * + * This function will return a non-zero value indicating the length of the canonicalized + * URI, or -1 on error. + */ +static int compute_canonicalized_length(const parse_data *data, DWORD flags) { + Uri uri; + + memset(&uri, 0, sizeof(Uri)); + + TRACE("(%p %x): Beginning to compute canonicalized length for URI %s\n", data, flags, + debugstr_w(data->uri)); + + if(!canonicalize_scheme(data, &uri, flags, TRUE)) { + ERR("(%p %x): Failed to compute URI scheme length.\n", data, flags); + return -1; + } + + TRACE("(%p %x): Finished computing canonicalized URI length. length=%d\n", data, flags, uri.canon_len); + + return uri.canon_len; +} + +/* Canonicalizes the URI data specified in the parse_data, using the given flags. If the + * canonicalization succeededs it will store all the canonicalization information + * in the pointer to the Uri. + * + * To canonicalize a URI this function first computes what the length of the URI + * specified by the parse_data will be. Once this is done it will then perfom the actual + * canonicalization of the URI. + */ +static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { + INT len; + + uri->canon_uri = NULL; + len = uri->canon_size = uri->canon_len = 0; + + TRACE("(%p %p %x): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri)); + + /* First try to compute the length of the URI. */ + len = compute_canonicalized_length(data, flags); + if(len == -1) { + ERR("(%p %p %x): Could not compute the canonicalized length of %s.\n", data, uri, flags, + debugstr_w(data->uri)); + return E_INVALIDARG; + } + + uri->canon_uri = heap_alloc((len+1)*sizeof(WCHAR)); + if(!uri->canon_uri) + return E_OUTOFMEMORY; + + if(!canonicalize_scheme(data, uri, flags, FALSE)) { + ERR("(%p %p %x): Unable to canonicalize the scheme of the URI.\n", data, uri, flags); + heap_free(uri->canon_uri); + return E_INVALIDARG; + } + uri->scheme_type = data->scheme_type; + + uri->canon_uri[uri->canon_len] = '\0'; + TRACE("(%p %p %x): finished canonicalizing the URI.\n", data, uri, flags); + + return S_OK; +} + #define URI(x) ((IUri*) &(x)->lpIUriVtbl) #define URIBUILDER(x) ((IUriBuilder*) &(x)->lpIUriBuilderVtbl) @@ -287,6 +397,7 @@ static ULONG WINAPI Uri_Release(IUri *iface) if(!ref) { SysFreeString(This->raw_uri); + heap_free(This->canon_uri); heap_free(This); } @@ -684,6 +795,7 @@ static const IUriVtbl UriVtbl = { HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IUri **ppURI) { Uri *ret; + HRESULT hr; parse_data data; TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); @@ -713,6 +825,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU memset(&data, 0, sizeof(parse_data)); data.uri = ret->raw_uri; + /* Validate and parse the URI into it's components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ SysFreeString(ret->raw_uri); @@ -721,6 +834,15 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU return E_INVALIDARG; } + /* Canonicalize the URI. */ + hr = canonicalize_uri(&data, ret, dwFlags); + if(FAILED(hr)) { + SysFreeString(ret->raw_uri); + heap_free(ret); + *ppURI = NULL; + return hr; + } + *ppURI = URI(ret); return S_OK; }

1 0

Thomas Mullaly : urlmon: Added a parser function to determine the scheme type of a URI.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 1eca647bb37a301b9e7c5207b0c3af492c0590ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eca647bb37a301b9e7c5207b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 7 16:34:08 2010 -0400 urlmon: Added a parser function to determine the scheme type of a URI. --- dlls/urlmon/uri.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 246eacc..b0c6351 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -45,8 +45,38 @@ typedef struct { const WCHAR *scheme; DWORD scheme_len; + URL_SCHEME scheme_type; } parse_data; +/* List of scheme types/scheme names that are recognized by the IUri interface as of IE 7. */ +static const struct { + URL_SCHEME scheme; + WCHAR scheme_name[16]; +} recognized_schemes[] = { + {URL_SCHEME_FTP, {'f','t','p',0}}, + {URL_SCHEME_HTTP, {'h','t','t','p',0}}, + {URL_SCHEME_GOPHER, {'g','o','p','h','e','r',0}}, + {URL_SCHEME_MAILTO, {'m','a','i','l','t','o',0}}, + {URL_SCHEME_NEWS, {'n','e','w','s',0}}, + {URL_SCHEME_NNTP, {'n','n','t','p',0}}, + {URL_SCHEME_TELNET, {'t','e','l','n','e','t',0}}, + {URL_SCHEME_WAIS, {'w','a','i','s',0}}, + {URL_SCHEME_FILE, {'f','i','l','e',0}}, + {URL_SCHEME_MK, {'m','k',0}}, + {URL_SCHEME_HTTPS, {'h','t','t','p','s',0}}, + {URL_SCHEME_SHELL, {'s','h','e','l','l',0}}, + {URL_SCHEME_SNEWS, {'s','n','e','w','s',0}}, + {URL_SCHEME_LOCAL, {'l','o','c','a','l',0}}, + {URL_SCHEME_JAVASCRIPT, {'j','a','v','a','s','c','r','i','p','t',0}}, + {URL_SCHEME_VBSCRIPT, {'v','b','s','c','r','i','p','t',0}}, + {URL_SCHEME_ABOUT, {'a','b','o','u','t',0}}, + {URL_SCHEME_RES, {'r','e','s',0}}, + {URL_SCHEME_MSSHELLROOTED, {'m','s','-','s','h','e','l','l','-','r','o','o','t','e','d',0}}, + {URL_SCHEME_MSSHELLIDLIST, {'m','s','-','s','h','e','l','l','-','i','d','l','i','s','t',0}}, + {URL_SCHEME_MSHELP, {'h','c','p',0}}, + {URL_SCHEME_WILDCARD, {'*',0}} +}; + static inline BOOL is_alpha(WCHAR val) { return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); } @@ -102,6 +132,38 @@ static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { return TRUE; } +/* Tries to deduce the corresponding URL_SCHEME for the given URI. Stores + * the deduced URL_SCHEME in data->scheme_type. + */ +static BOOL parse_scheme_type(parse_data *data) { + /* If there's scheme data then see if it's a recognized scheme. */ + if(data->scheme && data->scheme_len) { + DWORD i; + + for(i = 0; i < sizeof(recognized_schemes)/sizeof(recognized_schemes[0]); ++i) { + if(lstrlenW(recognized_schemes[i].scheme_name) == data->scheme_len) { + /* Has to be a case insensitive compare. */ + if(!StrCmpNIW(recognized_schemes[i].scheme_name, data->scheme, data->scheme_len)) { + data->scheme_type = recognized_schemes[i].scheme; + return TRUE; + } + } + } + + /* If we get here it means it's not a recognized scheme. */ + data->scheme_type = URL_SCHEME_UNKNOWN; + return TRUE; + } else if(data->is_relative) { + /* Relative URI's have no scheme. */ + data->scheme_type = URL_SCHEME_UNKNOWN; + return TRUE; + } else { + /* Should never reach here! what happened... */ + FIXME("(%p): Unable to determine scheme type for URI %s\n", data, debugstr_w(data->uri)); + return FALSE; + } +} + /* Tries to parse (or deduce) the scheme_name of a URI. If it can't * parse a scheme from the URI it will try to deduce the scheme_name and scheme_type * using the flags specified in 'flags' (if any). Flags that affect how this function @@ -153,6 +215,10 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Found scheme=%s scheme_len=%d\n", ptr, data, flags, debugstr_wn(data->scheme, data->scheme_len), data->scheme_len); + if(!parse_scheme_type(data)) + return FALSE; + + TRACE("(%p %p %x): Assigned %d as the URL_SCHEME.\n", ptr, data, flags, data->scheme_type); return TRUE; }

1 0

Thomas Mullaly : urlmon: Added a scheme name parser for the IUri interface.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 811ed515ab8791c67bc2edc6118f550b01d163e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811ed515ab8791c67bc2edc61… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jun 6 23:39:46 2010 -0400 urlmon: Added a scheme name parser for the IUri interface. --- dlls/urlmon/tests/uri.c | 7 ++ dlls/urlmon/uri.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a89e5c6..ddd35d8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -522,12 +522,19 @@ static void test_CreateUri_InvalidArgs(void) { HRESULT hr; IUri *uri = (void*) 0xdeadbeef; + const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; + hr = pCreateUri(http_urlW, 0, 0, NULL); ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); hr = pCreateUri(NULL, 0, 0, &uri); ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); + + uri = (void*) 0xdeadbeef; + hr = pCreateUri(invalidW, 0, 0, &uri); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); } static void test_IUri_GetPropertyBSTR(void) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 732ec44..246eacc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -20,6 +20,9 @@ #include "urlmon_main.h" #include "wine/debug.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { @@ -34,6 +37,146 @@ typedef struct { LONG ref; } UriBuilder; +typedef struct { + BSTR uri; + + + BOOL is_relative; + + const WCHAR *scheme; + DWORD scheme_len; +} parse_data; + +static inline BOOL is_alpha(WCHAR val) { + return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); +} + +static inline BOOL is_num(WCHAR val) { + return (val >= '0' && val <= '9'); +} + +/* A URI is implicitly a file path if it begins with + * a drive letter (eg X:) or starts with "\\" (UNC path). + */ +static inline BOOL is_implicit_file_path(const WCHAR *str) { + if(is_alpha(str[0]) && str[1] == ':') + return TRUE; + else if(str[0] == '\\' && str[1] == '\\') + return TRUE; + + return FALSE; +} + +/* Tries to parse the scheme name of the URI. + * + * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. + * NOTE: Windows accepts a number as the first character of a scheme. + */ +static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { + const WCHAR *start = *ptr; + + data->scheme = NULL; + data->scheme_len = 0; + + while(**ptr) { + if(!is_num(**ptr) && !is_alpha(**ptr) && **ptr != '+' && + **ptr != '-' && **ptr != '.') + break; + + (*ptr)++; + } + + if(*ptr == start) + return FALSE; + + /* Schemes must end with a ':' */ + if(**ptr != ':') { + *ptr = start; + return FALSE; + } + + data->scheme = start; + data->scheme_len = *ptr - start; + + ++(*ptr); + return TRUE; +} + +/* Tries to parse (or deduce) the scheme_name of a URI. If it can't + * parse a scheme from the URI it will try to deduce the scheme_name and scheme_type + * using the flags specified in 'flags' (if any). Flags that affect how this function + * operates are the Uri_CREATE_ALLOW_* flags. + * + * All parsed/deduced information will be stored in 'data' when the function returns. + * + * Returns TRUE if it was able to successfully parse the information. + */ +static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { + static const WCHAR fileW[] = {'f','i','l','e',0}; + static const WCHAR wildcardW[] = {'*',0}; + + /* First check to see if the uri could implicitly be a file path. */ + if(is_implicit_file_path(*ptr)) { + if(flags & Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME) { + data->scheme = fileW; + data->scheme_len = lstrlenW(fileW); + TRACE("(%p %p %x): URI is an implicit file path.\n", ptr, data, flags); + } else { + /* Window's does not consider anything that can implicitly be a file + * path to be a valid URI if the ALLOW_IMPLICIT_FILE_SCHEME flag is not set... + */ + TRACE("(%p %p %x): URI is implicitly a file path, but, the ALLOW_IMPLICIT_FILE_SCHEME flag wasn't set.\n", + ptr, data, flags); + return FALSE; + } + } else if(!parse_scheme_name(ptr, data)) { + /* No Scheme was found, this means it could be: + * a) an implicit Wildcard scheme + * b) a relative URI + * c) a invalid URI. + */ + if(flags & Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME) { + data->scheme = wildcardW; + data->scheme_len = lstrlenW(wildcardW); + + TRACE("(%p %p %x): URI is an implicit wildcard scheme.\n", ptr, data, flags); + } else if (flags & Uri_CREATE_ALLOW_RELATIVE) { + data->is_relative = TRUE; + TRACE("(%p %p %x): URI is relative.\n", ptr, data, flags); + } else { + TRACE("(%p %p %x): Malformed URI found. Unable to deduce scheme name.\n", ptr, data, flags); + return FALSE; + } + } + + if(!data->is_relative) + TRACE("(%p %p %x): Found scheme=%s scheme_len=%d\n", ptr, data, flags, + debugstr_wn(data->scheme, data->scheme_len), data->scheme_len); + + return TRUE; +} + +/* Parses and validates the components of the specified by data->uri + * and stores the information it parses into 'data'. + * + * Returns TRUE if it successfully parsed the URI. False otherwise. + */ +static BOOL parse_uri(parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + + ptr = data->uri; + pptr = &ptr; + + TRACE("(%p %x): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri)); + + if(!parse_scheme(pptr, data, flags)) + return FALSE; + + TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); + return TRUE; +} + #define URI(x) ((IUri*) &(x)->lpIUriVtbl) #define URIBUILDER(x) ((IUriBuilder*) &(x)->lpIUriBuilderVtbl) @@ -475,6 +618,7 @@ static const IUriVtbl UriVtbl = { HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IUri **ppURI) { Uri *ret; + parse_data data; TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); @@ -495,12 +639,22 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Create a copy of pwzURI and store it as the raw_uri. */ ret->raw_uri = SysAllocString(pwzURI); - if(!ret->raw_uri) { heap_free(ret); return E_OUTOFMEMORY; } + memset(&data, 0, sizeof(parse_data)); + data.uri = ret->raw_uri; + + if(!parse_uri(&data, dwFlags)) { + /* Encountered an unsupported or invalid URI */ + SysFreeString(ret->raw_uri); + heap_free(ret); + *ppURI = NULL; + return E_INVALIDARG; + } + *ppURI = URI(ret); return S_OK; }

1 0

Thomas Mullaly : include: Updated the URL_SCHEME enum.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 53ee717d56686fa2ca14d32ac3ea60fbd4365d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ee717d56686fa2ca14d32ac… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jun 6 22:19:43 2010 -0400 include: Updated the URL_SCHEME enum. --- include/shlwapi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index dd2da4f..bec8b3a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -585,6 +585,11 @@ typedef enum { URL_SCHEME_MSSHELLROOTED, URL_SCHEME_MSSHELLIDLIST, URL_SCHEME_MSHELP, + URL_SCHEME_MSSHELLDEVICE, + URL_SCHEME_WILDCARD, + URL_SCHEME_SEARCH_MS, + URL_SCHEME_SEARCH, + URL_SCHEME_KNOWNFOLDER, URL_SCHEME_MAXVALUE } URL_SCHEME;

1 0

Alexandre Julliard : server: Try to use /proc/pid/ mem to read process memory since it should be faster.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 1a79912a10a6cded54d1f1de5f746bbffec3ffee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a79912a10a6cded54d1f1de5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 10:50:12 2010 +0200 server: Try to use /proc/pid/mem to read process memory since it should be faster. --- server/ptrace.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 1118048..111368b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,9 +19,11 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <signal.h> #include <stdarg.h> @@ -377,6 +379,24 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t if (suspend_for_ptrace( thread )) { + if (len > 3) /* /proc/pid/mem should be faster for large sizes */ + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_RDONLY )) != -1) + { + ssize_t ret = pread( fd, dest, size, ptr ); + close( fd ); + if (ret == size) + { + len = 0; + goto done; + } + } + } + if (len > 1) { if (read_thread_long( thread, addr++, &data ) == -1) goto done;

1 0

Igor Paliychuk : winspool.drv: Add Ukrainian translation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 2c35fccf4d06cc43cc161a5424df5a2ae83b139d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c35fccf4d06cc43cc161a542… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 21:09:23 2010 +0300 winspool.drv: Add Ukrainian translation. --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/Uk.rc | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 9f84801..56ff72b 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ Si.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Zh.rc \ winspool.rc diff --git a/dlls/winspool.drv/Uk.rc b/dlls/winspool.drv/Uk.rc new file mode 100644 index 0000000..16728b3 --- /dev/null +++ b/dlls/winspool.drv/Uk.rc @@ -0,0 +1,45 @@ +/* + * Ukrainian resources for winspool + * + * Copyright 2005 Huw Davies + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wspool.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Друк в файл" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ім'я кінцевого файлу:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Скасувати", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Локальний порт" + IDS_FILE_EXISTS "Кінцевий файл вже існує. Натисніть OK щоб його перезаписати." + IDS_CANNOT_OPEN "Неможливо створити кінцевий файл." +}

1 0

Igor Paliychuk : sane.ds: Add Ukrainian translation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 04af975d91cd3905168fe84b705da1615cf44f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af975d91cd3905168fe84b7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Jul 20 21:06:44 2010 +0300 sane.ds: Add Ukrainian translation. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_Uk.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 2ed1a59..8872a8b 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ sane_Ru.rc \ sane_Si.rc \ sane_Sv.rc \ + sane_Uk.rc \ sane_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/sane.ds/sane_Uk.rc b/dlls/sane.ds/sane_Uk.rc new file mode 100644 index 0000000..97a17e8 --- /dev/null +++ b/dlls/sane.ds/sane_Uk.rc @@ -0,0 +1,46 @@ +/* + * Ukrainian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Сканування" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "СКАНУВАННЯ... Зачекайте",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "мм" + 4 "точок на дюйм" + 5 "%" + 6 "ns" +}

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010