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

Jacek Caban : jscript: Reimplemented do_attributeless_tag_format without direct access to object' s string buffer.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 25dbf32b5d60937afafe6d2f7be7a910b6bcefc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbf32b5d60937afafe6d2f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:27 2013 +0100 jscript: Reimplemented do_attributeless_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 1d4a188..6235b51 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -144,27 +144,44 @@ static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r, const WCHAR *tagname) { - jsstr_t *str; + unsigned tagname_len; + jsstr_t *str, *ret; + WCHAR *ptr; HRESULT hres; - static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; - hres = get_string_val(ctx, jsthis, &str); if(FAILED(hres)) return hres; - if(r) { - jsstr_t *ret = jsstr_alloc_buf(jsstr_length(str) + 2*strlenW(tagname) + 5); - if(!ret) { - jsstr_release(str); - return E_OUTOFMEMORY; - } + if(!r) { + jsstr_release(str); + return S_OK; + } - sprintfW(ret->str, tagfmt, tagname, str->str, tagname); - *r = jsval_string(ret); + tagname_len = strlenW(tagname); + + ret = jsstr_alloc_buf(jsstr_length(str) + 2*tagname_len + 5); + if(!ret) { + jsstr_release(str); + return E_OUTOFMEMORY; } + ptr = ret->str; + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = '>'; + + ptr += jsstr_flush(str, ptr); jsstr_release(str); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + + *r = jsval_string(ret); return S_OK; }

1 0

