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

Michael Stefaniuc : strmbase: Print the debug string and not the pointer to it.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 0f46f7538aa20e973115f2a84efa91cc9278ed20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f46f7538aa20e973115f2a84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 3 11:20:05 2012 +0200 strmbase: Print the debug string and not the pointer to it. --- dlls/strmbase/renderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c2a7e83..1f950f9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -419,7 +419,7 @@ HRESULT WINAPI BaseRendererImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin ** { BaseRenderer *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p,%p)\n", This, debugstr_w(Id), ppPin); + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); if (!Id || !ppPin) return E_POINTER;

1 0

Jacek Caban : wininet: Clean up HTTP_QUERY_STATUS_CODE tests.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: ebf406c163405018bc57403527f112a3528629a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf406c163405018bc5740352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:19:33 2012 +0200 wininet: Clean up HTTP_QUERY_STATUS_CODE tests. --- dlls/wininet/tests/http.c | 126 ++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 70 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4974c88..6050220 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -178,6 +178,48 @@ static BOOL proxy_active(void) return proxy_enable != 0; } +#define test_status_code(a,b) _test_status_code(__LINE__,a,b) +static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) +{ + DWORD code, size, index; + char exbuf[10], bufa[10]; + BOOL res; + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + + code = 0xdeadbeef; + index = 0; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + + sprintf(exbuf, "%u", excode); + + size = sizeof(bufa); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s", bufa, exbuf); + + code = 0xdeadbeef; + index = 1; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); +} + static int close_handle_cnt; static VOID WINAPI callback( @@ -1848,7 +1890,7 @@ static void test_last_error(int port) static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; - DWORD r, sz, val; + DWORD r, sz; char buffer[0x40]; hi = InternetOpen(NULL, 0, NULL, NULL, 0); @@ -1873,15 +1915,7 @@ static void test_proxy_indirect(int port) } ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - - sz = sizeof val; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &val, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(val == 407, "proxy code wrong\n"); + test_status_code(hr, 407); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &sz, NULL); @@ -1931,11 +1965,7 @@ static void test_proxy_direct(int port) r = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(r, "HttpSendRequest failed\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - + test_status_code(hr, 407); /* set the user + password then try again */ todo_wine { @@ -1986,11 +2016,7 @@ static void test_header_handling_order(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); @@ -2031,7 +2057,6 @@ static void test_header_handling_order(int port) static void test_connection_header(int port) { HINTERNET ses, con, req; - DWORD size, status; BOOL ret; ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2046,11 +2071,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2060,11 +2081,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2074,11 +2091,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2088,11 +2101,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); InternetCloseHandle(con); @@ -2301,7 +2310,7 @@ static void test_HttpSendRequestW(int port) static void test_cookie_header(int port) { HINTERNET ses, con, req; - DWORD size, status, error; + DWORD size, error; BOOL ret; char buffer[64]; @@ -2336,11 +2345,7 @@ static void test_cookie_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); buffer[0] = 0; size = sizeof(buffer); @@ -2356,7 +2361,6 @@ static void test_cookie_header(int port) static void test_basic_authentication(int port) { HINTERNET session, connect, request; - DWORD size, status; BOOL ret; session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2371,11 +2375,7 @@ static void test_basic_authentication(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -2385,7 +2385,7 @@ static void test_basic_authentication(int port) static void test_invalid_response_headers(int port) { HINTERNET session, connect, request; - DWORD size, status; + DWORD size; BOOL ret; char buffer[256]; @@ -2401,11 +2401,7 @@ static void test_invalid_response_headers(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 401, "unexpected status %u\n", status); + test_status_code(request, 401); buffer[0] = 0; size = sizeof(buffer); @@ -2545,17 +2541,7 @@ static void test_HttpQueryInfo(int port) ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); ok(index == 0, "expected 0 got %u\n", index); - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); - - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); + test_status_code(hr, 200); index = 0xdeadbeef; size = sizeof(buffer);

1 0

