November 2011 - Wine-commits

Frédéric Delanoy : winefile: Avoid uninitialized field in SYSTEMTIME structure (Coverity).
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: f38e0be5ea11784410c6e0781c72b194fc95fd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38e0be5ea11784410c6e0781… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 25 14:55:40 2011 +0100 winefile: Avoid uninitialized field in SYSTEMTIME structure (Coverity). --- programs/winefile/winefile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7876da5..63ce463 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -526,6 +526,7 @@ static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) stime.wHour = tm->tm_hour; stime.wMinute = tm->tm_min; stime.wSecond = tm->tm_sec; + stime.wMilliseconds = 0; return SystemTimeToFileTime(&stime, ftime); }

1 0

Jacek Caban : urlmon: Reduce indention in are_equal_simple and move it.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: bb8a05800bf9e3f8b81fee1d4021c55ddd3ec8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8a05800bf9e3f8b81fee1d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:57:47 2011 +0100 urlmon: Reduce indention in are_equal_simple and move it. --- dlls/urlmon/uri.c | 194 ++++++++++++++++++++++++++--------------------------- 1 files changed, 96 insertions(+), 98 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a36f730..661e1bc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -428,104 +428,6 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data return FALSE; } -/* Checks if the two Uri's are logically equivalent. It's a simple - * comparison, since they are both of type Uri, and it can access - * the properties of each Uri directly without the need to go - * through the "IUri_Get*" interface calls. - */ -static BOOL are_equal_simple(const Uri *a, const Uri *b) { - if(a->scheme_type == b->scheme_type) { - const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; - const BOOL are_hierarchical = - (a->authority_start > -1 && b->authority_start > -1); - - if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) - return !StrCmpIW(a->canon_uri, b->canon_uri); - } - - /* Only compare the scheme names (if any) if their unknown scheme types. */ - if(!known_scheme) { - if((a->scheme_start > -1 && b->scheme_start > -1) && - (a->scheme_len == b->scheme_len)) { - /* Make sure the schemes are the same. */ - if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) - return FALSE; - } else if(a->scheme_len != b->scheme_len) - /* One of the Uri's has a scheme name, while the other doesn't. */ - return FALSE; - } - - /* If they have a userinfo component, perform case sensitive compare. */ - if((a->userinfo_start > -1 && b->userinfo_start > -1) && - (a->userinfo_len == b->userinfo_len)) { - if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) - return FALSE; - } else if(a->userinfo_len != b->userinfo_len) - /* One of the Uri's had a userinfo, while the other one doesn't. */ - return FALSE; - - /* Check if they have a host name. */ - if((a->host_start > -1 && b->host_start > -1) && - (a->host_len == b->host_len)) { - /* Perform a case insensitive compare if they are a known scheme type. */ - if(known_scheme) { - if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; - } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; - } else if(a->host_len != b->host_len) - /* One of the Uri's had a host, while the other one didn't. */ - return FALSE; - - if(a->has_port && b->has_port) { - if(a->port != b->port) - return FALSE; - } else if(a->has_port || b->has_port) - /* One had a port, while the other one didn't. */ - return FALSE; - - /* Windows is weird with how it handles paths. For example - * One URI could be "http://google.com" (after canonicalization) - * and one could be "http://google.com/" and the IsEqual function - * would still evaluate to TRUE, but, only if they are both hierarchical - * URIs. - */ - if((a->path_start > -1 && b->path_start > -1) && - (a->path_len == b->path_len)) { - if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) - return FALSE; - } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { - if(*(a->canon_uri+a->path_start) != '/') - return FALSE; - } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { - if(*(b->canon_uri+b->path_start) != '/') - return FALSE; - } else if(a->path_len != b->path_len) - return FALSE; - - /* Compare the query strings of the two URIs. */ - if((a->query_start > -1 && b->query_start > -1) && - (a->query_len == b->query_len)) { - if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) - return FALSE; - } else if(a->query_len != b->query_len) - return FALSE; - - if((a->fragment_start > -1 && b->fragment_start > -1) && - (a->fragment_len == b->fragment_len)) { - if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) - return FALSE; - } else if(a->fragment_len != b->fragment_len) - return FALSE; - - /* If we get here, the two URIs are equivalent. */ - return TRUE; - } - - return FALSE; -} - /* Computes the size of the given IPv6 address. * Each h16 component is 16 bits. If there is an IPv4 address, it's * 32 bits. If there's an elision it can be 16 to 128 bits, depending @@ -3963,6 +3865,102 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +/* Checks if the two Uri's are logically equivalent. It's a simple + * comparison, since they are both of type Uri, and it can access + * the properties of each Uri directly without the need to go + * through the "IUri_Get*" interface calls. + */ +static BOOL are_equal_simple(const Uri *a, const Uri *b) { + const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + + if(a->scheme_type != b->scheme_type) + return FALSE; + + if(a->scheme_type == URL_SCHEME_FILE) { + if(a->canon_len == b->canon_len) + return !StrCmpIW(a->canon_uri, b->canon_uri); + } + + /* Only compare the scheme names (if any) if their unknown scheme types. */ + if(!known_scheme) { + if((a->scheme_start > -1 && b->scheme_start > -1) && + (a->scheme_len == b->scheme_len)) { + /* Make sure the schemes are the same. */ + if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) + return FALSE; + } else if(a->scheme_len != b->scheme_len) + /* One of the Uri's has a scheme name, while the other doesn't. */ + return FALSE; + } + + /* If they have a userinfo component, perform case sensitive compare. */ + if((a->userinfo_start > -1 && b->userinfo_start > -1) && + (a->userinfo_len == b->userinfo_len)) { + if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) + return FALSE; + } else if(a->userinfo_len != b->userinfo_len) + /* One of the Uri's had a userinfo, while the other one doesn't. */ + return FALSE; + + /* Check if they have a host name. */ + if((a->host_start > -1 && b->host_start > -1) && + (a->host_len == b->host_len)) { + /* Perform a case insensitive compare if they are a known scheme type. */ + if(known_scheme) { + if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) + return FALSE; + } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) + return FALSE; + } else if(a->host_len != b->host_len) + /* One of the Uri's had a host, while the other one didn't. */ + return FALSE; + + if(a->has_port && b->has_port) { + if(a->port != b->port) + return FALSE; + } else if(a->has_port || b->has_port) + /* One had a port, while the other one didn't. */ + return FALSE; + + /* Windows is weird with how it handles paths. For example + * One URI could be "http://google.com" (after canonicalization) + * and one could be "http://google.com/" and the IsEqual function + * would still evaluate to TRUE, but, only if they are both hierarchical + * URIs. + */ + if((a->path_start > -1 && b->path_start > -1) && + (a->path_len == b->path_len)) { + if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) + return FALSE; + } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { + if(*(a->canon_uri+a->path_start) != '/') + return FALSE; + } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { + if(*(b->canon_uri+b->path_start) != '/') + return FALSE; + } else if(a->path_len != b->path_len) + return FALSE; + + /* Compare the query strings of the two URIs. */ + if((a->query_start > -1 && b->query_start > -1) && + (a->query_len == b->query_len)) { + if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) + return FALSE; + } else if(a->query_len != b->query_len) + return FALSE; + + if((a->fragment_start > -1 && b->fragment_start > -1) && + (a->fragment_len == b->fragment_len)) { + if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) + return FALSE; + } else if(a->fragment_len != b->fragment_len) + return FALSE; + + /* If we get here, the two URIs are equivalent. */ + return TRUE; +} + static void convert_to_dos_path(const WCHAR *path, DWORD path_len, WCHAR *output, DWORD *output_len) {

1 0

Jacek Caban : urlmon: Rename are_equal_simple to compare_uris and make it failable.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 24f4c4e14cffb5e4caf91869120f5dbd160feed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f4c4e14cffb5e4caf918691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:07 2011 +0100 urlmon: Rename are_equal_simple to compare_uris and make it failable. --- dlls/urlmon/uri.c | 58 +++++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 661e1bc..22fe3fe 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3870,16 +3870,20 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, * the properties of each Uri directly without the need to go * through the "IUri_Get*" interface calls. */ -static BOOL are_equal_simple(const Uri *a, const Uri *b) { +static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + *ret = FALSE; + if(a->scheme_type != b->scheme_type) - return FALSE; + return S_OK; if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) - return !StrCmpIW(a->canon_uri, b->canon_uri); + if(a->canon_len == b->canon_len) { + *ret = !StrCmpIW(a->canon_uri, b->canon_uri); + return S_OK; + } } /* Only compare the scheme names (if any) if their unknown scheme types. */ @@ -3888,20 +3892,20 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { (a->scheme_len == b->scheme_len)) { /* Make sure the schemes are the same. */ if(StrCmpNW(a->canon_uri+a->scheme_start, b->canon_uri+b->scheme_start, a->scheme_len)) - return FALSE; + return S_OK; } else if(a->scheme_len != b->scheme_len) /* One of the Uri's has a scheme name, while the other doesn't. */ - return FALSE; + return S_OK; } /* If they have a userinfo component, perform case sensitive compare. */ if((a->userinfo_start > -1 && b->userinfo_start > -1) && (a->userinfo_len == b->userinfo_len)) { if(StrCmpNW(a->canon_uri+a->userinfo_start, b->canon_uri+b->userinfo_start, a->userinfo_len)) - return FALSE; + return S_OK; } else if(a->userinfo_len != b->userinfo_len) /* One of the Uri's had a userinfo, while the other one doesn't. */ - return FALSE; + return S_OK; /* Check if they have a host name. */ if((a->host_start > -1 && b->host_start > -1) && @@ -3909,19 +3913,19 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { /* Perform a case insensitive compare if they are a known scheme type. */ if(known_scheme) { if(StrCmpNIW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; + return S_OK; } else if(StrCmpNW(a->canon_uri+a->host_start, b->canon_uri+b->host_start, a->host_len)) - return FALSE; + return S_OK; } else if(a->host_len != b->host_len) /* One of the Uri's had a host, while the other one didn't. */ - return FALSE; + return S_OK; if(a->has_port && b->has_port) { if(a->port != b->port) - return FALSE; + return S_OK; } else if(a->has_port || b->has_port) /* One had a port, while the other one didn't. */ - return FALSE; + return S_OK; /* Windows is weird with how it handles paths. For example * One URI could be "http://google.com" (after canonicalization) @@ -3932,33 +3936,34 @@ static BOOL are_equal_simple(const Uri *a, const Uri *b) { if((a->path_start > -1 && b->path_start > -1) && (a->path_len == b->path_len)) { if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) - return FALSE; + return S_OK; } else if(are_hierarchical && a->path_len == -1 && b->path_len == 0) { if(*(a->canon_uri+a->path_start) != '/') - return FALSE; + return S_OK; } else if(are_hierarchical && b->path_len == 1 && a->path_len == 0) { if(*(b->canon_uri+b->path_start) != '/') - return FALSE; + return S_OK; } else if(a->path_len != b->path_len) - return FALSE; + return S_OK; /* Compare the query strings of the two URIs. */ if((a->query_start > -1 && b->query_start > -1) && (a->query_len == b->query_len)) { if(StrCmpNW(a->canon_uri+a->query_start, b->canon_uri+b->query_start, a->query_len)) - return FALSE; + return S_OK; } else if(a->query_len != b->query_len) - return FALSE; + return S_OK; if((a->fragment_start > -1 && b->fragment_start > -1) && (a->fragment_len == b->fragment_len)) { if(StrCmpNW(a->canon_uri+a->fragment_start, b->canon_uri+b->fragment_start, a->fragment_len)) - return FALSE; + return S_OK; } else if(a->fragment_len != b->fragment_len) - return FALSE; + return S_OK; /* If we get here, the two URIs are equivalent. */ - return TRUE; + *ret = TRUE; + return S_OK; } static void convert_to_dos_path(const WCHAR *path, DWORD path_len, @@ -4944,16 +4949,13 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) } /* Try to convert it to a Uri (allows for a more simple comparison). */ - if((other = get_uri_obj(pUri))) { - TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); - *pfEqual = are_equal_simple(This, other); - }else { - /* Do it the hard way. */ + if(!(other = get_uri_obj(pUri))) { FIXME("(%p)->(%p %p) No support for unknown IUri's yet.\n", iface, pUri, pfEqual); return E_NOTIMPL; } - return S_OK; + TRACE("comparing to %s\n", debugstr_w(other->canon_uri)); + return compare_uris(This, other, pfEqual); } static const IUriVtbl UriVtbl = {

1 0

Jacek Caban : urlmon: Make canonicalize_path_hierarchical Uri object and parse_data struct independent .
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 29cdb357508eeca115cd5d815ea031657677b2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cdb357508eeca115cd5d815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:22 2011 +0100 urlmon: Make canonicalize_path_hierarchical Uri object and parse_data struct independent. --- dlls/urlmon/uri.c | 120 +++++++++++++++++++++++++---------------------------- 1 files changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 22fe3fe..c0233bf 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2828,60 +2828,56 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%20test -> file:///c:/test%20test * file:///c:/test%test -> file:///c:/test%25test */ -static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, - DWORD flags, BOOL computeOnly) { +static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, + WCHAR *ret_path) { + const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_file = scheme_type == URL_SCHEME_FILE; + const BOOL is_res = scheme_type == URL_SCHEME_RES; const WCHAR *ptr; - const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; - const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - const BOOL is_res = data->scheme_type == URL_SCHEME_RES; - BOOL escape_pct = FALSE; + DWORD len = 0; - if(!data->path) { - uri->path_start = -1; - uri->path_len = 0; - return TRUE; - } + if(!path) + return 0; - uri->path_start = uri->canon_len; - ptr = data->path; + ptr = path; - if(is_file && uri->host_start == -1) { + if(is_file && !has_host) { /* Check if a '/' needs to be appended for the file scheme. */ - if(data->path_len > 1 && is_drive_path(ptr) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - uri->canon_len++; + if(path_len > 1 && is_drive_path(ptr) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if(ret_path) + ret_path[len] = '/'; + len++; escape_pct = TRUE; } else if(*ptr == '/') { if(!(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Copy the extra '/' over. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; } ++ptr; } if(is_drive_path(ptr)) { - if(!computeOnly) { - uri->canon_uri[uri->canon_len] = *ptr; + if(ret_path) { + ret_path[len] = *ptr; /* If there's a '|' after the drive letter, convert it to a ':'. */ - uri->canon_uri[uri->canon_len+1] = ':'; + ret_path[len+1] = ':'; } ptr += 2; - uri->canon_len += 2; + len += 2; } } - if(!is_file && *(data->path) && *(data->path) != '/') { + if(!is_file && *path && *path != '/') { /* Prepend a '/' to the path if it doesn't have one. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; } - for(; ptr < data->path+data->path_len; ++ptr) { + for(; ptr < path+path_len; ++ptr) { BOOL do_default_action = TRUE; if(*ptr == '%' && !is_res) { @@ -2894,76 +2890,69 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, if(force_encode || escape_pct) { /* Escape the percent sign in the file URI. */ - if(!computeOnly) - pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); - uri->canon_len += 3; + if(ret_path) + pct_encode_val(*ptr, ret_path+len); + len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || (is_file && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = val; - ++uri->canon_len; + if(ret_path) + ret_path[len] = val; + len++; ptr += 2; continue; } } else if(*ptr == '/' && is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert the '/' back to a '\\'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '\\'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '\\'; + len++; do_default_action = FALSE; } else if(*ptr == '\\' && known_scheme) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Convert '\\' into a '/'. */ - if(!computeOnly) - uri->canon_uri[uri->canon_len] = '/'; - ++uri->canon_len; + if(ret_path) + ret_path[len] = '/'; + len++; do_default_action = FALSE; } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { /* Escape the forbidden character. */ - if(!computeOnly) - pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); - uri->canon_len += 3; + if(ret_path) + pct_encode_val(*ptr, ret_path+len); + len += 3; do_default_action = FALSE; } } if(do_default_action) { - if(!computeOnly) - uri->canon_uri[uri->canon_len] = *ptr; - ++uri->canon_len; + if(ret_path) + ret_path[len] = *ptr; + len++; } } - uri->path_len = uri->canon_len - uri->path_start; - /* Removing the dot segments only happens when it's not in * computeOnly mode and it's not a wildcard scheme. File schemes * with USE_DOS_PATH set don't get dot segments removed. */ if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) && - data->scheme_type != URL_SCHEME_WILDCARD) { - if(!(flags & Uri_CREATE_NO_CANONICALIZE) && !computeOnly) { + scheme_type != URL_SCHEME_WILDCARD) { + if(!(flags & Uri_CREATE_NO_CANONICALIZE) && ret_path) { /* Remove the dot segments (if any) and reset everything to the new * correct length. */ - DWORD new_len = remove_dot_segments(uri->canon_uri+uri->path_start, uri->path_len); - uri->canon_len -= uri->path_len-new_len; - uri->path_len = new_len; + len = remove_dot_segments(ret_path, len); } } - if(!computeOnly) - TRACE("Canonicalized path %s len=%d\n", - debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), - uri->path_len); - - return TRUE; + if(ret_path) + TRACE("Canonicalized path %s len=%d\n", debugstr_wn(ret_path, len), len); + return len; } /* Attempts to canonicalize the path for an opaque URI. @@ -3121,8 +3110,13 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!canonicalize_path_opaque(data, uri, flags, computeOnly)) return FALSE; } else { - if(!canonicalize_path_hierarchical(data, uri, flags, computeOnly)) - return FALSE; + if(!computeOnly) + uri->path_start = uri->canon_len; + uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, + flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + uri->canon_len += uri->path_len; + if(!computeOnly && !uri->path_len) + uri->path_start = -1; } } else { /* Opaque URI's don't have an authority. */

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCLIPSTATUS typedef.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1c74172a28586e408d6224638cc1311f28f9238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c74172a28586e408d6224638… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:35 2011 +0100 wined3d: Get rid of the WINED3DCLIPSTATUS typedef. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 4 ++-- dlls/wined3d/device.c | 6 ++++-- include/wine/wined3d.h | 14 ++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eb398ab..c003993 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1648,10 +1648,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(IDirect3DDevice8 *iface HRESULT hr; TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); -/* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */ + /* FIXME: Verify that D3DCLIPSTATUS8 ~= struct wined3d_clip_status. */ wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(IDirect3DDevice8 *iface TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32215c5..49a3215 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1580,7 +1580,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1595,7 +1595,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e12f48a..6e35c0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,7 +2260,8 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); @@ -2270,7 +2271,8 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5bcc35b..a68e0d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1667,11 +1667,11 @@ struct wined3d_resource_desc UINT size; }; -typedef struct _WINED3DCLIPSTATUS +struct wined3d_clip_status { - DWORD ClipUnion; - DWORD ClipIntersection; -} WINED3DCLIPSTATUS; + DWORD clip_union; + DWORD clip_intersection; +}; typedef struct _WINED3DVERTEXELEMENT { @@ -2200,7 +2200,8 @@ HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *devi UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); -HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, @@ -2280,7 +2281,8 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane); -HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVERTEXELEMENT typedef.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 6a529e58471deb15be72eb248c8a69dfcde78419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a529e58471deb15be72eb248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:36 2011 +0100 wined3d: Get rid of the WINED3DVERTEXELEMENT typedef. --- dlls/d3d10core/inputlayout.c | 6 +++--- dlls/d3d8/vertexdeclaration.c | 8 ++++---- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 19 ++++++++++--------- include/wine/wined3d.h | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a529e58471deb15be72e…

