May 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Don' t assume maximal URL length in HTTP_ShouldBypassProxy.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: bd1f39ea276bf8d96e82bc59bc8872dd563361a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1f39ea276bf8d96e82bc59b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:18:05 2016 +0200 wininet: Don't assume maximal URL length in HTTP_ShouldBypassProxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 106 ++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 61 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9ccb776..daaf3aa 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1714,55 +1714,47 @@ static WCHAR *build_proxy_path_url(http_request_t *req) return url; } -static BOOL HTTP_DomainMatches(LPCWSTR server, LPCWSTR domain) +static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) { static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; - BOOL ret = FALSE; + const WCHAR *dot, *ptr; + int len; - if (!strcmpiW( domain, localW ) && !strchrW( server, '.' )) - ret = TRUE; - else if (*domain == '*') - { - if (domain[1] == '.') - { - LPCWSTR dot; - - /* For a hostname to match a wildcard, the last domain must match - * the wildcard exactly. E.g. if the wildcard is *.a.b, and the - * hostname is www.foo.a.b, it matches, but a.b does not. - */ - dot = strchrW( server, '.' ); - if (dot) - { - int len = strlenW( dot + 1 ); + if(domain.len == sizeof(localW)/sizeof(WCHAR)-1 && !strncmpiW(domain.str, localW, domain.len) && !strchrW(server, '.' )) + return TRUE; - if (len > strlenW( domain + 2 )) - { - LPCWSTR ptr; - - /* The server's domain is longer than the wildcard, so it - * could be a subdomain. Compare the last portion of the - * server's domain. - */ - ptr = dot + len + 1 - strlenW( domain + 2 ); - if (!strcmpiW( ptr, domain + 2 )) - { - /* This is only a match if the preceding character is - * a '.', i.e. that it is a matching domain. E.g. - * if domain is '*.b.c' and server is 'www.ab.c' they - * do not match. - */ - ret = *(ptr - 1) == '.'; - } - } - else - ret = !strcmpiW( dot + 1, domain + 2 ); - } - } - } - else - ret = !strcmpiW( server, domain ); - return ret; + if(domain.len && *domain.str != '*') + return domain.len == strlenW(server) && !strncmpiW(server, domain.str, domain.len); + + if(domain.len < 2 || domain.str[1] != '.') + return FALSE; + + /* For a hostname to match a wildcard, the last domain must match + * the wildcard exactly. E.g. if the wildcard is *.a.b, and the + * hostname is www.foo.a.b, it matches, but a.b does not. + */ + dot = strchrW(server, '.'); + if(!dot) + return FALSE; + + len = strlenW(dot + 1); + if(len <= domain.len - 2) + return FALSE; + + /* The server's domain is longer than the wildcard, so it + * could be a subdomain. Compare the last portion of the + * server's domain. + */ + ptr = dot + 1 + len - domain.len + 2; + if(!strncmpiW(ptr, domain.str+2, domain.len-2)) + /* This is only a match if the preceding character is + * a '.', i.e. that it is a matching domain. E.g. + * if domain is '*.b.c' and server is 'www.ab.c' they + * do not match. + */ + return *(ptr - 1) == '.'; + + return len == domain.len-2 && !strncmpiW(dot + 1, domain.str + 2, len); } static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) @@ -1772,27 +1764,19 @@ static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) if (!lpwai->proxyBypass) return FALSE; ptr = lpwai->proxyBypass; - do { + while(1) { LPCWSTR tmp = ptr; ptr = strchrW( ptr, ';' ); if (!ptr) ptr = strchrW( tmp, ' ' ); - if (ptr) - { - if (ptr - tmp < INTERNET_MAX_HOST_NAME_LENGTH) - { - WCHAR domain[INTERNET_MAX_HOST_NAME_LENGTH]; - - memcpy( domain, tmp, (ptr - tmp) * sizeof(WCHAR) ); - domain[ptr - tmp] = 0; - ret = HTTP_DomainMatches( server, domain ); - } - ptr += 1; - } - else if (*tmp) - ret = HTTP_DomainMatches( server, tmp ); - } while (ptr && !ret); + if (!ptr) + ptr = tmp + strlenW(ptr); + ret = HTTP_DomainMatches( server, substr(tmp, ptr-tmp) ); + if (ret || !*ptr) + break; + ptr++; + } return ret; }