Jacek Caban : wininet: Store status code in http_request_t and use it in set_content_length.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 5240e40b69a28e883961a861ce82d05de59ddf44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5240e40b69a28e883961a861c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:19:47 2012 +0200 wininet: Store status code in http_request_t and use it in set_content_length. --- dlls/wininet/http.c | 10 ++++++---- dlls/wininet/internet.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54db118..fae4543 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2585,13 +2585,13 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { }; /* set the request content length based on the headers */ -static DWORD set_content_length(http_request_t *request, DWORD status_code) +static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; WCHAR encoding[20]; DWORD size; - if(status_code == HTTP_STATUS_NO_CONTENT) { + if(request->status_code == HTTP_STATUS_NO_CONTENT) { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } @@ -4826,7 +4826,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, &dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS) dwStatusCode = 0; - res = set_content_length(request, dwStatusCode); + res = set_content_length(request); if(res != ERROR_SUCCESS) goto lend; if(!request->contentLength) @@ -5000,7 +5000,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ &dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS) dwCode = 0; - if ((res = set_content_length( request, dwCode )) == ERROR_SUCCESS) { + if ((res = set_content_length(request)) == ERROR_SUCCESS) { if(!request->contentLength) http_release_netconn(request, TRUE); } @@ -5692,6 +5692,8 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) goto lend; *status_text++=0; + request->status_code = atoiW(status_code); + TRACE("version [%s] status code [%s] status text [%s]\n", debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6cf1f38..b515a71 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -312,6 +312,7 @@ typedef struct DWORD send_timeout; DWORD receive_timeout; LPWSTR version; + DWORD status_code; LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten;

1 0

Jacek Caban : wininet: Use stored status code in HTTP_HttpSendRequestW.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 4cf3f78542db6571aa55e0cebac75bbf0c2c8e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf3f78542db6571aa55e0ceb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:19:58 2012 +0200 wininet: Use stored status code in HTTP_HttpSendRequestW. --- dlls/wininet/http.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fae4543..b04a51c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4797,7 +4797,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (bEndRequest) { DWORD dwBufferSize; - DWORD dwStatusCode; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -4821,11 +4820,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - dwBufferSize = sizeof(dwStatusCode); - if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, - &dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS) - dwStatusCode = 0; - res = set_content_length(request); if(res != ERROR_SUCCESS) goto lend; @@ -4836,14 +4830,16 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); - if ((dwStatusCode == HTTP_STATUS_REDIRECT || - dwStatusCode == HTTP_STATUS_MOVED || - dwStatusCode == HTTP_STATUS_REDIRECT_KEEP_VERB || - dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && - HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) - { + switch(request->status_code) { + case HTTP_STATUS_REDIRECT: + case HTTP_STATUS_MOVED: + case HTTP_STATUS_REDIRECT_KEEP_VERB: + case HTTP_STATUS_REDIRECT_METHOD: + if(HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) != ERROR_SUCCESS) + break; + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && - dwStatusCode != HTTP_STATUS_REDIRECT_KEEP_VERB) + request->status_code != HTTP_STATUS_REDIRECT_KEEP_VERB) { heap_free(request->verb); request->verb = heap_strdupW(szGET); @@ -4868,7 +4864,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, { WCHAR szAuthValue[2048]; dwBufferSize=2048; - if (dwStatusCode == HTTP_STATUS_DENIED) + if (request->status_code == HTTP_STATUS_DENIED) { LPHTTPHEADERW Host = HTTP_GetHeader(request, hostW); DWORD dwIndex = 0; @@ -4892,7 +4888,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->authInfo = NULL; } } - if (dwStatusCode == HTTP_STATUS_PROXY_AUTH_REQ) + if (request->status_code == HTTP_STATUS_PROXY_AUTH_REQ) { DWORD dwIndex = 0; while (HTTP_HttpQueryInfoW(request,HTTP_QUERY_PROXY_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex) == ERROR_SUCCESS)

1 0

Jacek Caban : wininet: Use stored status code in HTTP_HttpEndRequestW.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 797a17bb2d8c54538f35e8517075ed8b4043f448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797a17bb2d8c54538f35e8517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:20:10 2012 +0200 wininet: Use stored status code in HTTP_HttpEndRequestW. --- dlls/wininet/http.c | 53 +++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b04a51c..d5697ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4964,9 +4964,8 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_PTR dwContext) { - INT responseLen; - DWORD dwCode, dwCodeLength; DWORD dwBufferSize; + INT responseLen; DWORD res = ERROR_SUCCESS; if(!request->netconn) { @@ -4991,11 +4990,6 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - dwCodeLength = sizeof(dwCode); - if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, - &dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS) - dwCode = 0; - if ((res = set_content_length(request)) == ERROR_SUCCESS) { if(!request->contentLength) http_release_netconn(request, TRUE); @@ -5003,32 +4997,33 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ if (res == ERROR_SUCCESS && !(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { - if (dwCode == HTTP_STATUS_REDIRECT || - dwCode == HTTP_STATUS_MOVED || - dwCode == HTTP_STATUS_REDIRECT_METHOD || - dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB) - { + switch(request->status_code) { + case HTTP_STATUS_REDIRECT: + case HTTP_STATUS_MOVED: + case HTTP_STATUS_REDIRECT_METHOD: + case HTTP_STATUS_REDIRECT_KEEP_VERB: { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) == ERROR_SUCCESS) + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) != ERROR_SUCCESS) + break; + + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && + request->status_code != HTTP_STATUS_REDIRECT_KEEP_VERB) { - if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && - dwCode != HTTP_STATUS_REDIRECT_KEEP_VERB) - { - heap_free(request->verb); - request->verb = heap_strdupW(szGET); - } - drain_content(request); - if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) - { - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); - res = HTTP_HandleRedirect(request, new_url); - if (res == ERROR_SUCCESS) - res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE); - heap_free( new_url ); - } + heap_free(request->verb); + request->verb = heap_strdupW(szGET); } + drain_content(request); + if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) + { + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); + res = HTTP_HandleRedirect(request, new_url); + if (res == ERROR_SUCCESS) + res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE); + heap_free( new_url ); + } + } } }