Jacek Caban : jscript: Reimplemented do_attribute_tag_format without direct access to object' s string buffer.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 6eaef96dad12fb4aaec5044421941f3cd7ddb44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaef96dad12fb4aaec504442… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:39:38 2013 +0100 jscript: Reimplemented do_attribute_tag_format without direct access to object's string buffer. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6235b51..8f38621 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -186,14 +186,11 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j } static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, - const WCHAR *tagname, const WCHAR *attr) + const WCHAR *tagname, const WCHAR *attrname) { - static const WCHAR tagfmtW[] - = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; jsstr_t *str, *attr_value = NULL; - const WCHAR *attr_str; unsigned attr_len; HRESULT hres; @@ -207,19 +204,45 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig jsstr_release(str); return hres; } - attr_str = attr_value->str; attr_len = jsstr_length(attr_value); }else { - attr_str = undefinedW; attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1; } if(r) { + unsigned attrname_len = strlenW(attrname); + unsigned tagname_len = strlenW(tagname); jsstr_t *ret; - ret = jsstr_alloc_buf(2*strlenW(tagname) + strlenW(attr) + attr_len + jsstr_length(str) + 9); + ret = jsstr_alloc_buf(2*tagname_len + attrname_len + attr_len + jsstr_length(str) + 9); if(ret) { - sprintfW(ret->str, tagfmtW, tagname, attr, attr_str, str->str, tagname); + WCHAR *ptr = ret->str; + + *ptr++ = '<'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr++ = ' '; + memcpy(ptr, attrname, attrname_len*sizeof(WCHAR)); + ptr += attrname_len; + *ptr++ = '='; + *ptr++ = '"'; + + if(attr_value) + jsstr_flush(attr_value, ptr); + else + memcpy(ptr, undefinedW, attr_len*sizeof(WCHAR)); + ptr += attr_len; + + *ptr++ = '"'; + *ptr++ = '>'; + ptr += jsstr_flush(str, ptr); + + *ptr++ = '<'; + *ptr++ = '/'; + memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); + ptr += tagname_len; + *ptr = '>'; + *r = jsval_string(ret); }else { hres = E_OUTOFMEMORY;

1 0

Piotr Caban : wininet: Improved urlcache debug traces.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: b3c96b61bb790e28f5b71d038dbce58525cccd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c96b61bb790e28f5b71d038… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 6 12:48:15 2013 +0100 wininet: Improved urlcache debug traces. --- dlls/wininet/urlcache.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 578473d..0c9a4e2 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1803,15 +1803,16 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); - if (pUrlEntry->dwOffsetHeaderInfo) - TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize)); if((dwFlags & GET_INSTALLED_ENTRY) && !(pUrlEntry->CacheEntryType & INSTALLED_CACHE_ENTRY)) { @@ -1838,7 +1839,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1944,14 +1946,16 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); - TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize)); if (lpdwCacheEntryInfoBufSize) { @@ -1971,7 +1975,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2169,8 +2174,9 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, @@ -2266,8 +2272,9 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return FALSE; } - TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry( pContainer, @@ -2593,7 +2600,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) continue; if(urlcache_rate_entry(url_entry, &cur_time) <= delete_factor) { - TRACE("deleting file: %s\n", (char*)url_entry+url_entry->dwOffsetLocalName); + TRACE("deleting file: %s\n", debugstr_a((char*)url_entry+url_entry->dwOffsetLocalName)); DeleteUrlCacheEntryInternal(container, header, hash_entry); if(header->CacheUsage.QuadPart+header->ExemptUsage.QuadPart <= desired_size) @@ -3978,7 +3985,8 @@ static BOOL FindNextUrlCacheEntryInternal( TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", - debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, + pUrlEntry->dwHeaderInfoSize)); error = URLCache_CopyEntry( pContainer, @@ -3993,8 +4001,8 @@ static BOOL FindNextUrlCacheEntryInternal( SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", - debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + if(pUrlEntry->dwOffsetLocalName) + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */

1 0

Hans Leidekker : wininet: Port resolution doesn't depend on the secure flag .
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 6a609c21bbee8287b2ee6d027013855843106a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a609c21bbee8287b2ee6d027… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 13:30:49 2013 +0100 wininet: Port resolution doesn't depend on the secure flag. --- dlls/wininet/http.c | 19 +++++++++++-------- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 468fee6..8fec2a4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -283,7 +283,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server_t *iter, *server = NULL; if(port == INTERNET_INVALID_PORT_NUMBER) - port = is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + port = INTERNET_DEFAULT_HTTP_PORT; EnterCriticalSection(&connection_pool_cs); @@ -1706,6 +1706,9 @@ static WCHAR *build_proxy_path_url(http_request_t *req) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { + 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; @@ -1713,9 +1716,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; server_t *new_server; - 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 }; + BOOL is_https; memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; @@ -1737,7 +1738,11 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if( !request->path ) request->path = szNul; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); + 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(UrlComponents.lpszHostName, UrlComponents.nPort, is_https, TRUE); if(!new_server) return FALSE; @@ -3160,9 +3165,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) - session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? - INTERNET_DEFAULT_HTTPS_PORT : - INTERNET_DEFAULT_HTTP_PORT); + session->hostPort = INTERNET_DEFAULT_HTTP_PORT; if (hIC->proxy && hIC->proxy[0]) HTTP_DealWithProxy( hIC, session, request ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f7a961..c682930 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4013,6 +4013,34 @@ static void test_connection_failure(void) InternetCloseHandle(session); } +static void test_default_service_port(void) +{ + HINTERNET session, connect, request; + DWORD error; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + error = GetLastError(); + ok(!ret, "HttpSendRequest succeeded\n"); + ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, + "got %u\n", error); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -4091,4 +4119,5 @@ START_TEST(http) HttpSendRequestEx_test(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); test_connection_failure(); + test_default_service_port(); }

1 0

Francois Gouget : msvcrt: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: c3913adb9bd5f2ad31cdf6387f315608ca0487b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3913adb9bd5f2ad31cdf6387… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 6 15:07:51 2013 +0100 msvcrt: Remove WINAPI on static functions where not needed. --- dlls/msvcrt/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 32cf3b0..b77daa1 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -86,7 +86,7 @@ static const struct { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW }, }; -static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) +static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; MSVCRT___sighandler_t handler;

1 0

Francois Gouget : qcap: Fix compilation on systems that have v4l1 but not VIDIOCMCAPTURE & co.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: e920d1a661de133e941eb07bf0ad8ead0b0f38d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920d1a661de133e941eb07bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 6 15:11:40 2013 +0100 qcap: Fix compilation on systems that have v4l1 but not VIDIOCMCAPTURE & co. --- dlls/qcap/v4l.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 41cc752..0880499 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -71,7 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); -#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H) +#ifdef VIDIOCMCAPTURE static typeof(open) *video_open = open; static typeof(close) *video_close = close; @@ -973,4 +973,4 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) FAIL_WITH_ERR; } -#endif /* HAVE_LINUX_VIDEODEV_H || HAVE_LINUX_LIBV4L1_H */ +#endif /* defined(VIDIOCMCAPTURE) */

1 0

