April 2013 - Wine-commits - list.winehq.org

Piotr Caban : wininet: Take HTTP_QUERY_FLAG_REQUEST_HEADERS flag into account when creating HTTP_QUERY_RAW_HEADERS data information .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 259ffa2a1af83b03c8d4d0107d40666dcb7f2b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259ffa2a1af83b03c8d4d0107… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:59:33 2013 +0200 wininet: Take HTTP_QUERY_FLAG_REQUEST_HEADERS flag into account when creating HTTP_QUERY_RAW_HEADERS data information. --- dlls/wininet/http.c | 61 ++++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 682ed36..f5ec392 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -631,20 +631,21 @@ static void HTTP_FixURL(http_request_t *request) } } -static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR verb, LPCWSTR path, LPCWSTR version ) +static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, + const WCHAR *path, const WCHAR *version, BOOL use_cr) { LPWSTR requestString; DWORD len, n; LPCWSTR *req; UINT i; - LPWSTR p; static const WCHAR szSpace[] = { ' ',0 }; static const WCHAR szColon[] = { ':',' ',0 }; - static const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; + static const WCHAR szCr[] = { '\r',0 }; + static const WCHAR szLf[] = { '\n',0 }; /* allocate space for an array of all the string pointers to be added */ - len = (request->nCustHeaders)*4 + 10; + len = (request->nCustHeaders)*5 + 10; req = heap_alloc(len*sizeof(LPCWSTR)); /* add the verb, path and HTTP version string */ @@ -654,39 +655,34 @@ static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR ve req[n++] = path; req[n++] = szSpace; req[n++] = version; + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; /* Append custom request headers */ for (i = 0; i < request->nCustHeaders; i++) { if (request->custHeaders[i].wFlags & HDR_ISREQUEST) { - req[n++] = szCrLf; req[n++] = request->custHeaders[i].lpszField; req[n++] = szColon; req[n++] = request->custHeaders[i].lpszValue; + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; TRACE("Adding custom header %s (%s)\n", debugstr_w(request->custHeaders[i].lpszField), debugstr_w(request->custHeaders[i].lpszValue)); } } - - if( n >= len ) - ERR("oops. buffer overrun\n"); - + if (use_cr) + req[n++] = szCr; + req[n++] = szLf; req[n] = NULL; + requestString = HTTP_build_req( req, 4 ); heap_free( req ); - - /* - * Set (header) termination string for request - * Make sure there's exactly two new lines at the end of the request - */ - p = &requestString[strlenW(requestString)-1]; - while ( (*p == '\n') || (*p == '\r') ) - p--; - strcpyW( p+1, sztwocrlf ); - return requestString; } @@ -3421,13 +3417,13 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, DWORD res = ERROR_INVALID_PARAMETER; if (request_only) - headers = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); + headers = build_request_header(request, request->verb, request->path, request->version, TRUE); else headers = build_response_header(request, TRUE); + if (!headers) + return ERROR_OUTOFMEMORY; - if (headers) - len = strlenW(headers) * sizeof(WCHAR); - + len = strlenW(headers) * sizeof(WCHAR); if (len + sizeof(WCHAR) > *lpdwBufferLength) { len += sizeof(WCHAR); @@ -3435,13 +3431,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } else if (lpBuffer) { - if (headers) - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); - else - { - len = strlenW(szCrLf) * sizeof(WCHAR); - memcpy(lpBuffer, szCrLf, sizeof(szCrLf)); - } + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR))); res = ERROR_SUCCESS; } @@ -3455,7 +3445,10 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, LPWSTR headers; DWORD len; - headers = build_response_header(request, FALSE); + if (request_only) + headers = build_request_header(request, request->verb, request->path, request->version, FALSE); + else + headers = build_response_header(request, FALSE); if (!headers) return ERROR_OUTOFMEMORY; @@ -4070,7 +4063,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) TRACE("\n"); - requestString = HTTP_BuildHeaderRequestString( request, connectW, server->host_port, g_szHttp1_1 ); + requestString = build_request_header( request, connectW, server->host_port, g_szHttp1_1, TRUE ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); @@ -4829,11 +4822,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->proxy) { WCHAR *url = build_proxy_path_url(request); - requestString = HTTP_BuildHeaderRequestString(request, request->verb, url, request->version); + requestString = build_request_header(request, request->verb, url, request->version, TRUE); heap_free(url); } else - requestString = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); + requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); TRACE("Request header -> %s\n", debugstr_w(requestString) );