1 0

Piotr Caban : msvcp90: Added locale copy based constructors implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1263b618d7945e817b70a85560c69850e5a881e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1263b618d7945e817b70a8556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:41 2011 +0100 msvcp90: Added locale copy based constructors implementation. --- dlls/msvcp90/locale.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f05cc79..61a3353 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -274,15 +274,18 @@ locale__Locimp* __thiscall locale__Locimp_ctor(locale__Locimp *this) DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8) locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy) { + _Lockit lock; MSVCP_size_t i; TRACE("(%p %p)\n", this, copy); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); memcpy(this, copy, sizeof(locale__Locimp)); locale_facet_ctor_refs(&this->facet, 1); if(copy->facetvec) { this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); if(!this->facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return NULL; @@ -292,6 +295,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale_facet__Incref(this->facetvec[i]); } MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); + _Lockit_dtor(&lock); return this; } @@ -351,8 +355,11 @@ locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id) { + _Lockit lock; + TRACE("(%p %p %lu)\n", locimp, facet, id); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); if(id >= locimp->facet_cnt) { MSVCP_size_t new_size = id+1; locale_facet **new_facetvec; @@ -362,6 +369,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); if(!new_facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return; @@ -380,6 +388,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet locimp->facetvec[id] = facet; if(facet) locale_facet__Incref(facet); + _Lockit_dtor(&lock); } /* ?_Addfac(a)_Locimp@locale(a)std@@AAEXPAVfacet(a)23@I(a)Z */ @@ -437,8 +446,10 @@ const vtable_ptr MSVCP_locale__Locimp_vtable[] = { DEFINE_THISCALL_WRAPPER(locale_ctor_locimp, 8) locale* __thiscall locale_ctor_locimp(locale *this, locale__Locimp *locimp) { - FIXME("(%p %p) stub\n", this, locimp); - return NULL; + TRACE("(%p %p)\n", this, locimp); + /* Don't change locimp reference counter */ + this->ptr = locimp; + return this; } /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ @@ -455,8 +466,10 @@ locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, co DEFINE_THISCALL_WRAPPER(locale_copy_ctor, 8) locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->ptr = copy->ptr; + locale_facet__Incref(&this->ptr->facet); + return this; } /* ??0locale(a)std@@QAE(a)ABV01@PBDH(a)Z */ @@ -482,8 +495,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category DEFINE_THISCALL_WRAPPER(locale_ctor_uninitialized, 8) locale* __thiscall locale_ctor_uninitialized(locale *this, int uninitialized) { - FIXME("(%p %d) stub\n", this, uninitialized); - return NULL; + TRACE("(%p)\n", this); + this->ptr = NULL; + return this; } /* ??0locale(a)std@@QAE(a)XZ */ @@ -509,7 +523,8 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - locale__Locimp_dtor(this->ptr); + if(this->ptr) + locale__Locimp_dtor(this->ptr); } DEFINE_THISCALL_WRAPPER(MSVCP_locale_vector_dtor, 8)

