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

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

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

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: 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

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

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

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

Alexandre Julliard : winhttp: Always pass a ULONG variable to ioctlsocket.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 847a29375c42433dbd70701d59d250f1a390ce0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=847a29375c42433dbd70701d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:32:44 2013 +0100 winhttp: Always pass a ULONG variable to ioctlsocket. --- dlls/winhttp/net.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5ce7683..2177416 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -331,7 +331,8 @@ BOOL netconn_close( netconn_t *conn ) BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { BOOL ret = FALSE; - int res = 0, state; + int res = 0; + ULONG state; if (timeout > 0) { @@ -734,7 +735,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) { #ifdef FIONREAD - int ret, unread; + int ret; + ULONG unread; #endif *available = 0; if (!netconn_connected( conn )) return FALSE;

1 0

Alexandre Julliard : wininet: Always pass a ULONG variable to ioctlsocket.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 456773fdc067ab8673a330c7ae17aecc2815690a URL: http://source.winehq.org/git/wine.git/?a=commit;h=456773fdc067ab8673a330c7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 13:32:49 2013 +0100 wininet: Always pass a ULONG variable to ioctlsocket. --- dlls/wininet/netconnection.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0d74adf..3564282 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -607,7 +607,8 @@ static DWORD init_openssl(void) static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { - int result, flag; + int result; + ULONG flag; assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); @@ -633,7 +634,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, (void *)&err, &len) && !err) result = 0; } } @@ -1003,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) if(!connection->secure) { #ifdef FIONREAD - int unread; + ULONG unread; int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) {

1 0

Alexandre Julliard : vbscript: Return after assert(0) to silence warnings.
by Alexandre Julliard 06 Mar '13

06 Mar '13

Module: wine Branch: master Commit: 72226ea8df753b4432b3a5f4b0d8350b51162624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72226ea8df753b4432b3a5f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 14:09:47 2013 +0100 vbscript: Return after assert(0) to silence warnings. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/global.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 58494b9..fb1974b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1400,6 +1400,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d break; default: assert(0); + return E_FAIL; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9ff1f76..9c9cd41 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1012,6 +1012,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA return E_NOTIMPL; default: assert(0); + return E_FAIL; } if(startv) {

1 0