1 0

Piotr Caban : wininet: Delete Content-Encoding header when uncompressing data.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 7883976722e447dc65bcb92776228e9489e3e1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7883976722e447dc65bcb9277… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:59:49 2013 +0200 wininet: Delete Content-Encoding header when uncompressing data. --- dlls/wininet/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f5ec392..281fe66 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2822,8 +2822,10 @@ static DWORD set_content_length(http_request_t *request) static const WCHAR gzipW[] = {'g','z','i','p',0}; encoding_idx = HTTP_GetCustomHeaderIndex(request, szContent_Encoding, 0, FALSE); - if(encoding_idx != -1 && !strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) + if(encoding_idx != -1 && !strcmpiW(request->custHeaders[encoding_idx].lpszValue, gzipW)) { + HTTP_DeleteCustomHeader(request, encoding_idx); return init_gzip_stream(request); + } } return ERROR_SUCCESS;

1 0

Piotr Caban : wininet: Add current raw headers to cache.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 566b14479c2d5959a23dfb3d854bc569b336c9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=566b14479c2d5959a23dfb3d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:06 2013 +0200 wininet: Add current raw headers to cache. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 281fe66..aaf1c86 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2276,12 +2276,15 @@ static void commit_cache_entry(http_request_t *req) req->hCacheFile = NULL; if(HTTP_GetRequestURL(req, url)) { - DWORD headersLen; + WCHAR *header; + DWORD header_len; - headersLen = req->rawHeaders ? strlenW(req->rawHeaders) : 0; + header = build_response_header(req, TRUE); + header_len = (header ? strlenW(header) : 0); CommitUrlCacheEntryW(url, req->cacheFile, req->expires, req->last_modified, NORMAL_CACHE_ENTRY, - req->rawHeaders, headersLen, NULL, 0); + header, header_len, NULL, 0); + heap_free(header); } }

1 0