1 0

Piotr Caban : msvcp90: Added locale::_Addfac implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 2e449eba0851bef828039dd129bbeb1ca2deae36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e449eba0851bef828039dd12… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:55 2011 +0100 msvcp90: Added locale::_Addfac implementation. --- dlls/msvcp90/locale.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 61a3353..f985136 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -579,8 +579,27 @@ MSVCP_bool __thiscall locale_operator_not_equal(const locale *this, locale const DEFINE_THISCALL_WRAPPER(locale__Addfac, 16) locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_t id, MSVCP_size_t catmask) { - FIXME("(%p %p %lu %lu) stub\n", this, facet, id, catmask); - return NULL; + TRACE("(%p %p %lu %lu)\n", this, facet, id, catmask); + + if(this->ptr->facet.refs > 1) { + locale__Locimp *new_ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!new_ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + locale__Locimp_copy_ctor(new_ptr, this->ptr); + locale_facet__Decref(&this->ptr->facet); + this->ptr = new_ptr; + } + + locale__Locimp__Addfac(this->ptr, facet, id); + + if(catmask) { + MSVCP_basic_string_char_dtor(&this->ptr->name); + MSVCP_basic_string_char_ctor_cstr(&this->ptr->name, "*"); + } + return this; } /* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I(a)Z */