1 0

Jacek Caban : wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 1d5670c7c45af92565e19973bbd9e2d7f16acbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5670c7c45af92565e19973b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:16:21 2016 +0200 wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url. Also use correct encoding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 371c3d0..78bea7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) +static WCHAR *get_proxy_autoconfig_url(void) { #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + WCHAR *ret = NULL; + SIZE_T len; const void *ref; - BOOL ret = FALSE; if (!settings) return FALSE; @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) CFRelease( settings ); return FALSE; } - if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + len = CFStringGetLength( ref ); + if (len) + ret = heap_alloc( (len+1) * sizeof(WCHAR) ); + if (ret) { - TRACE( "returning %s\n", debugstr_a(buf) ); - ret = TRUE; + CFStringGetCharacters( ref, CFRangeMake(0, len), ret ); + ret[len] = 0; } + TRACE( "returning %s\n", debugstr_w(ret) ); CFRelease( settings ); return ret; #else FIXME( "no support on this platform\n" ); - return FALSE; + return NULL; #endif } @@ -2418,20 +2423,17 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u } case INTERNET_OPTION_PER_CONNECTION_OPTION: { - char url[INTERNET_MAX_URL_LENGTH + 1]; + WCHAR *url; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; - BOOL have_url; LONG ret; TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret; - have_url = get_proxy_autoconfig_url(url, sizeof(url)); - FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { @@ -2439,6 +2441,8 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u return ERROR_INSUFFICIENT_BUFFER; } + url = get_proxy_autoconfig_url(); + for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; @@ -2449,7 +2453,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; - if (have_url) + if (url) /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; @@ -2469,12 +2473,12 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; case INTERNET_PER_CONN_AUTOCONFIG_URL: - if (!have_url) + if (!url) optionW->Value.pszValue = NULL; else if (unicode) - optionW->Value.pszValue = heap_strdupAtoW(url); + optionW->Value.pszValue = heap_strdupW(url); else - optionA->Value.pszValue = heap_strdupA(url); + optionA->Value.pszValue = heap_strdupWtoA(url); break; case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: @@ -2495,6 +2499,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; } } + heap_free(url); FreeProxyInfo(&pi); return res;

1 0

Jacek Caban : wininet: Don' t assume maximal URL length in INTERNET_InternetOpenUrlW.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 41e45509b6799fa5e9f8f8f202d016aa5e72294d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e45509b6799fa5e9f8f8f20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:15:24 2016 +0200 wininet: Don't assume maximal URL length in INTERNET_InternetOpenUrlW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 72 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 75ae2d6..f012d96 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3464,40 +3464,40 @@ BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwRese static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { - URL_COMPONENTSW urlComponents; - WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; - WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; - WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - WCHAR path[INTERNET_MAX_PATH_LENGTH]; - WCHAR extra[1024]; + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; + WCHAR *host, *user = NULL, *pass = NULL, *path; HINTERNET client = NULL, client1 = NULL; DWORD res; TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders), dwHeadersLength, dwFlags, dwContext); - urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); - urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; - urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - urlComponents.lpszPassword = password; - urlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; - urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; - urlComponents.lpszExtraInfo = extra; - urlComponents.dwExtraInfoLength = 1024; + urlComponents.dwHostNameLength = 1; + urlComponents.dwUserNameLength = 1; + urlComponents.dwPasswordLength = 1; + urlComponents.dwUrlPathLength = 1; + urlComponents.dwExtraInfoLength = 1; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return NULL; + + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP && urlComponents.dwExtraInfoLength) { + assert(urlComponents.lpszUrlPath + urlComponents.dwUrlPathLength == urlComponents.lpszExtraInfo); + urlComponents.dwUrlPathLength += urlComponents.dwExtraInfoLength; + } + + host = heap_strndupW(urlComponents.lpszHostName, urlComponents.dwHostNameLength); + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); + if(urlComponents.dwUserNameLength) + user = heap_strndupW(urlComponents.lpszUserName, urlComponents.dwUserNameLength); + if(urlComponents.dwPasswordLength) + pass = heap_strndupW(urlComponents.lpszPassword, urlComponents.dwPasswordLength); + switch(urlComponents.nScheme) { case INTERNET_SCHEME_FTP: if(urlComponents.nPort == 0) urlComponents.nPort = INTERNET_DEFAULT_FTP_PORT; - client = FTP_Connect(hIC, hostName, urlComponents.nPort, - userName, password, dwFlags, dwContext, INET_OPENURL); + client = FTP_Connect(hIC, host, urlComponents.nPort, + user, pass, dwFlags, dwContext, INET_OPENURL); if(client == NULL) break; client1 = FtpOpenFileW(client, path, GENERIC_READ, dwFlags, dwContext); @@ -3520,30 +3520,14 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE; /* FIXME: should use pointers, not handles, as handles are not thread-safe */ - res = HTTP_Connect(hIC, hostName, urlComponents.nPort, - userName, password, dwFlags, dwContext, INET_OPENURL, &client); + res = HTTP_Connect(hIC, host, urlComponents.nPort, + user, pass, dwFlags, dwContext, INET_OPENURL, &client); if(res != ERROR_SUCCESS) { INTERNET_SetLastError(res); break; } - if (urlComponents.dwExtraInfoLength) { - WCHAR *path_extra; - DWORD len = urlComponents.dwUrlPathLength + urlComponents.dwExtraInfoLength + 1; - - if (!(path_extra = heap_alloc(len * sizeof(WCHAR)))) - { - InternetCloseHandle(client); - break; - } - strcpyW(path_extra, urlComponents.lpszUrlPath); - strcatW(path_extra, urlComponents.lpszExtraInfo); - client1 = HttpOpenRequestW(client, NULL, path_extra, NULL, NULL, accept, dwFlags, dwContext); - heap_free(path_extra); - } - else - client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext); - + client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext); if(client1 == NULL) { InternetCloseHandle(client); break; @@ -3565,7 +3549,11 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, } TRACE(" %p <--\n", client1); - + + heap_free(host); + heap_free(path); + heap_free(user); + heap_free(pass); return client1; }