Piotr Caban : wininet: Get rid of rawHeaders field in request_t structure.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 422fb313d36952f181b54b1c5c9b29b2b5bcaba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422fb313d36952f181b54b1c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:18 2013 +0200 wininet: Get rid of rawHeaders field in request_t structure. --- dlls/wininet/http.c | 71 ++++++---------------------------------------- dlls/wininet/internet.h | 1 - 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aaf1c86..94b63c8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -701,7 +701,7 @@ static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) if(!req) return NULL; - if(request->rawHeaders) + if (request->status_code) { req[n++] = request->version; sprintfW(buf, status_fmt, request->status_code); @@ -1847,7 +1847,6 @@ static void HTTPREQ_Destroy(object_header_t *hdr) heap_free(request->path); heap_free(request->verb); - heap_free(request->rawHeaders); heap_free(request->version); heap_free(request->statusText); @@ -2179,7 +2178,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe if(req->proxy) flags |= INTERNET_REQFLAG_VIA_PROXY; - if(!req->rawHeaders) + if(!req->status_code) flags |= INTERNET_REQFLAG_NO_HEADERS; TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags); @@ -5742,10 +5741,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) INT rc = 0; char bufferA[MAX_REPLY_LEN]; LPWSTR status_code = NULL, status_text = NULL; - DWORD res = ERROR_HTTP_INVALID_SERVER_RESPONSE, cchMaxRawHeaders = 1024; - LPWSTR lpszRawHeaders = NULL; - LPWSTR temp; - DWORD cchRawHeaders = 0; + DWORD res = ERROR_HTTP_INVALID_SERVER_RESPONSE; BOOL codeHundred = FALSE; TRACE("-->\n"); @@ -5802,9 +5798,6 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) request->version = heap_strdupW(g_szHttp1_0); request->statusText = heap_strdupW(szOK); - heap_free(request->rawHeaders); - request->rawHeaders = heap_strdupW(szDefaultHeader); - goto lend; } } while (codeHundred); @@ -5823,25 +5816,10 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) *(status_code-1) = ' '; *(status_text-1) = ' '; - /* regenerate raw headers */ - lpszRawHeaders = heap_alloc((cchMaxRawHeaders + 1) * sizeof(WCHAR)); - if (!lpszRawHeaders) goto lend; - - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - /* Parse each response line */ do { - buflen = MAX_REPLY_LEN; + buflen = MAX_REPLY_LEN; if (!read_line(request, bufferA, &buflen) && buflen) { LPWSTR * pFieldAndValue; @@ -5854,52 +5832,23 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) pFieldAndValue = HTTP_InterpretHttpHeader(buffer); if (pFieldAndValue) { - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - HTTP_ProcessHeader(request, pFieldAndValue[0], pFieldAndValue[1], HTTP_ADDREQ_FLAG_ADD ); - HTTP_FreeTokens(pFieldAndValue); } } - else - { - cbreaks++; - if (cbreaks >= 2) - break; - } + else + { + cbreaks++; + if (cbreaks >= 2) + break; + } }while(1); - /* make sure the response header is terminated with an empty line. Some apps really - truly care about that empty line being there for some reason. Just add it to the - header. */ - if (cchRawHeaders + strlenW(szCrLf) > cchMaxRawHeaders) - { - cchMaxRawHeaders = cchRawHeaders + strlenW(szCrLf); - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders + 1) * sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - } - - memcpy(&lpszRawHeaders[cchRawHeaders], szCrLf, sizeof(szCrLf)); - - heap_free(request->rawHeaders); - request->rawHeaders = lpszRawHeaders; - TRACE("raw headers: %s\n", debugstr_w(lpszRawHeaders)); res = ERROR_SUCCESS; lend: - if (res) heap_free(lpszRawHeaders); *len = rc; TRACE("<--\n"); return res; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b828f83..246eb95 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -343,7 +343,6 @@ typedef struct server_t *proxy; LPWSTR path; LPWSTR verb; - LPWSTR rawHeaders; netconn_t *netconn; DWORD security_flags; DWORD connect_timeout;

1 0