1 0

Piotr Caban : msvcp90: Added locale::name implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: e10dcd0c328d7ed26e6d38f25bb87f9603938ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10dcd0c328d7ed26e6d38f25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:06 2011 +0100 msvcp90: Added locale::name implementation. --- dlls/msvcp90/locale.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f985136..29069e7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -647,9 +647,8 @@ const locale* __cdecl locale_classic(void) DEFINE_THISCALL_WRAPPER_RETPTR(locale_name, 4) basic_string_char __thiscall locale_name(const locale *this) { - basic_string_char ret = { 0 }; /* FIXME */ - FIXME( "(%p) stub\n", this); - return ret; + TRACE( "(%p)\n", this); + return this->ptr->name; } /* ??0_Timevec(a)std@@QAE(a)ABV01@@Z */

1 0

Piotr Caban : msvcp90: Added _Timevec class implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 913b075b079fd117d533a6e197a2c8b58ab37148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913b075b079fd117d533a6e19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:18 2011 +0100 msvcp90: Added _Timevec class implementation. --- dlls/msvcp90/locale.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 29069e7..e928d3e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -653,11 +653,14 @@ basic_string_char __thiscall locale_name(const locale *this) /* ??0_Timevec(a)std@@QAE(a)ABV01@@Z */ /* ??0_Timevec(a)std@@QEAA(a)AEBV01@@Z */ +/* This copy constructor modifies copied object */ DEFINE_THISCALL_WRAPPER(_Timevec_copy_ctor, 8) -_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) +_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, _Timevec *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->timeptr = copy->timeptr; + copy->timeptr = NULL; + return this; } /* ??0_Timevec(a)std@@QAE(a)PAX@Z */ @@ -665,8 +668,9 @@ _Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) DEFINE_THISCALL_WRAPPER(_Timevec_ctor_timeptr, 8) _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) { - FIXME("(%p %p) stub\n", this, timeptr); - return NULL; + TRACE("(%p %p)\n", this, timeptr); + this->timeptr = timeptr; + return this; } /* ??_F_Timevec(a)std@@QAEXXZ */ @@ -674,8 +678,9 @@ _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) DEFINE_THISCALL_WRAPPER(_Timevec_ctor, 4) _Timevec* __thiscall _Timevec_ctor(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + this->timeptr = NULL; + return this; } /* ??1_Timevec(a)std@@QAE(a)XZ */ @@ -683,7 +688,8 @@ _Timevec* __thiscall _Timevec_ctor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_dtor, 4) void __thiscall _Timevec_dtor(_Timevec *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + MSVCRT_operator_delete(this->timeptr); } /* ??4_Timevec(a)std@@QAEAAV01(a)ABV01@@Z */ @@ -691,8 +697,10 @@ void __thiscall _Timevec_dtor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_op_assign, 8) _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) { - FIXME("(%p %p) stub\n", this, right); - return NULL; + TRACE("(%p %p)\n", this, right); + this->timeptr = right->timeptr; + right->timeptr = NULL; + return this; } /* ?_Getptr(a)_Timevec@std@@QBEPAXXZ */ @@ -700,8 +708,8 @@ _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) DEFINE_THISCALL_WRAPPER(_Timevec__Getptr, 4) void* __thiscall _Timevec__Getptr(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->timeptr; } /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */

1 0