1 0

Jacek Caban : wininet: Store request URL in req_file_t.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 4227dfaa947c212842f56721f2984be20b3a77aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4227dfaa947c212842f56721f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:14:38 2016 +0200 wininet: Store request URL in req_file_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 81 ++++++++++++++++++++++++++++--------------------- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c44156c..9ccb776 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1873,14 +1873,14 @@ static DWORD HTTP_ResolveName(http_request_t *request) return ERROR_SUCCESS; } -static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) +static WCHAR *compose_request_url(http_request_t *req) { static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; - static const WCHAR slash[] = { '/',0 }; LPHTTPHEADERW host_header; - const WCHAR *host; - LPCWSTR scheme; + const WCHAR *host, *scheme; + WCHAR *buf, *ptr; + size_t len; EnterCriticalSection( &req->headers_section ); @@ -1888,18 +1888,30 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) if (host_header) host = host_header->lpszValue; else host = req->server->canon_host_port; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + if (req->server->is_https) scheme = https; else scheme = http; - strcpyW(buf, scheme); - strcatW(buf, host); - if (req->path[0] != '/') - strcatW(buf, slash); - strcatW(buf, req->path); + + len = strlenW(scheme) + strlenW(host) + (req->path[0] != '/' ? 1 : 0) + strlenW(req->path); + ptr = buf = heap_alloc((len+1) * sizeof(WCHAR)); + if(buf) { + strcpyW(ptr, scheme); + ptr += strlenW(ptr); + + strcpyW(ptr, host); + ptr += strlenW(ptr); + + if(req->path[0] != '/') + *ptr++ = '/'; + + strcpyW(ptr, req->path); + ptr += strlenW(ptr); + *ptr = 0; + } LeaveCriticalSection( &req->headers_section ); - return TRUE; + return buf; } @@ -2158,27 +2170,29 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_CACHE_TIMESTAMPS: { INTERNET_CACHE_ENTRY_INFOW *info; INTERNET_CACHE_TIMESTAMPS *ts = buffer; - WCHAR url[INTERNET_MAX_URL_LENGTH]; DWORD nbytes, error; BOOL ret; TRACE("INTERNET_OPTION_CACHE_TIMESTAMPS\n"); + if(!req->req_file) + return ERROR_FILE_NOT_FOUND; + if (*size < sizeof(*ts)) { *size = sizeof(*ts); return ERROR_INSUFFICIENT_BUFFER; } + nbytes = 0; - HTTP_GetRequestURL(req, url); - ret = GetUrlCacheEntryInfoW(url, NULL, &nbytes); + ret = GetUrlCacheEntryInfoW(req->req_file->url, NULL, &nbytes); error = GetLastError(); if (!ret && error == ERROR_INSUFFICIENT_BUFFER) { if (!(info = heap_alloc(nbytes))) return ERROR_OUTOFMEMORY; - GetUrlCacheEntryInfoW(url, info, &nbytes); + GetUrlCacheEntryInfoW(req->req_file->url, info, &nbytes); ts->ftExpires = info->ExpireTime; ts->ftLastModified = info->LastModifiedTime; @@ -2367,29 +2381,25 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, static void commit_cache_entry(http_request_t *req) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR *header; + DWORD header_len; + BOOL res; TRACE("%p\n", req); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; - if(HTTP_GetRequestURL(req, url)) { - WCHAR *header; - DWORD header_len; - BOOL res; - - header = build_response_header(req, TRUE); - header_len = (header ? strlenW(header) : 0); - res = CommitUrlCacheEntryW(url, req->req_file->file_name, req->expires, - req->last_modified, NORMAL_CACHE_ENTRY, - header, header_len, NULL, 0); - if(res) - req->req_file->is_committed = TRUE; - else - WARN("CommitUrlCacheEntry failed: %u\n", GetLastError()); - heap_free(header); - } + header = build_response_header(req, TRUE); + header_len = (header ? strlenW(header) : 0); + res = CommitUrlCacheEntryW(req->req_file->url, req->req_file->file_name, req->expires, + req->last_modified, NORMAL_CACHE_ENTRY, + header, header_len, NULL, 0); + if(res) + req->req_file->is_committed = TRUE; + else + WARN("CommitUrlCacheEntry failed: %u\n", GetLastError()); + heap_free(header); } static void create_cache_entry(http_request_t *req) @@ -2397,8 +2407,8 @@ static void create_cache_entry(http_request_t *req) static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; - WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; + WCHAR *url; BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ @@ -2455,8 +2465,8 @@ static void create_cache_entry(http_request_t *req) FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); } - b = HTTP_GetRequestURL(req, url); - if(!b) { + url = compose_request_url(req); + if(!url) { WARN("Could not get URL\n"); return; } @@ -2468,6 +2478,7 @@ static void create_cache_entry(http_request_t *req) } create_req_file(file_name, &req->req_file); + req->req_file->url = url; req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e192592..75ae2d6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3901,6 +3901,7 @@ void req_file_release(req_file_t *req_file) if(req_file->file_handle && req_file->file_handle != INVALID_HANDLE_VALUE) CloseHandle(req_file->file_handle); heap_free(req_file->file_name); + heap_free(req_file->url); heap_free(req_file); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 54c7555..20ee999 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -268,6 +268,7 @@ typedef struct LONG ref; HANDLE file_handle; WCHAR *file_name; + WCHAR *url; BOOL is_committed; } req_file_t;

