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

Józef Kucia : d3d10core/tests: Use D3D10 enum values instead of D3D11 ones.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: c653dbd1b4ee36091fdd7b70717bcde5713f2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c653dbd1b4ee36091fdd7b707… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:41 2016 +0200 d3d10core/tests: Use D3D10 enum values instead of D3D11 ones. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9500060..fd077b5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -880,8 +880,8 @@ static void test_texture2d_interfaces(void) desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; @@ -997,15 +997,15 @@ static void test_create_texture3d(void) } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Nikolay Sivov : dwrite: Be prepared for 0 face_id passed to face requester.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: e0e937e19a12d6f488644dfaf8bb2c25e5cd54cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e937e19a12d6f488644dfaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 18 10:11:39 2016 +0300 dwrite: Be prepared for 0 face_id passed to face requester. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index d8afa69..b6d785f 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -107,6 +107,11 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe *face = NULL; + if (!fontface) { + WARN("NULL fontface requested.\n"); + return FT_Err_Ok; + } + count = 1; hr = IDWriteFontFace_GetFiles(fontface, &count, &file); if (FAILED(hr))

1 0

Frédéric Delanoy : ntdll: Fix a typo in an comment.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 07a87666a1b0e2e394df4e6cf78d1c2393b47143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a87666a1b0e2e394df4e6cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:32 2016 +0200 ntdll: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 781750b..15510e2 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1894,7 +1894,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa /*********************************************************************** * tp_object_submit (internal) * - * Submits a threadpool object to the associcated threadpool. This + * Submits a threadpool object to the associated threadpool. This * function has to be VOID because TpPostWork can never fail on Windows. */ static void tp_object_submit( struct threadpool_object *object, BOOL signaled )

1 0

Frédéric Delanoy : oleaut32: Fix a typo in an comment.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: c12845216cb254fd902ffa30668aa74b1b184ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12845216cb254fd902ffa306… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:33 2016 +0200 oleaut32: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 8f274ba..31c9ab9 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -217,7 +217,7 @@ typedef struct { /* after this may follow an array with default value pointers if the * appropriate bit in the FKCCIC field has been set: - * INT oDefautlValue[nrargs]; + * INT oDefaultValue[nrargs]; */ /* Parameter info one per argument*/

1 0

Jacek Caban : wininet: Rewrite test_accept_encoding using more generic request.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: ce4bdcd0c1f619096631974d101eb4b95978671d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4bdcd0c1f619096631974d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:13:56 2016 +0200 wininet: Rewrite test_accept_encoding using more generic request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 78cec50..d42c3e7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -475,6 +475,18 @@ static void _close_request(unsigned line, test_request_t *req) ok_(__FILE__,line)(ret, "InternetCloseHandle(session) failed: %u\n", GetLastError()); } +#define receive_simple_request(a,b,c) _receive_simple_request(__LINE__,a,b,c) +static DWORD _receive_simple_request(unsigned line, HINTERNET req, char *buf, size_t buf_size) +{ + DWORD read = 0; + BOOL ret; + + ret = InternetReadFile(req, buf, buf_size, &read); + ok_(__FILE__,line)(ret, "InternetReadFile failed: %u\n", GetLastError()); + + return read; +} + static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) { BOOL res; @@ -2055,7 +2067,8 @@ static DWORD CALLBACK server_thread(LPVOID param) int r, c = -1, i, on, count = 0; SOCKET s; struct sockaddr_in sa; - char buffer[0x100]; + char *buffer; + size_t buffer_size; WSADATA wsaData; int last_request = 0; char host_header[22]; @@ -2086,16 +2099,20 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(host_header, "Host: localhost:%d", si->port); sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size = 1000); do { if(c == -1) c = accept(s, NULL, NULL); - memset(buffer, 0, sizeof buffer); - for(i=0; i<(sizeof buffer-1); i++) + memset(buffer, 0, buffer_size); + for(i=0;; i++) { - r = recv(c, &buffer[i], 1, 0); + if(i == buffer_size) + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, buffer_size *= 2); + + r = recv(c, buffer+i, 1, 0); if (r != 1) break; if (i<4) continue; @@ -2168,7 +2185,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "Content-Length: 100")) { if (strstr(buffer, "POST /test7b")) - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } @@ -2259,7 +2276,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /testH")) { send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); - recvfrom(c, buffer, sizeof(buffer), 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } @@ -2341,13 +2358,6 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); - if (strstr(buffer, "/test_accept_encoding_http10")) - { - if (strstr(buffer, "Accept-Encoding: gzip")) - send(c, okmsg, sizeof okmsg-1, 0); - else - send(c, notokmsg, sizeof notokmsg-1, 0); - } if (strstr(buffer, "HEAD /upload.txt")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -2384,12 +2394,18 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(server_req_rec_event); WaitForSingleObject(conn_wait_event, INFINITE); } + if (strstr(buffer, "/echo_request")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, buffer, strlen(buffer), 0); + } shutdown(c, 2); closesocket(c); c = -1; } while (!last_request); closesocket(s); + HeapFree(GetProcessHeap(), 0, buffer); return 0; } @@ -4250,6 +4266,7 @@ static void test_request_content_length(int port) static void test_accept_encoding(int port) { HINTERNET ses, con, req; + char buf[1000]; BOOL ret; ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -4258,7 +4275,7 @@ static void test_accept_encoding(int port) con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, "Accept-Encoding: gzip\r\n", ~0u, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); @@ -4268,16 +4285,20 @@ static void test_accept_encoding(int port) ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, "Accept-Encoding: gzip", ~0u, NULL, 0); ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Jacek Caban : wininet: Store request URL in req_file_t.
by Alexandre Julliard 18 May '16