Piotr Caban : wininet: Add test of reading gzipped content from cache.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 8dfd89c2e00cfad8373b5f598111237ecf154030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfd89c2e00cfad8373b5f598… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:36 2013 +0200 wininet: Add test of reading gzipped content from cache. --- dlls/wininet/tests/http.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ceddde1..664fbbf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1815,6 +1815,8 @@ struct server_info { int port; }; +static int test_cache_gzip; + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2029,6 +2031,16 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: junk, \t No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } + if (strstr(buffer, "GET /test_cache_gzip")) + { + static const char gzip_response[] = "HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Type: text/html\r\n\r\n" + "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x4b\xaf\xca\x2c\x50\x28" + "\x49\x2d\x2e\xe1\x02\x00\x62\x92\xc7\x6c\x0a\x00\x00\x00"; + if(!test_cache_gzip++) + send(c, gzip_response, sizeof(gzip_response), 0); + else + send(c, notokmsg, sizeof(notokmsg)-1, 0); + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -2765,6 +2777,133 @@ static void test_no_cache(int port) InternetCloseHandle(ses); } +static void test_cache_read_gzipped(int port) +{ + static const char cache_url_fmt[] = "http://localhost:%d%s"; + static const char get_gzip[] = "/test_cache_gzip"; + static const char content[] = "gzip test\n"; + static const char text_html[] = "text/html"; + static const char raw_header[] = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"; + + HINTERNET ses, con, req; + DWORD read, size; + char cache_url[256], buf[256]; + BOOL ret; + + trace("Testing reading compressed content from cache\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + if(!ret && GetLastError()==ERROR_INTERNET_INVALID_OPTION) { + win_skip("INTERNET_OPTION_HTTP_DECODING not supported\n"); + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return; + } + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(raw_header, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + todo_wine ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + ok(!ret && GetLastError()==ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) returned %d, %d\n", + ret, GetLastError()); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + todo_wine ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + /* Decompression doesn't work while reading from cache */ + test_cache_gzip = 0; + sprintf(cache_url, cache_url_fmt, port, get_gzip); + DeleteUrlCacheEntry(cache_url); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + ok(size == 31, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + todo_wine ok(size == 31, "read %d bytes of data\n", size); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) failed: %d\n", GetLastError()); + InternetCloseHandle(req); + + InternetCloseHandle(con); + InternetCloseHandle(ses); + + DeleteUrlCacheEntry(cache_url); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -3269,6 +3408,7 @@ static void test_http_connection(void) test_no_content(si.port); test_conn_close(si.port); test_no_cache(si.port); + test_cache_read_gzipped(si.port); test_premature_disconnect(si.port); /* send the basic request again to shutdown the server thread */

1 0

Dmitry Timoshkov : kernel32: Add some tests for PEB and loader locks.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 3de37fefce2196029e1935acf2a1767f997e74b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de37fefce2196029e1935acf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 17:20:24 2013 +0900 kernel32: Add some tests for PEB and loader locks. --- dlls/kernel32/tests/loader.c | 170 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 161 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3de37fefce2196029e193…

1 0

Dmitry Timoshkov : include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 10476af6268de52f98112d47264ac4f4f7f5dc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10476af6268de52f98112d472… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 18:12:47 2013 +0900 include: Make KNONVOLATILE_CONTEXT_POINTERS match PSDK definition. --- dlls/ntdll/rtl.c | 1 + dlls/ntdll/signal_x86_64.c | 2 +- include/winnt.h | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 34869e7..bbcd454 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -34,6 +34,7 @@ #include <netinet/in.h> #endif #include "ntstatus.h" +#define NONAMELESSUNION #define NONAMELESSSTRUCT #define WIN32_NO_STATUS #define USE_WS_PREFIX diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7d2b8d5..f5a8ec9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2574,7 +2574,7 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A val ) { *(&context->u.s.Xmm0 + reg) = val; - if (ctx_ptr) ctx_ptr->u1.FloatingContext[reg] = &context->u.s.Xmm0 + reg; + if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = &context->u.s.Xmm0 + reg; } static int get_opcode_size( struct opcode op ) diff --git a/include/winnt.h b/include/winnt.h index bdfa464..6911f1c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1158,8 +1158,8 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PM128A Xmm13; PM128A Xmm14; PM128A Xmm15; - } DUMMYSTRUCTNAME1; - } DUMMYUNIONNAME1; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; union { @@ -1182,7 +1182,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONG64 R13; PULONG64 R14; PULONG64 R15; - } DUMMYSTRUCTNAME2; + } DUMMYSTRUCTNAME; } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS;

1 0

Marcus Meissner : d3dx9_36: Use correct loop index (Coverity).
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 563f3cbc9212a2b4bf9f1a080469fdf8b8d2dadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=563f3cbc9212a2b4bf9f1a080… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 29 22:11:58 2013 +0200 d3dx9_36: Use correct loop index (Coverity). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3295020..c4afbe5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -560,7 +560,7 @@ static struct d3dx_parameter *get_valid_parameter(struct ID3DXBaseEffectImpl *ba for (m = 0; m < pass->annotation_count; ++m) { - if (pass->annotation_handles[i] == parameter) + if (pass->annotation_handles[m] == parameter) { return get_parameter_struct(parameter); }

1 0

Qian Hong : kernel32: Fixed string comparision for non-canonical locale identifiers such as zh_CN VS zh-Hans on OS X .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 32e5314250db3cbf37d414849f63a5a5df0ca9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e5314250db3cbf37d414849… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 30 04:41:16 2013 +0800 kernel32: Fixed string comparision for non-canonical locale identifiers such as zh_CN VS zh-Hans on OS X. --- dlls/kernel32/locale.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 04fb6e8..86720ff 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -33,7 +33,6 @@ #include <stdlib.h> #ifdef __APPLE__ -# include <CoreFoundation/CFBundle.h> # include <CoreFoundation/CFLocale.h> # include <CoreFoundation/CFString.h> #endif @@ -3197,16 +3196,16 @@ void LOCALE_Init(void) if (user_locale_country_ref) { - user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@.UTF-8"), + user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), user_locale_lang_ref, user_locale_country_ref); } else { - user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.UTF-8"), - user_locale_lang_ref); + user_locale_string_ref = CFStringCreateCopy(NULL, user_locale_lang_ref); } CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); + strcat(user_locale, ".UTF-8"); unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); @@ -3225,12 +3224,13 @@ void LOCALE_Init(void) /* Retrieve the preferred language as chosen in System Preferences. */ /* If language is a less specific variant of locale (e.g. 'en' vs. 'en_US'), leave things be. */ - CFArrayRef all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); - CFArrayRef preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); + CFArrayRef preferred_langs = CFLocaleCopyPreferredLanguages(); + CFStringRef canonical_lang_string_ref = CFLocaleCreateCanonicalLanguageIdentifierFromString(NULL, user_locale_string_ref); CFStringRef user_language_string_ref; - if (preferred_locales && CFArrayGetCount( preferred_locales ) && - (user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 )) && - !CFEqual(user_language_string_ref, user_locale_lang_ref)) + if (preferred_langs && canonical_lang_string_ref && CFArrayGetCount( preferred_langs ) && + (user_language_string_ref = CFArrayGetValueAtIndex( preferred_langs, 0 )) && + !CFEqual(user_language_string_ref, user_locale_lang_ref) && + !CFEqual(user_language_string_ref, canonical_lang_string_ref)) { struct locale_name locale_name; WCHAR buffer[128]; @@ -3238,11 +3238,12 @@ void LOCALE_Init(void) strcpynAtoW( buffer, user_locale, sizeof(buffer)/sizeof(WCHAR) ); parse_locale_name( buffer, &locale_name ); lcid_LC_MESSAGES = locale_name.lcid; - TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); + TRACE( "setting lcid_LC_MESSAGES to '%s' %04x\n", user_locale, lcid_LC_MESSAGES ); } - CFRelease( all_locales ); - if (preferred_locales) - CFRelease( preferred_locales ); + if (preferred_langs) + CFRelease( preferred_langs ); + if (canonical_lang_string_ref) + CFRelease( canonical_lang_string_ref ); } CFRelease( user_locale_ref );

1 0

Detlef Riekenberg : dwrite/tests: Avoid refcount test failures.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 03101b06c95b8677ad46d5470b02dcc7202a4429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03101b06c95b8677ad46d5470… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 30 00:13:55 2013 +0200 dwrite/tests: Avoid refcount test failures. --- dlls/dwrite/tests/font.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9138061..8404c22 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -444,19 +444,12 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 2); hr = IDWriteFont_CreateFontFace(font, &fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); - EXPECT_REF(fontface, 3); - EXPECT_REF(font, 1); + /* the fontface refcount is increased here */ - IDWriteFontFace_AddRef(fontface); - EXPECT_REF(font, 1); - EXPECT_REF(fontface, 4); - IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface);

1 0