wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Jacek Caban : urlmon: Added HTTP cache reading tests.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 4d92d604e074f82e53c52aef98bdd1c0c203f91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d92d604e074f82e53c52aef9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:58 2013 +0100 urlmon: Added HTTP cache reading tests. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/protocol.c | 121 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 118 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d92d604e074f82e53c52…

1 0

Jacek Caban : urlmon: Fixed handling binding reading immediately from cache .
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 7483f975de90cf13028c689460145d1a92f18ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7483f975de90cf13028c68946… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:48 2013 +0100 urlmon: Fixed handling binding reading immediately from cache. --- dlls/urlmon/http.c | 15 ++++++-- dlls/urlmon/protocol.c | 81 ++++++++++++++++++++++++++++++--------------- dlls/urlmon/urlmon_main.h | 2 + 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index b2c3d10..d5cef5c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -445,11 +445,18 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques do { error = send_http_request(This); - if(error == ERROR_IO_PENDING || error == ERROR_SUCCESS) + switch(error) { + case ERROR_IO_PENDING: return S_OK; - - hres = handle_http_error(This, error); - + case ERROR_SUCCESS: + /* + * If sending response ended synchronously, it means that we have the whole data + * available locally (most likely in cache). + */ + return protocol_syncbinding(&This->base); + default: + hres = handle_http_error(This, error); + } } while(hres == RPC_E_RETRY); WARN("HttpSendRequest failed: %d\n", error); diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 890d013..5598780 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -70,6 +70,55 @@ static void all_data_read(Protocol *protocol) report_result(protocol, S_OK); } +static HRESULT start_downloading(Protocol *protocol) +{ + HRESULT hres; + + hres = protocol->vtbl->start_downloading(protocol); + if(FAILED(hres)) { + protocol_close_connection(protocol); + report_result(protocol, hres); + return S_OK; + } + + if(protocol->bindf & BINDF_NEEDFILE) { + WCHAR cache_file[MAX_PATH]; + DWORD buflen = sizeof(cache_file); + + if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, cache_file, &buflen)) { + report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); + }else { + FIXME("Could not get cache file\n"); + } + } + + protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; + return S_OK; +} + +HRESULT protocol_syncbinding(Protocol *protocol) +{ + BOOL res; + HRESULT hres; + + protocol->flags |= FLAG_SYNC_READ; + + hres = start_downloading(protocol); + if(FAILED(hres)) + return hres; + + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) + protocol->available_bytes = protocol->query_available; + else + WARN("InternetQueryDataAvailable failed: %u\n", GetLastError()); + + protocol->flags |= FLAG_FIRST_DATA_REPORTED|FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportData(protocol->protocol_sink, BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, + protocol->available_bytes, protocol->content_length); + return S_OK; +} + static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) { PROTOCOLDATA data; @@ -298,12 +347,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) BOOL is_start; HRESULT hres; - if (!data) { - WARN("Expected pProtocolData to be non-NULL\n"); - return S_OK; - } - - is_start = data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); + is_start = !data || data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); if(!protocol->request) { WARN("Expected request to be non-NULL\n"); @@ -325,29 +369,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return write_post_stream(protocol); if(is_start) { - hres = protocol->vtbl->start_downloading(protocol); - if(FAILED(hres)) { - protocol_close_connection(protocol); - report_result(protocol, hres); + hres = start_downloading(protocol); + if(FAILED(hres)) return S_OK; - } - - if(protocol->bindf & BINDF_NEEDFILE) { - WCHAR cache_file[MAX_PATH]; - DWORD buflen = sizeof(cache_file); - - if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, - cache_file, &buflen)) { - report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); - }else { - FIXME("Could not get cache file\n"); - } - } - - protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { + if(!data || data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { if(protocol->query_available) { protocol->available_bytes = protocol->query_available; @@ -400,7 +427,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret return S_FALSE; } - if(!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes) { + if(!(protocol->flags & FLAG_SYNC_READ) && (!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes)) { *read_ret = 0; return E_PENDING; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ba23e74..faab45a 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -149,6 +149,7 @@ struct ProtocolVtbl { #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 #define FLAG_ERROR 0x0040 +#define FLAG_SYNC_READ 0x0080 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; HRESULT protocol_continue(Protocol*,PROTOCOLDATA*) DECLSPEC_HIDDEN; @@ -156,6 +157,7 @@ HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*) DECLSPEC_HIDDEN; HRESULT protocol_lock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_unlock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_abort(Protocol*,HRESULT) DECLSPEC_HIDDEN; +HRESULT protocol_syncbinding(Protocol*) DECLSPEC_HIDDEN; void protocol_close_connection(Protocol*) DECLSPEC_HIDDEN; void find_domain_name(const WCHAR*,DWORD,INT*) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Make the first parameter of resolve_hostname const.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 9e019c9b4b930b892f09e0b497b1ed68ae40c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e019c9b4b930b892f09e0b49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 7 14:50:48 2013 +0100 winhttp: Make the first parameter of resolve_hostname const. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2177416..9fca4b5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -843,7 +843,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) +static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -928,7 +928,7 @@ static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sock struct resolve_args { - WCHAR *hostname; + const WCHAR *hostname; INTERNET_PORT port; struct sockaddr *sa; socklen_t *sa_len;

1 0

Piotr Caban : wininet: Rename URLCacheContainer_* functions to cache_container_*.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 36ce3d256dbe7df42ca2a62ce9f11c6bdea74584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ce3d256dbe7df42ca2a62ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:27 2013 +0100 wininet: Rename URLCacheContainer_* functions to cache_container_*. --- dlls/wininet/urlcache.c | 174 +++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ce3d256dbe7df42ca2a…

1 0

Piotr Caban : wininet: Added better urlcache index file validation on first open.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: ee1fdbf24604c5e1c5c8b96e68b12d1e12ce7d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1fdbf24604c5e1c5c8b96e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:14 2013 +0100 wininet: Added better urlcache index file validation on first open. index.dat file may get broken when computer is switched off incorrectly or when application crashes --- dlls/wininet/urlcache.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9d9f2e1..da20c68 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -385,6 +385,41 @@ static DWORD cache_container_set_size(URLCACHECONTAINER *container, HANDLE file, return ERROR_SUCCESS; } +static BOOL cache_container_is_valid(URLCACHE_HEADER *header, DWORD file_size) +{ + DWORD allocation_size, count_bits, i; + + if(file_size < FILE_SIZE(MIN_BLOCK_NO)) + return FALSE; + + if(file_size != header->dwFileSize) + return FALSE; + + if (!memcmp(header->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1) && + memcmp(header->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1)) + return FALSE; + + if(FILE_SIZE(header->dwIndexCapacityInBlocks) != file_size) + return FALSE; + + allocation_size = 0; + for(i=0; i<header->dwIndexCapacityInBlocks/8; i++) { + for(count_bits = header->allocation_table[i]; count_bits!=0; count_bits>>=1) { + if(count_bits & 1) + allocation_size++; + } + } + if(allocation_size != header->dwBlocksInUse) + return FALSE; + + for(; i<ALLOCATION_TABLE_SIZE; i++) { + if(header->allocation_table[i]) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * cache_container_open_index (Internal) * @@ -451,8 +486,7 @@ static DWORD cache_container_open_index(URLCACHECONTAINER *container, DWORD bloc if(container->hMapping && validate) { URLCACHE_HEADER *header = MapViewOfFile(container->hMapping, FILE_MAP_WRITE, 0, 0, 0); - if(header && !memcmp(header->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1) && - memcmp(header->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1)) { + if(header && !cache_container_is_valid(header, file_size)) { WARN("detected old or broken index.dat file\n"); UnmapViewOfFile(header); FreeUrlCacheSpaceW(container->path, 100, 0);

1 0

Piotr Caban : wininet: Cleanup and optimize URLCacheContainer_OpenIndex function.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 8a06b11f76bd1d2af47f4ba672648b3309c1fa62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a06b11f76bd1d2af47f4ba67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:01 2013 +0100 wininet: Cleanup and optimize URLCacheContainer_OpenIndex function. --- dlls/wininet/urlcache.c | 485 ++++++++++++++++++++++------------------------- 1 files changed, 226 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a06b11f76bd1d2af47f4…

1 0

Jacek Caban : jscript: Use jsstr_flush in literal_as_bstr.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: 324d8b6fa3efcd49f520f0df40cfc930c5338020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324d8b6fa3efcd49f520f0df4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:34 2013 +0100 jscript: Use jsstr_flush in literal_as_bstr. --- dlls/jscript/compile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c776c83..53ed9e7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -791,7 +791,9 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st if(FAILED(hres)) return hres; - *str = compiler_alloc_bstr(ctx, jsstr->str); + *str = compiler_alloc_bstr_len(ctx, NULL, jsstr_length(jsstr)); + if(*str) + jsstr_flush(jsstr, *str); jsstr_release(jsstr); break; }

1 0

Jacek Caban : jscript: Use (index,length) pair as match result.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: c3eecec680593e50314a0bc35757969f09d000f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eecec680593e50314a0bc35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:23 2013 +0100 jscript: Use (index,length) pair as match result. --- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 35e2c3f..135b77f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -362,8 +362,8 @@ typedef struct { } jsexcept_t; typedef struct { - const WCHAR *str; - DWORD len; + unsigned index; + unsigned length; } match_result_t; struct _script_ctx_t { diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index f9b9992..43df35a 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -98,11 +98,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, for(i=0; i < n; i++) { if(ret->parens[i].index == -1) { - ctx->match_parens[i].str = NULL; - ctx->match_parens[i].len = 0; + ctx->match_parens[i].index = 0; + ctx->match_parens[i].length = 0; }else { - ctx->match_parens[i].str = ctx->last_match->str + ret->parens[i].index; - ctx->match_parens[i].len = ret->parens[i].length; + ctx->match_parens[i].index = ret->parens[i].index; + ctx->match_parens[i].length = ret->parens[i].length; } } @@ -216,8 +216,8 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B } } - ret[i].str = result->cp - result->match_len; - ret[i++].len = result->match_len; + ret[i].index = result->cp - str->str - result->match_len; + ret[i++].length = result->match_len; if(!gflag && !(This->jsregexp->flags & REG_GLOB)) { hres = S_OK; @@ -736,7 +736,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval for(i=0; i < match_cnt; i++) { jsstr_t *tmp_str; - tmp_str = jsstr_alloc_len(match_result[i].str, match_result[i].len); + tmp_str = jsstr_substr(str, match_result[i].index, match_result[i].length); if(!tmp_str) { hres = E_OUTOFMEMORY; break; @@ -749,12 +749,12 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval } while(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].str-str->str)); + hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].index)); if(FAILED(hres)) break; hres = jsdisp_propput_name(array, lastIndexW, - jsval_number(match_result[match_cnt-1].str-str->str+match_result[match_cnt-1].len)); + jsval_number(match_result[match_cnt-1].index + match_result[match_cnt-1].length)); if(FAILED(hres)) break; @@ -777,7 +777,7 @@ static HRESULT global_idx(script_ctx_t *ctx, DWORD flags, DWORD idx, jsval_t *r) case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc_len(ctx->match_parens[idx].str, ctx->match_parens[idx].len); + ret = jsstr_substr(ctx->last_match, ctx->match_parens[idx].index, ctx->match_parens[idx].length); if(!ret) return E_OUTOFMEMORY;

1 0

Petr Kočandrle : po: Completed winecfg and clock Czech translation.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: c496899deff2c3ce8759145a8a2599b957dd3daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c496899deff2c3ce8759145a8… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Thu Mar 7 00:15:36 2013 +0100 po: Completed winecfg and clock Czech translation. --- po/cs.po | 132 +++++++++++++++++++++++++------------------------------------- 1 files changed, 53 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c496899deff2c3ce87591…

1 0

Dmitry Timoshkov : windowscodecs: Ask libpng to ignore CRC of PNG chunks.
by Alexandre Julliard 07 Mar '13

07 Mar '13

Module: wine Branch: master Commit: ec22949874f9051eff6209fde43346a4bb5997fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec22949874f9051eff6209fde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 7 15:26:13 2013 +0900 windowscodecs: Ask libpng to ignore CRC of PNG chunks. According to my tests with manually created PNG images WIC ignores CRC errors for both critical and ancillary chunks. --- dlls/windowscodecs/pngformat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fb8bf51..2f6a9e3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -174,6 +174,7 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -222,6 +223,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -438,6 +440,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(This->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); /* seek to the start of the stream */ seek.QuadPart = 0;

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013