1 0

Jacek Caban : wininet: Added special case for HTTP_QUERY_STATUS_CODE in HttpQueryInfo.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 0d76489353eed2a35fecc5c6491f3fc08c3e9c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d76489353eed2a35fecc5c64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:20:25 2012 +0200 wininet: Added special case for HTTP_QUERY_STATUS_CODE in HttpQueryInfo. --- dlls/wininet/http.c | 30 +++++++++++++++++++++++++++++- dlls/wininet/tests/http.c | 4 +++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d5697ae..84b83f2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3421,6 +3421,34 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, index = HTTP_GetCustomHeaderIndex(request, header_lookup[request->read_gzip ? HTTP_QUERY_CONTENT_TYPE : level], requested_index,request_only); break; + case HTTP_QUERY_STATUS_CODE: { + DWORD res = ERROR_SUCCESS; + + if(request_only || requested_index) + break; + + if(dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) { + if(*lpdwBufferLength >= sizeof(DWORD)) + *(DWORD*)lpBuffer = request->status_code; + else + res = ERROR_INSUFFICIENT_BUFFER; + *lpdwBufferLength = sizeof(DWORD); + }else { + WCHAR buf[12]; + DWORD size; + static const WCHAR formatW[] = {'%','u',0}; + + size = (sprintfW(buf, formatW, request->status_code)+1) * sizeof(WCHAR); + + if(size <= *lpdwBufferLength) + memcpy(lpBuffer, buf, size); + else + res = ERROR_INSUFFICIENT_BUFFER; + + *lpdwBufferLength = size; + } + return res; + } default: assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); @@ -3440,7 +3468,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return ERROR_HTTP_HEADER_NOT_FOUND; } - if (lpdwIndex && level != HTTP_QUERY_STATUS_CODE) (*lpdwIndex)++; + if (lpdwIndex) (*lpdwIndex)++; /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6050220..7e21a22 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -473,6 +473,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) goto abort; } + test_status_code(hor, 0); + trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); @@ -2455,7 +2457,7 @@ static void test_response_without_headers(int port) size = sizeof(status); SetLastError(0xdeadbeef); r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + ok(r, "HttpQueryInfo failed %u\n", GetLastError()); todo_wine ok(status == 200, "expected status 200 got %u\n", status); buffer[0] = 0;

1 0