1 0

Henri Verbeet : wined3d: Rename MAX_CONST_B to WINED3D_MAX_CONSTS_B.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 076697e31ab75f97b8b992debc8e7fc4e95a296b URL: http://source.winehq.org/git/wine.git/?a=commit;h=076697e31ab75f97b8b992deb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:56 2016 +0200 wined3d: Rename MAX_CONST_B to WINED3D_MAX_CONSTS_B. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 18 +++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=076697e31ab75f97b8b99…

1 0

Jacek Caban : wininet: Get rid of INTERNET_INVALID_PORT_NUMBER fixups after InternetCrackUrl calls.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 228c06086a45d84602f0b4fe3e45b3dd160a1459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=228c06086a45d84602f0b4fe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:20:21 2016 +0200 wininet: Get rid of INTERNET_INVALID_PORT_NUMBER fixups after InternetCrackUrl calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 17 +++-------------- dlls/wininet/internet.c | 9 +-------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 96f481e..21f6ff2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1792,7 +1792,6 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req URL_COMPONENTSW UrlComponents = { sizeof(UrlComponents) }; server_t *new_server = NULL; WCHAR *proxy; - BOOL is_https; proxy = INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp); if(!proxy) @@ -1813,12 +1812,8 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if( !request->path ) request->path = szNul; - is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS); - if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - new_server = get_server(substr(UrlComponents.lpszHostName, UrlComponents.dwHostNameLength), - UrlComponents.nPort, is_https, TRUE); + UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); } heap_free(proxy); if(!new_server) @@ -4171,10 +4166,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) request->hdr.dwFlags &= ~INTERNET_FLAG_SECURE; } - if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - else if(urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT) - custom_port = TRUE; + custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT; }else if(!strcmpiW(protocol, httpsW)) { if(!(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { TRACE("redirect from non-secure page to secure page\n"); @@ -4182,10 +4174,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) request->hdr.dwFlags |= INTERNET_FLAG_SECURE; } - if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - else if(urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) - custom_port = TRUE; + custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT; } heap_free(session->hostName); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9751a49..bd380dc 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3477,8 +3477,6 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, switch(urlComponents.nScheme) { case INTERNET_SCHEME_FTP: - if(urlComponents.nPort == 0) - urlComponents.nPort = INTERNET_DEFAULT_FTP_PORT; client = FTP_Connect(hIC, host, urlComponents.nPort, user, pass, dwFlags, dwContext, INET_OPENURL); if(client == NULL) @@ -3494,12 +3492,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, case INTERNET_SCHEME_HTTPS: { static const WCHAR szStars[] = { '*','/','*', 0 }; LPCWSTR accept[2] = { szStars, NULL }; - if(urlComponents.nPort == 0) { - if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) - urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - else - urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - } + if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE; /* FIXME: should use pointers, not handles, as handles are not thread-safe */

1 0

Jacek Caban : wininet: Don' t assume maximum URL length in HTTP_DealWithProxy.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: dfa014a5723c0241a95494892d70a4ebe9126207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa014a5723c0241a95494892… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:19:59 2016 +0200 wininet: Don't assume maximum URL length in HTTP_DealWithProxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 53 ++++++++++++++++++------------------ dlls/wininet/internet.c | 72 +++++++++++++++++-------------------------------- dlls/wininet/internet.h | 2 +- 3 files changed, 51 insertions(+), 76 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0f155cf..96f481e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1788,40 +1788,39 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req { static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; - WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; - DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; - WCHAR proxy[INTERNET_MAX_URL_LENGTH]; static WCHAR szNul[] = { 0 }; - URL_COMPONENTSW UrlComponents; - server_t *new_server; + URL_COMPONENTSW UrlComponents = { sizeof(UrlComponents) }; + server_t *new_server = NULL; + WCHAR *proxy; BOOL is_https; - memset( &UrlComponents, 0, sizeof UrlComponents ); - UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.dwHostNameLength = 1; - - if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen)) - return FALSE; - if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - protoProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) - sprintfW(proxy, szFormat, protoProxy); - else - strcpyW(proxy, protoProxy); - if( !InternetCrackUrlW(proxy, 0, 0, &UrlComponents) ) - return FALSE; - if( UrlComponents.dwHostNameLength == 0 ) + proxy = INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp); + if(!proxy) return FALSE; + if(CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + proxy, strlenW(szHttp), szHttp, strlenW(szHttp))) { + WCHAR *proxy_url = heap_alloc(strlenW(proxy)*sizeof(WCHAR) + sizeof(szHttp)); + if(!proxy_url) + return FALSE; + strcpyW(proxy_url, szHttp); + strcatW(proxy_url, proxy); + heap_free(proxy); + proxy = proxy_url; + } - if( !request->path ) - request->path = szNul; + UrlComponents.dwHostNameLength = 1; + if(InternetCrackUrlW(proxy, 0, 0, &UrlComponents) && UrlComponents.dwHostNameLength) { + if( !request->path ) + request->path = szNul; - is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS); - if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; + is_https = (UrlComponents.nScheme == INTERNET_SCHEME_HTTPS); + if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - new_server = get_server(substr(UrlComponents.lpszHostName, UrlComponents.dwHostNameLength), - UrlComponents.nPort, is_https, TRUE); + new_server = get_server(substr(UrlComponents.lpszHostName, UrlComponents.dwHostNameLength), + UrlComponents.nPort, is_https, TRUE); + } + heap_free(proxy); if(!new_server) return FALSE; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fdad378..9751a49 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -390,15 +390,15 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) * *foundProxyLen is set to the required size in WCHARs, including the * NULL terminator, and the last error is set to ERROR_INSUFFICIENT_BUFFER. */ -BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) +WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) { - LPCWSTR ptr; - BOOL ret = FALSE; + WCHAR *ret = NULL; + const WCHAR *ptr; TRACE("(%s, %s)\n", debugstr_w(szProxy), debugstr_w(proto)); /* First, look for the specified protocol (proto=scheme://host:port) */ - for (ptr = szProxy; !ret && ptr && *ptr; ) + for (ptr = szProxy; ptr && *ptr; ) { LPCWSTR end, equal; @@ -408,60 +408,36 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP equal - ptr == strlenW(proto) && !strncmpiW(proto, ptr, strlenW(proto))) { - if (end - equal > *foundProxyLen) - { - WARN("buffer too short for %s\n", - debugstr_wn(equal + 1, end - equal - 1)); - *foundProxyLen = end - equal; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - } - else - { - memcpy(foundProxy, equal + 1, (end - equal) * sizeof(WCHAR)); - foundProxy[end - equal] = 0; - ret = TRUE; - } + ret = heap_strndupW(equal + 1, end - equal - 1); + TRACE("found proxy for %s: %s\n", debugstr_w(proto), debugstr_w(ret)); + return ret; } if (*end == ' ') ptr = end + 1; else ptr = end; } - if (!ret) + + /* It wasn't found: look for no protocol */ + for (ptr = szProxy; ptr && *ptr; ) { - /* It wasn't found: look for no protocol */ - for (ptr = szProxy; !ret && ptr && *ptr; ) - { - LPCWSTR end; + LPCWSTR end; - if (!(end = strchrW(ptr, ' '))) - end = ptr + strlenW(ptr); - if (!strchrW(ptr, '=')) - { - if (end - ptr + 1 > *foundProxyLen) - { - WARN("buffer too short for %s\n", - debugstr_wn(ptr, end - ptr)); - *foundProxyLen = end - ptr + 1; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - } - else - { - memcpy(foundProxy, ptr, (end - ptr) * sizeof(WCHAR)); - foundProxy[end - ptr] = 0; - ret = TRUE; - } - } - if (*end == ' ') - ptr = end + 1; - else - ptr = end; + if (!(end = strchrW(ptr, ' '))) + end = ptr + strlenW(ptr); + if (!strchrW(ptr, '=')) + { + ret = heap_strndupW(ptr, end - ptr); + TRACE("found proxy for %s: %s\n", debugstr_w(proto), debugstr_w(ret)); + return ret; } + if (*end == ' ') + ptr = end + 1; + else + ptr = end; } - if (ret) - TRACE("found proxy for %s: %s\n", debugstr_w(proto), - debugstr_w(foundProxy)); - return ret; + + return NULL; } /*********************************************************************** diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8cd1a8e..91c09b8 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -450,7 +450,7 @@ VOID SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; -BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; +WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN; DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Pass host name as substring to get_server.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 3413d01764b435a708d67b5a8a00d973f16e9720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3413d01764b435a708d67b5a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:18:32 2016 +0200 wininet: Pass host name as substring to get_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 18 +++++++++--------- dlls/wininet/internet.c | 10 +--------- dlls/wininet/internet.h | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index daaf3aa..0f155cf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -265,7 +265,7 @@ static BOOL process_host_port(server_t *server) return TRUE; } -server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create) +server_t *get_server(substr_t name, INTERNET_PORT port, BOOL is_https, BOOL do_create) { server_t *iter, *server = NULL; @@ -275,7 +275,8 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { - if(iter->port == port && !strcmpW(iter->name, name) && iter->is_https == is_https) { + if(iter->port == port && name.len == strlenW(iter->name) && !strncmpW(iter->name, name.str, name.len) + && iter->is_https == is_https) { server = iter; server_addref(server); break; @@ -289,7 +290,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server->port = port; server->is_https = is_https; list_init(&server->conn_pool); - server->name = heap_strdupW(name); + server->name = heap_strndupW(name.str, name.len); if(server->name && process_host_port(server)) { list_add_head(&connection_pool, &server->entry); }else { @@ -1788,7 +1789,6 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; - WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; WCHAR proxy[INTERNET_MAX_URL_LENGTH]; @@ -1799,8 +1799,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.lpszHostName = buf; - UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + UrlComponents.dwHostNameLength = 1; if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen)) return FALSE; @@ -1821,7 +1820,8 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if (is_https && UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, is_https, TRUE); + new_server = get_server(substr(UrlComponents.lpszHostName, UrlComponents.dwHostNameLength), + UrlComponents.nPort, is_https, TRUE); if(!new_server) return FALSE; @@ -3391,7 +3391,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - request->server = get_server(session->hostName, session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); + request->server = get_server(substrz(session->hostName), session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -4204,7 +4204,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; - new_server = get_server(hostName, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); + new_server = get_server(substrz(hostName), urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); server_release(request->server); request->server = new_server; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 78bea7c..fdad378 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4496,7 +4496,6 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT { URL_COMPONENTSW url = {sizeof(url)}; server_t *server; - WCHAR *hostname; BOOL res; TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); @@ -4508,14 +4507,7 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT return FALSE; } - hostname = heap_strndupW(url.lpszHostName, url.dwHostNameLength); - if(!hostname) { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - server = get_server(hostname, url.nPort, TRUE, FALSE); - heap_free(hostname); + server = get_server(substr(url.lpszHostName, url.dwHostNameLength), url.nPort, TRUE, FALSE); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 20ee999..8cd1a8e 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -467,7 +467,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; +server_t *get_server(substr_t,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; void req_file_release(req_file_t*) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f().
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 73ba87658c8f3990685c62f75dfb40e86e9db99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ba87658c8f3990685c62f75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:57 2016 +0200 wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++++---------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1938016..0d28826 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2884,7 +2884,7 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 316be5d..ec489e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2374,24 +2374,28 @@ static void device_invalidate_shader_constants(const struct wined3d_device *devi } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, const BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_b[start_register], constants, count * sizeof(BOOL)); - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %s.\n", start_register + i, constants[i] ? "true" : "false"); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(&device->update_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsB |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a57591b..d5a7c61 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -911,7 +911,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - stateblock->state.vs_consts_b + stateblock->contained_vs_consts_b[i], 1); + 1, &stateblock->state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } apply_lights(device, &stateblock->state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c4446b8..2495120 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -149,7 +149,7 @@ @ cdecl wined3d_device_set_vertex_shader(ptr ptr) @ cdecl wined3d_device_set_viewport(ptr ptr) @ cdecl wined3d_device_set_vs_cb(ptr long ptr) -@ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af320a4..2020475 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,7 +2247,7 @@ void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, str void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, - UINT start_register, const BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f().
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 9c8c391146b529b497101374269476cb6c6cff0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c391146b529b4971013742… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:41:58 2016 +0200 wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d28826..25ed842 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2899,7 +2899,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec489e9..1761829 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2407,17 +2407,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_b[start_register], count * sizeof(BOOL)); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(constants, &device->state.vs_consts_b[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2495120..e7f7ca2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -93,7 +93,7 @@ @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) -@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2020475..9eb0f46 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2159,7 +2159,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wi void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, BOOL *constants); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device,

1 0