18 May '16

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

Jacek Caban : wininet: Added test of request with a long URL.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 9e497aeca2658c33625618fd63731a8150721dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e497aeca2658c33625618fd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:14:47 2016 +0200 wininet: Added test of request with a long URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d42c3e7..29dd965 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4717,6 +4717,27 @@ static void test_http_read(int port) CloseHandle(server_req_rec_event); } +static void test_long_url(int port) +{ + char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; + char buf[sizeof(long_path)*2]; + test_request_t req; + BOOL ret; + + memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path)); + long_path[sizeof(long_path)-1] = 0; + open_simple_request(&req, "localhost", port, NULL, long_path); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); + + receive_simple_request(req.request, buf, sizeof(buf)); + ok(strstr(buf, long_path) != NULL, "long pathnot found in %s\n", buf); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -4767,6 +4788,7 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); test_http_read(si.port); + test_long_url(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

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

18 May '16

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: Initialize url_w in InternetCrackUrlA.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: e0e0b6b7c6c74a58f41cde96972c045b2e34e167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e0b6b7c6c74a58f41cde969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:15:34 2016 +0200 wininet: Initialize url_w in InternetCrackUrlA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f012d96..f7e974a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1551,7 +1551,7 @@ BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, UR { WCHAR *host = NULL, *user = NULL, *pass = NULL, *path = NULL, *scheme = NULL, *extra = NULL; URL_COMPONENTSW comp; - WCHAR *url_w; + WCHAR *url_w = NULL; BOOL ret; TRACE("(%s %u %x %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp);

1 0

Jacek Caban : wininet: Include config.h in internet.c for Mac configure macros.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 7d541b3fd3531e9edb334780f9ff3093fed6fd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d541b3fd3531e9edb334780f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:15:49 2016 +0200 wininet: Include config.h in internet.c for Mac configure macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f7e974a..371c3d0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -26,15 +26,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "ws2tcpip.h" - -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> -#include <assert.h> +#include "config.h" #ifdef HAVE_CORESERVICES_CORESERVICES_H #define GetCurrentThread MacGetCurrentThread @@ -45,6 +37,16 @@ #undef DPRINTF #endif +#include "winsock2.h" +#include "ws2ipdef.h" + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <assert.h> + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -3370,7 +3372,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_storage saddr; - socklen_t sa_len = sizeof(saddr); + int sa_len = sizeof(saddr); WCHAR *host_z; int fd; BOOL b;

1 0