Jacek Caban : wininet: Set status code OK for responses without headers.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 2aa3d697a3d772e37a8ff59eb3e538320b73c305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d697a3d772e37a8ff59eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:20:38 2012 +0200 wininet: Set status code OK for responses without headers. --- dlls/wininet/http.c | 1 + dlls/wininet/tests/http.c | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 84b83f2..90cb286 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5725,6 +5725,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) heap_free(request->version); heap_free(request->statusText); + request->status_code = HTTP_STATUS_OK; request->version = heap_strdupW(g_szHttp1_0); request->statusText = heap_strdupW(szOK); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7e21a22..7984f16 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2426,7 +2426,7 @@ static void test_invalid_response_headers(int port) static void test_response_without_headers(int port) { HINTERNET hi, hc, hr; - DWORD r, count, size, status; + DWORD r, count, size; char buffer[1024]; SetLastError(0xdeadbeef); @@ -2453,12 +2453,7 @@ static void test_response_without_headers(int port) todo_wine ok(count == sizeof page1 - 1, "count was wrong\n"); todo_wine ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - status = 0; - size = sizeof(status); - SetLastError(0xdeadbeef); - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(status == 200, "expected status 200 got %u\n", status); + test_status_code(hr, 200); buffer[0] = 0; size = sizeof(buffer);

1 0

Michael Mc Donnell : d3dx9: Added D3DXOptimizeFaces semi-stub.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 5a14f5b37e2f2317a980aed4af4080c262c93787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a14f5b37e2f2317a980aed4a… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Mar 30 19:02:20 2012 +0200 d3dx9: Added D3DXOptimizeFaces semi-stub. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b0f7988..94893d3 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -228,7 +228,7 @@ @ stdcall D3DXMatrixTransformation2D(ptr ptr float ptr ptr float ptr) @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) -@ stub D3DXOptimizeFaces(ptr long long long ptr) +@ stdcall D3DXOptimizeFaces(ptr long long long ptr) @ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index be8ca60..9c1853a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6700,3 +6700,71 @@ cleanup: return hr; } + +/************************************************************************* + * D3DXOptimizeFaces (D3DX9_36.@) + * + * Re-orders the faces so the vertex cache is used optimally. + * + * PARAMS + * indices [I] Pointer to an index buffer belonging to a mesh. + * num_faces [I] Number of faces in the mesh. + * num_vertices [I] Number of vertices in the mesh. + * indices_are_32bit [I] Specifies whether indices are 32- or 16-bit. + * face_remap [I/O] The new order the faces should be drawn in. + * + * RETURNS + * Success: D3D_OK. + * Failure: D3DERR_INVALIDCALL. + * + * BUGS + * The face re-ordering does not use the vertex cache optimally. + * + */ +HRESULT WINAPI D3DXOptimizeFaces(LPCVOID indices, + UINT num_faces, + UINT num_vertices, + BOOL indices_are_32bit, + DWORD *face_remap) +{ + UINT i; + UINT j = num_faces - 1; + UINT limit_16_bit = 2 << 15; /* According to MSDN */ + HRESULT hr = D3D_OK; + + FIXME("(%p, %u, %u, %s, %p): semi-stub. Face order will not be optimal.\n", + indices, num_faces, num_vertices, + indices_are_32bit ? "TRUE" : "FALSE", face_remap); + + if (!indices_are_32bit && num_faces >= limit_16_bit) + { + WARN("Number of faces must be less than %d when using 16-bit indices.\n", + limit_16_bit); + hr = D3DERR_INVALIDCALL; + goto error; + } + + if (!face_remap) + { + WARN("Face remap pointer is NULL.\n"); + hr = D3DERR_INVALIDCALL; + goto error; + } + + /* The faces are drawn in reverse order for simple meshes. This ordering + * is not optimal for complicated meshes, but will not break anything + * either. The ordering should be changed to take advantage of the vertex + * cache on the graphics card. + * + * TODO Re-order to take advantage of vertex cache. + */ + for (i = 0; i < num_faces; i++) + { + face_remap[i] = j--; + } + + return D3D_OK; + +error: + return hr; +}

1 0