Andrew Talbot : winhttp: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: a9983e6cd20d1c6423915ddc7397056839dba7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9983e6cd20d1c6423915ddc7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 5 22:52:21 2013 +0000 winhttp: Avoid signed-unsigned integer comparisons. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/session.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index fa8cad0..5ce7683 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -568,7 +568,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; SSIZE_T size, buf_len; - int i; + unsigned int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cd583e7..e2c3734 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2935,9 +2935,9 @@ static HRESULT request_send( struct winhttp_request *request ) VariantInit( &data ); if (V_VT( &request->data ) == VT_BSTR) { - UINT i, cp = CP_ACP; + UINT cp = CP_ACP; const WCHAR *str = V_BSTR( &request->data ); - int len = strlenW( str ); + int i, len = strlenW( str ); for (i = 0; i < len; i++) { diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 41b266a..d43b225 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -878,7 +878,7 @@ static const object_vtbl_t request_vtbl = static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { const WCHAR **types = accept_types; - int i; + DWORD i; if (!types) return TRUE; while (*types) @@ -897,7 +897,7 @@ static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { if (!(request->accept_types[i] = strdupW( *types ))) { - for (; i >= 0; i--) heap_free( request->accept_types[i] ); + for ( ; i > 0; --i) heap_free( request->accept_types[i - 1] ); heap_free( request->accept_types ); request->accept_types = NULL; request->num_accept_types = 0;

1 0

Andrew Talbot : winex11.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 0ff8c9da524caea5ebdeb748398e6db3f9e0c100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff8c9da524caea5ebdeb7483… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 5 22:52:11 2013 +0000 winex11.drv: Avoid signed-unsigned integer comparisons. --- dlls/winex11.drv/mouse.c | 4 +++- dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 790c532..de6672e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1220,8 +1220,10 @@ static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int wi } else /* invert the mask */ { + unsigned int j; + ptr = (unsigned int *)mask_bits; - for (i = 0; i < info->bmiHeader.biSizeImage / sizeof(*ptr); i++, ptr++) *ptr ^= ~0u; + for (j = 0; j < info->bmiHeader.biSizeImage / sizeof(*ptr); j++, ptr++) *ptr ^= ~0u; } vis.depth = 1; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 05cd75f..5fc978e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -534,7 +534,8 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret XVisualInfo vis = default_visual; struct gdi_image_bits bits; Pixmap color_pixmap = 0, mask_pixmap = 0; - int i, lines; + int lines; + unsigned int i; bits.ptr = NULL; bits.free = NULL; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 293e8e2..671f67a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -763,7 +763,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) { DWORD hash = 0, *ptr, two_chars; WORD *pwc; - int i; + unsigned int i; hash ^= plfsz->devsize.cx; hash ^= plfsz->devsize.cy;

1 0

Alessandro Pignotti : strmbase: Frame scheduling should use IMediaSample:: GetTime.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 0029bbcf484a9e4b3f94ada84d4cc9e002b53cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029bbcf484a9e4b3f94ada84… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Mar 5 16:13:43 2013 +0100 strmbase: Frame scheduling should use IMediaSample::GetTime. --- 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 1f950f9..8bbb1f8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -371,7 +371,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } /* Wait for render Time */ - if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) + if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start);

1 0

Dmitry Timoshkov : windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: b0e8a18a5d09a0e19a662b2e9d606fe172ca8422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e8a18a5d09a0e19a662b2e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 6 16:28:56 2013 +0900 windowscodecs: Add a test for palette of a PNG image with PLTE and tRNS chunks. --- dlls/windowscodecs/tests/pngformat.c | 54 ++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b21f5f7..61c56b3 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -534,6 +534,59 @@ static void test_color_contexts(void) IWICBitmapDecoder_Release(decoder); } +/* 1 bpp 1x1 pixel PNG image with PLTE and tRNS chunks */ +static const char png_PLTE_tRNS[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x03,0x00,0x00,0x00,0x25,0xdb,0x56,0xca, + 0x00,0x00,0x00,0x06,'P','L','T','E',0x01,0x02,0x03,0x04,0x05,0x06,0x95,0x53,0x6f,0x48, + 0x00,0x00,0x00,0x02,'t','R','N','S',0xff,0x00,0xe5,0xb7,0x30,0x4a, + 0x00,0x00,0x00,0x0a,'I','D','A','T',0x18,0xd3,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0xa7,0x01,0xba,0x10, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_png_palette(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(png_PLTE_tRNS, sizeof(png_PLTE_tRNS)); + ok(decoder != 0, "Failed to load PNG image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat1bppIndexed), + "got wrong format %s\n", debugstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); +todo_wine + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(pngformat) { HRESULT hr; @@ -545,6 +598,7 @@ START_TEST(pngformat) if (FAILED(hr)) return; test_color_contexts(); + test_png_palette(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0