Michael Mc Donnell : d3dx9: Added D3DXOptimizeFaces test.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 081b06c012b49ef0f2e4379338786aecf33b81dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=081b06c012b49ef0f2e437933… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Mar 30 19:02:51 2012 +0200 d3dx9: Added D3DXOptimizeFaces test. --- dlls/d3dx9_36/tests/mesh.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 2a05e0d..b8123ab 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10047,6 +10047,160 @@ cleanup: free_test_context(test_context); } +static void test_optimize_faces(void) +{ + HRESULT hr; + UINT i; + DWORD smallest_face_remap; + /* mesh0 + * + * 0--1 + * | / + * |/ + * 2 + */ + const DWORD indices0[] = {0, 1, 2}; + const UINT num_faces0 = 1; + const UINT num_vertices0 = 3; + const DWORD exp_face_remap0[] = {0}; + /* mesh1 + * + * 0--1 3 + * | / /| + * |/ / | + * 2 5--4 + */ + const DWORD indices1[] = {0, 1, 2, 3, 4, 5}; + const UINT num_faces1 = 2; + const UINT num_vertices1 = 6; + const DWORD exp_face_remap1[] = {1, 0}; + /* mesh2 + * + * 0--1 + * | /| + * |/ | + * 2--3 + */ + const DWORD indices2[] = {0, 1, 2, 1, 3, 2}; + const UINT num_faces2 = 2; + const UINT num_vertices2 = 4; + const DWORD exp_face_remap2[] = {1, 0}; + /* mesh3 + * + * 0--1 + * | /| + * |/ | + * 2--3 + * | /| + * |/ | + * 4--5 + */ + const DWORD indices3[] = {0, 1, 2, 1, 3, 2, 2, 3, 4, 3, 4, 5}; + const UINT num_faces3 = 4; + const UINT num_vertices3 = 6; + const DWORD exp_face_remap3[] = {3, 2, 1, 0}; + /* mesh4 + * + * 0--1 + * | /| + * |/ | + * 2--3 + * | /| + * |/ | + * 4--5 + */ + const WORD indices4[] = {0, 1, 2, 1, 3, 2, 2, 3, 4, 3, 4, 5}; + const UINT num_faces4 = 4; + const UINT num_vertices4 = 6; + const DWORD exp_face_remap4[] = {3, 2, 1, 0}; + /* Test cases are stored in the tc array */ + struct + { + const VOID *indices; + const UINT num_faces; + const UINT num_vertices; + const BOOL indices_are_32bit; + const DWORD *exp_face_remap; + } + tc[] = + { + { + indices0, + num_faces0, + num_vertices0, + TRUE, + exp_face_remap0 + }, + { + indices1, + num_faces1, + num_vertices1, + TRUE, + exp_face_remap1 + }, + { + indices2, + num_faces2, + num_vertices2, + TRUE, + exp_face_remap2 + }, + { + indices3, + num_faces3, + num_vertices3, + TRUE, + exp_face_remap3 + }, + { + indices4, + num_faces4, + num_vertices4, + FALSE, + exp_face_remap4 + }, + }; + + /* Go through all test cases */ + for (i = 0; i < ARRAY_SIZE(tc); i++) + { + DWORD j; + DWORD *face_remap; + face_remap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + tc[i].num_faces*sizeof(face_remap)); + + hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, + tc[i].num_vertices, tc[i].indices_are_32bit, + face_remap); + ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " + "Got %x\n, expected D3D_OK", i, hr); + + /* Compare face remap with expected face remap */ + for (j = 0; j < tc[i].num_faces; j++) + { + ok(tc[i].exp_face_remap[j] == face_remap[j], + "Test case %d: Got face %d at %d, expected %d\n", i, + face_remap[j], j, tc[i].exp_face_remap[j]); + } + + HeapFree(GetProcessHeap(), 0, face_remap); + } + + /* face_remap must not be NULL */ + hr = D3DXOptimizeFaces(tc[0].indices, tc[0].num_faces, + tc[0].num_vertices, tc[0].indices_are_32bit, + NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " + "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + + /* Number of faces must be smaller than 2^15 */ + hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, + tc[0].num_vertices, FALSE, + &smallest_face_remap); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " + "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -10072,4 +10226,5 @@ START_TEST(mesh) test_weld_vertices(); test_clone_mesh(); test_valid_mesh(); + test_optimize_faces(); }

1 0

Francois Gouget : kernel32: Some English (United States) spelling fixes.
by Alexandre Julliard 03 May '12

03 May '12

1 0