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

Piotr Caban : wininet: Support Punycode in UnlockUrlCacheEntryFileW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 6f35d68f42e84147a1367a6dd58266125d448adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35d68f42e84147a1367a6dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:09 2013 +0200 wininet: Support Punycode in UnlockUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 74 +++++----------------------------------------- 1 files changed, 8 insertions(+), 66 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f5f86c5..23ff308 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2495,10 +2495,7 @@ BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilte * UnlockUrlCacheEntryFileA (WININET.@) * */ -BOOL WINAPI UnlockUrlCacheEntryFileA( - IN LPCSTR lpszUrlName, - IN DWORD dwReserved - ) +BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -2574,72 +2571,17 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( * UnlockUrlCacheEntryFileW (WININET.@) * */ -BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) +BOOL WINAPI UnlockUrlCacheEntryFileW(LPCWSTR lpszUrlName, DWORD dwReserved) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved); - - if (dwReserved) - { - ERR("dwReserved != 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - error = cache_containers_findW(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - return FALSE; - - if (!urlcache_find_hash_entryW(pHeader, lpszUrlName, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pUrlEntry = (entry_url *)pEntry; + char *url; + BOOL ret; - if (pUrlEntry->use_count == 0) - { - cache_container_unlock_index(pContainer, pHeader); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - pUrlEntry->use_count--; - if (!pUrlEntry->use_count) - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_URL); - - cache_container_unlock_index(pContainer, pHeader); - return TRUE; + ret = UnlockUrlCacheEntryFileA(url, dwReserved); + heap_free(url); + return ret; } /***********************************************************************

1 0

Piotr Caban : wininet: Support Punycode in DeleteUrlCacheEntryW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 2f3f9739234946ac9b1e518f75033eb42854945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3f9739234946ac9b1e518f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:24 2013 +0200 wininet: Support Punycode in DeleteUrlCacheEntryW. --- dlls/wininet/urlcache.c | 51 +++------------------------------------------- 1 files changed, 4 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 23ff308..0d8c9aa 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3477,57 +3477,14 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) */ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) { - cache_container *pContainer; - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - LPSTR urlA; - DWORD error; + char *url; BOOL ret; - TRACE("(%s)\n", debugstr_w(lpszUrlName)); - - urlA = heap_strdupWtoA(lpszUrlName); - if (!urlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - error = cache_containers_findW(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { - heap_free(urlA); - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - heap_free(urlA); - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - { - heap_free(urlA); - return FALSE; - } - - if (!urlcache_find_hash_entry(pHeader, urlA, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", debugstr_a(urlA)); - heap_free(urlA); - SetLastError(ERROR_FILE_NOT_FOUND); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - ret = urlcache_entry_delete(pContainer, pHeader, pHashEntry); - - cache_container_unlock_index(pContainer, pHeader); - heap_free(urlA); + ret = DeleteUrlCacheEntryA(url); + heap_free(url); return ret; }

1 0

Piotr Caban : wininet: Support Punycode in IsUrlCacheEntryExpiredW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 41b582beff420e33a34f3f4fd3e9bd559499b3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b582beff420e33a34f3f4fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:37 2013 +0200 wininet: Support Punycode in IsUrlCacheEntryExpiredW. --- dlls/wininet/urlcache.c | 90 +++++------------------------------------------ 1 files changed, 9 insertions(+), 81 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0d8c9aa..a9d533d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1507,23 +1507,6 @@ static BOOL urlcache_find_hash_entry(const urlcache_header *pHeader, LPCSTR lpsz return FALSE; } -static BOOL urlcache_find_hash_entryW(const urlcache_header *pHeader, LPCWSTR lpszUrl, struct hash_entry **ppHashEntry) -{ - LPSTR urlA; - BOOL ret; - - urlA = heap_strdupWtoA(lpszUrl); - if (!urlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - ret = urlcache_find_hash_entry(pHeader, urlA, ppHashEntry); - heap_free(urlA); - return ret; -} - /*********************************************************************** * urlcache_hash_entry_set_flags (Internal) * @@ -4022,7 +4005,7 @@ static BOOL urlcache_entry_is_expired(const entry_url *pUrlEntry, * dwFlags [I] Unknown * pftLastModified [O] Last modified time */ -BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified ) +BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -4090,72 +4073,17 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas * dwFlags [I] Unknown * pftLastModified [O] Last modified time */ -BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified ) +BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - const entry_header *pEntry; - const entry_url * pUrlEntry; - cache_container *pContainer; - BOOL expired; - - TRACE("(%s, %08x, %p)\n", debugstr_w(url), dwFlags, pftLastModified); - - if (!url || !pftLastModified) - return TRUE; - if (dwFlags) - FIXME("unknown flags 0x%08x\n", dwFlags); - - /* Any error implies that the URL is expired, i.e. not in the cache */ - if (cache_containers_findW(url, &pContainer)) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (cache_container_open_index(pContainer, MIN_BLOCK_NO)) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (!urlcache_find_hash_entryW(pHeader, url, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - TRACE("entry %s not found!\n", debugstr_w(url)); - return TRUE; - } - - if (!urlcache_find_hash_entryW(pHeader, url, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - TRACE("entry %s not found!\n", debugstr_w(url)); - return TRUE; - } - - pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); - return TRUE; - } - - pUrlEntry = (const entry_url *)pEntry; - expired = urlcache_entry_is_expired(pUrlEntry, pftLastModified); + char *encoded_url; + BOOL ret; - cache_container_unlock_index(pContainer, pHeader); + if(!urlcache_encode_url_alloc(url, &encoded_url)) + return FALSE; - return expired; + ret = IsUrlCacheEntryExpiredA(encoded_url, dwFlags, pftLastModified); + heap_free(encoded_url); + return ret; } /***********************************************************************

1 0

Piotr Caban : wininet: Support Punycode in CreateUrlCacheEntryW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: d40867121fee74fd50820463439e48ced6598f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40867121fee74fd508204634… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:17:48 2013 +0200 wininet: Support Punycode in CreateUrlCacheEntryW. --- dlls/wininet/urlcache.c | 326 +++++++++++++++++++++-------------------------- 1 files changed, 145 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d40867121fee74fd50820…

1 0

Piotr Caban : wininet: Support Punycode in CommitUrlCacheEntryW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c0df87ba30a48c91b16786cc956cd526b34d6752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0df87ba30a48c91b16786cc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:18:23 2013 +0200 wininet: Support Punycode in CommitUrlCacheEntryW. --- dlls/wininet/urlcache.c | 522 ++++++++++++++++++----------------------------- 1 files changed, 198 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0df87ba30a48c91b1678…

1 0

Piotr Caban : wininet: Support Punycode in urlcache_copy_entry.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c5346085ae237a595b06f0e588f44aa0f7601dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5346085ae237a595b06f0e58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:18:44 2013 +0200 wininet: Support Punycode in urlcache_copy_entry. --- dlls/wininet/urlcache.c | 236 +++++++++++++++++++++++++++++------------------ 1 files changed, 145 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5346085ae237a595b06f…

1 0

Piotr Caban : wininet: Support Punycode in RetrieveUrlCacheEntryStream.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: a56fbf336e7fde002156dbfae22373e6d4432561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56fbf336e7fde002156dbfae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:18:59 2013 +0200 wininet: Support Punycode in RetrieveUrlCacheEntryStream. --- dlls/wininet/urlcache.c | 128 ++++++++++++++++++++--------------------------- 1 files changed, 55 insertions(+), 73 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index def719f..db52154 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3154,13 +3154,9 @@ BOOL WINAPI ReadUrlCacheEntryStream( * RetrieveUrlCacheEntryStreamA (WININET.@) * */ -HANDLE WINAPI RetrieveUrlCacheEntryStreamA( - IN LPCSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN BOOL fRandomRead, - IN DWORD dwReserved - ) +HANDLE WINAPI RetrieveUrlCacheEntryStreamA(LPCSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, BOOL fRandomRead, DWORD dwReserved) { /* NOTE: this is not the same as the way that the native * version allocates 'stream' handles. I did it this way @@ -3168,103 +3164,89 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( * on this behaviour. (Native version appears to allocate * indices into a table) */ - stream_handle *pStream; - HANDLE hFile; + stream_handle *stream; + HANDLE file; - TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved ); + TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved); - if (!RetrieveUrlCacheEntryFileA(lpszUrlName, - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved)) - { + if(!RetrieveUrlCacheEntryFileA(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, dwReserved)) + return NULL; + + file = CreateFileA(lpCacheEntryInfo->lpszLocalFileName, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + UnlockUrlCacheEntryFileA(lpszUrlName, 0); return NULL; } - hFile = CreateFileA(lpCacheEntryInfo->lpszLocalFileName, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, - NULL); - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; - /* allocate handle storage space */ - pStream = heap_alloc(sizeof(stream_handle) + strlen(lpszUrlName) * sizeof(CHAR)); - if (!pStream) - { - CloseHandle(hFile); + stream = heap_alloc(sizeof(stream_handle) + strlen(lpszUrlName) * sizeof(CHAR)); + if(!stream) { + CloseHandle(file); + UnlockUrlCacheEntryFileA(lpszUrlName, 0); SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return NULL; } - pStream->file = hFile; - strcpy(pStream->url, lpszUrlName); - return pStream; + stream->file = file; + strcpy(stream->url, lpszUrlName); + return stream; } /*********************************************************************** * RetrieveUrlCacheEntryStreamW (WININET.@) * */ -HANDLE WINAPI RetrieveUrlCacheEntryStreamW( - IN LPCWSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN BOOL fRandomRead, - IN DWORD dwReserved - ) +HANDLE WINAPI RetrieveUrlCacheEntryStreamW(LPCWSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, BOOL fRandomRead, DWORD dwReserved) { - DWORD size; - int url_len; + DWORD len; /* NOTE: this is not the same as the way that the native * version allocates 'stream' handles. I did it this way * as it is much easier and no applications should depend * on this behaviour. (Native version appears to allocate * indices into a table) */ - stream_handle *pStream; - HANDLE hFile; + stream_handle *stream; + HANDLE file; - TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved ); + TRACE("(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved); - if (!RetrieveUrlCacheEntryFileW(lpszUrlName, - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved)) - { + if(!(len = urlcache_encode_url(lpszUrlName, NULL, 0))) return NULL; - } - hFile = CreateFileW(lpCacheEntryInfo->lpszLocalFileName, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, - NULL); - if (hFile == INVALID_HANDLE_VALUE) - return FALSE; + if(!RetrieveUrlCacheEntryFileW(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, dwReserved)) + return NULL; + + file = CreateFileW(lpCacheEntryInfo->lpszLocalFileName, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + UnlockUrlCacheEntryFileW(lpszUrlName, 0); + return NULL; + } /* allocate handle storage space */ - size = sizeof(stream_handle); - url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); - size += url_len; - pStream = heap_alloc(size); - if (!pStream) - { - CloseHandle(hFile); + stream = heap_alloc(sizeof(stream_handle) + len*sizeof(WCHAR)); + if(!stream) { + CloseHandle(file); + UnlockUrlCacheEntryFileW(lpszUrlName, 0); SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return NULL; } - pStream->file = hFile; - WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->url, url_len, NULL, NULL); - return pStream; + stream->file = file; + if(!urlcache_encode_url(lpszUrlName, stream->url, len)) { + CloseHandle(file); + UnlockUrlCacheEntryFileW(lpszUrlName, 0); + heap_free(stream); + return NULL; + } + return stream; } /***********************************************************************

1 0

Piotr Caban : wininet: Use InternetCrackUrl in urlcache_entry_create.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 802387f82a85fe85fcfe5c51c55f00f68acc2ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802387f82a85fe85fcfe5c51c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:48:08 2013 +0200 wininet: Use InternetCrackUrl in urlcache_entry_create. --- dlls/wininet/urlcache.c | 120 ++++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 64 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index db52154..ce74577 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2627,57 +2627,56 @@ BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) cache_container *container; urlcache_header *header; char file_name[MAX_PATH]; - const char *url_part, *url_end; - const WCHAR *file_name_ext; - WCHAR *file_name_no_path; WCHAR extW[MAX_PATH]; - int i, len, len_no_ext; BYTE cache_dir; - LONG buffer_size; - BOOL found = FALSE, generate_name = FALSE; + LONG full_path_len; + BOOL generate_name = FALSE; DWORD error; HANDLE file; FILETIME ft; + URL_COMPONENTSA uc; + int i; TRACE("(%s, %s, %p)\n", debugstr_a(url), debugstr_a(ext), full_path); - url_end = url + strlen(url); - - if(((url_end - url) > 1) && (*(url_end - 1) == '/' || *(url_end - 1) == '\\')) - url_end--; - - url_part = memchr(url, '?', url_end - url); - if(!url_part) - url_part = memchr(url, '#', url_end - url); - if(url_part) - url_end = url_part; - - for(url_part = url_end; (url_part >= url); url_part--) { - if((*url_part == '/' || *url_part == '\\') && ((url_end - url_part) > 1)) { - found = TRUE; - url_part++; - break; - } - } - if(!found) - url_part++; + memset(&uc, 0, sizeof(uc)); + uc.dwStructSize = sizeof(uc); + uc.dwUrlPathLength = 1; + uc.dwExtraInfoLength = 1; + if(!InternetCrackUrlA(url, 0, 0, &uc)) + uc.dwUrlPathLength = 0; - if(!lstrcmpA(url_part, "www")) - url_part += 3; + if(!uc.dwUrlPathLength) { + file_name[0] = 0; + }else { + char *p, *e; + + p = e = uc.lpszUrlPath+uc.dwUrlPathLength; + while(p>uc.lpszUrlPath && *(p-1)!='/' && *(p-1)!='\\' && *(p-1)!='.') + p--; + if(p>uc.lpszUrlPath && *(p-1)=='.') { + e = p-1; + while(p>uc.lpszUrlPath && *(p-1)!='/' && *(p-1)!='\\') + p--; + } - len = url_end - url_part; + memcpy(file_name, p, e-p); + file_name[e-p] = 0; - if(found && (len < MAX_PATH-1)) { - memcpy(file_name, url_part, len); - file_name[len] = '\0'; - while(len && file_name[--len] == '/') file_name[len] = '\0'; + for(p=file_name; *p; p++) { + switch(*p) { + case '<': case '>': + case ':': case '"': + case '|': case '?': + case '*': + *p = '_'; break; + default: break; + } + } + } - /* FIXME: get rid of illegal characters like \, / and : */ - TRACE("File name: %s\n", debugstr_a(file_name)); - }else { + if(!file_name[0]) generate_name = TRUE; - file_name[0] = 0; - } error = cache_containers_find(url, &container); if(error != ERROR_SUCCESS) { @@ -2699,50 +2698,43 @@ BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) else cache_dir = CACHE_CONTAINER_NO_SUBDIR; - buffer_size = MAX_PATH * sizeof(WCHAR); - if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &buffer_size)) { + full_path_len = MAX_PATH * sizeof(WCHAR); + if(!urlcache_create_file_pathW(container, header, file_name, cache_dir, full_path, &full_path_len)) { WARN("Failed to get full path for filename %s, needed %u bytes.\n", - debugstr_a(file_name), buffer_size); + debugstr_a(file_name), full_path_len); cache_container_unlock_index(container, header); return FALSE; } + full_path_len = full_path_len/sizeof(WCHAR) - 1; cache_container_unlock_index(container, header); - for(file_name_no_path = full_path + buffer_size / sizeof(WCHAR) - 2; - file_name_no_path >= full_path; --file_name_no_path) { - if (*file_name_no_path == '/' || *file_name_no_path == '\\') - break; - } - - len_no_ext = lstrlenW(file_name_no_path); - file_name_ext = PathFindExtensionW(file_name_no_path); - if(file_name_ext) - len_no_ext -= lstrlenW(file_name_ext); - *extW = '\0'; - if(ext) { + WCHAR *p; + extW[0] = '.'; MultiByteToWideChar(CP_ACP, 0, ext, -1, extW+1, MAX_PATH-1); - } - for(i=0; i<255 && !generate_name; i++) { - static const WCHAR format[] = {'[','%','u',']','%','s',0}; - WCHAR *p; - - wsprintfW(file_name_no_path + len_no_ext, format, i, extW); - for(p=file_name_no_path+1; *p; p++) { + for(p=extW; *p; p++) { switch(*p) { case '<': case '>': case ':': case '"': - case '/': case '\\': case '|': case '?': case '*': *p = '_'; break; default: break; } } - if(p[-1] == ' ' || p[-1] == '.') p[-1] = '_'; + if(p[-1]==' ' || p[-1]=='.') + p[-1] = '_'; + }else { + extW[0] = '\0'; + } + + for(i=0; i<255 && !generate_name; i++) { + static const WCHAR format[] = {'[','%','u',']','%','s',0}; + + wsprintfW(full_path+full_path_len, format, i, extW); TRACE("Trying: %s\n", debugstr_w(full_path)); file = CreateFileW(full_path, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); @@ -2754,7 +2746,7 @@ BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) /* Try to generate random name */ GetSystemTimeAsFileTime(&ft); - strcpyW(file_name_no_path+len_no_ext+8, extW); + strcpyW(full_path+full_path_len+8, extW); for(i=0; i<255; i++) { int j; @@ -2766,7 +2758,7 @@ BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) for(j=0; j<8; j++) { int r = (n % 36); n /= 37; - file_name_no_path[len_no_ext+j] = (r < 10 ? '0' + r : 'A' + r - 10); + full_path[full_path_len+j] = (r < 10 ? '0' + r : 'A' + r - 10); } TRACE("Trying: %s\n", debugstr_w(full_path));

1 0

Piotr Caban : wininet: Added urlcache Unicode functions tests.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: f08246c25f3b4571d02b9636036ea82a0cdf07ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08246c25f3b4571d02b96360… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:48:23 2013 +0200 wininet: Added urlcache Unicode functions tests. --- dlls/wininet/tests/urlcache.c | 156 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index f4e50ce..724da88 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wininet.h" #include "winineti.h" @@ -807,6 +808,160 @@ static void test_urlcacheA(void) } } +static void test_urlcacheW(void) +{ + static struct test_data + { + DWORD err; + WCHAR url[128]; + char encoded_url[128]; + WCHAR extension[32]; + WCHAR header_info[128]; + }urls[] = { + { + 0, {'h','t','t','p',':','/','/','T','.','p','l','/','t',0}, + "http://T.pl/t", {0}, {0} + }, + { + 0, {'w','w','w','.','T','.','p','l','/','t',0}, + "www.T.pl/t", {0}, {0} + }, + { + 0, {'h','t','t','p',':','/','/','w','w','w','.','t','e','s','t',0x15b,0x107, + '.','o','r','g','/','t','e','s','t','.','h','t','m','l',0}, + "http://www.xn--test-ota71c.org/test.html", {'t','x','t',0}, {0} + }, + { + 0, {'w','w','w','.','T','e','s','t',0x15b,0x107,'.','o','r','g', + '/','t','e','s','t','.','h','t','m','l',0}, + "www.Test\xc5\x9b\xc4\x87.org/test.html", {'a',0x106,'a',0}, {'b',0x106,'b',0} + }, + { + 0, {'H','t','t','p','s',':','/','/',0x15b,0x15b,0x107,'/','t',0x107,'/', + 't','e','s','t','?','a','=','%','2','0',0x106,0}, + "Https://xn--4da1oa/t\xc4\x87/test?a=%20\xc4\x86", {'a',0x15b,'a',0}, {'b',0x15b,'b',0} + }, + { + 12005, {'h','t','t','p','s',':','/','/','/','/',0x107,'.','o','r','g','/','t','e','s','t',0}, + "", {0}, {0} + }, + { + 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','h','t','t','p', + ':','/','/','t',0x15b,0x107,'.','o','r','g','/',0}, + "Cookie: user(a)http://t\xc5\x9b\xc4\x87.org/", {0}, {0} + } + }; + static const FILETIME filetime_zero; + + WCHAR bufW[MAX_PATH]; + DWORD i; + BOOL ret; + + if(old_ie) { + win_skip("urlcache unicode functions\n"); + return; + } + + for(i=0; i<sizeof(urls)/sizeof(*urls); i++) { + INTERNET_CACHE_ENTRY_INFOA *entry_infoA; + INTERNET_CACHE_ENTRY_INFOW *entry_infoW; + DWORD size; + + SetLastError(0xdeadbeef); + ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); + if(urls[i].err != 0) { + ok(!ret, "%d) CreateUrlCacheEntryW succeeded\n", i); + ok(urls[i].err == GetLastError(), "%d) GetLastError() = %d\n", i, GetLastError()); + continue; + } + ok(ret, "%d) CreateUrlCacheEntryW failed: %d\n", i, GetLastError()); + + /* dwHeaderSize is ignored, pass 0 to prove it */ + ret = CommitUrlCacheEntryW(urls[i].url, bufW, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY, urls[i].header_info, 0, urls[i].extension, NULL); + ok(ret, "%d) CommitUrlCacheEntryW failed: %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + size = 0; + ret = GetUrlCacheEntryInfoW(urls[i].url, NULL, &size); + ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, + "%d) GetLastError() = %d\n", i, GetLastError()); + entry_infoW = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetUrlCacheEntryInfoW(urls[i].url, entry_infoW, &size); + ok(ret, "%d) GetUrlCacheEntryInfoW failed: %d\n", i, GetLastError()); + + ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); + ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, + "%d) GetLastError() = %d\n", i, GetLastError()); + entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); + ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError()); + + ok(entry_infoW->dwStructSize == entry_infoA->dwStructSize, + "%d) entry_infoW->dwStructSize = %d, expected %d\n", + i, entry_infoW->dwStructSize, entry_infoA->dwStructSize); + ok(!lstrcmpW(urls[i].url, entry_infoW->lpszSourceUrlName), + "%d) entry_infoW->lpszSourceUrlName = %s\n", + i, wine_dbgstr_w(entry_infoW->lpszSourceUrlName)); + ok(!lstrcmpA(urls[i].encoded_url, entry_infoA->lpszSourceUrlName), + "%d) entry_infoA->lpszSourceUrlName = %s\n", + i, entry_infoA->lpszSourceUrlName); + ok(entry_infoW->CacheEntryType == entry_infoA->CacheEntryType, + "%d) entry_infoW->CacheEntryType = %x, expected %x\n", + i, entry_infoW->CacheEntryType, entry_infoA->CacheEntryType); + ok(entry_infoW->dwUseCount == entry_infoA->dwUseCount, + "%d) entry_infoW->dwUseCount = %d, expected %d\n", + i, entry_infoW->dwUseCount, entry_infoA->dwUseCount); + ok(entry_infoW->dwHitRate == entry_infoA->dwHitRate, + "%d) entry_infoW->dwHitRate = %d, expected %d\n", + i, entry_infoW->dwHitRate, entry_infoA->dwHitRate); + ok(entry_infoW->dwSizeLow == entry_infoA->dwSizeLow, + "%d) entry_infoW->dwSizeLow = %d, expected %d\n", + i, entry_infoW->dwSizeLow, entry_infoA->dwSizeLow); + ok(entry_infoW->dwSizeHigh == entry_infoA->dwSizeHigh, + "%d) entry_infoW->dwSizeHigh = %d, expected %d\n", + i, entry_infoW->dwSizeHigh, entry_infoA->dwSizeHigh); + ok(!memcmp(&entry_infoW->LastModifiedTime, &entry_infoA->LastModifiedTime, sizeof(FILETIME)), + "%d) entry_infoW->LastModifiedTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->ExpireTime, &entry_infoA->ExpireTime, sizeof(FILETIME)), + "%d) entry_infoW->ExpireTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->LastAccessTime, &entry_infoA->LastAccessTime, sizeof(FILETIME)), + "%d) entry_infoW->LastAccessTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->LastSyncTime, &entry_infoA->LastSyncTime, sizeof(FILETIME)), + "%d) entry_infoW->LastSyncTime is incorrect\n", i); + + MultiByteToWideChar(CP_ACP, 0, entry_infoA->lpszLocalFileName, -1, bufW, MAX_PATH); + ok(!lstrcmpW(entry_infoW->lpszLocalFileName, bufW), + "%d) entry_infoW->lpszLocalFileName = %s, expected %s\n", + i, wine_dbgstr_w(entry_infoW->lpszLocalFileName), wine_dbgstr_w(bufW)); + + if(!urls[i].header_info[0]) { + ok(!entry_infoW->lpHeaderInfo, "entry_infoW->lpHeaderInfo != NULL\n"); + }else { + ok(!lstrcmpW((WCHAR*)entry_infoW->lpHeaderInfo, urls[i].header_info), + "%d) entry_infoW->lpHeaderInfo = %s\n", + i, wine_dbgstr_w((WCHAR*)entry_infoW->lpHeaderInfo)); + } + + if(!urls[i].extension[0]) { + ok(!entry_infoW->lpszFileExtension, "entry_infoW->lpszFileExtension != NULL\n"); + }else { + MultiByteToWideChar(CP_ACP, 0, entry_infoA->lpszFileExtension, -1, bufW, MAX_PATH); + ok(!lstrcmpW(entry_infoW->lpszFileExtension, bufW), + "%d) entry_infoW->lpszFileExtension = %s, expected %s\n", + i, wine_dbgstr_w(entry_infoW->lpszFileExtension), wine_dbgstr_w(bufW)); + } + + HeapFree(GetProcessHeap(), 0, entry_infoW); + HeapFree(GetProcessHeap(), 0, entry_infoA); + + if(pDeleteUrlCacheEntryA) { + ret = pDeleteUrlCacheEntryA(urls[i].encoded_url); + ok(ret, "%d) DeleteUrlCacheEntryW failed: %d\n", i, GetLastError()); + } + } +} + static void test_FindCloseUrlCache(void) { BOOL r; @@ -874,6 +1029,7 @@ START_TEST(urlcache) pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA(); + test_urlcacheW(); test_FindCloseUrlCache(); test_GetDiskInfoA(); }

1 0

Ludger Sprenker : windowscodecs: Basic tests for tiff encoder options.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 31f8c51b0b3272356c47f621ef2502c09b4970f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8c51b0b3272356c47f621e… Author: Ludger Sprenker <Ludger(a)sprenker.net> Date: Tue Mar 26 18:46:23 2013 +0100 windowscodecs: Basic tests for tiff encoder options. --- dlls/windowscodecs/tests/converter.c | 145 ++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 89d3b49..a551fde 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -367,6 +367,147 @@ static void test_default_converter(void) DeleteTestBitmap(src_obj); } +typedef struct property_opt_test_data +{ + LPCOLESTR name; + VARTYPE var_type; + VARTYPE initial_var_type; + int i_init_val; + float f_init_val; +} property_opt_test_data; + +static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; +static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; + +static const struct property_opt_test_data testdata_tiff_props[] = { + { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, + { wszCompressionQuality, VT_R4, VT_EMPTY }, + { NULL } +}; + +static int find_property_index(const WCHAR* name, PROPBAG2* all_props, int all_prop_cnt) +{ + int i; + for (i=0; i < all_prop_cnt; i++) + { + if (lstrcmpW(name, all_props[i].pstrName) == 0) + return i; + } + return -1; +} + +static void test_specific_encoder_properties(IPropertyBag2 *options, const property_opt_test_data* data, PROPBAG2* all_props, int all_prop_cnt) +{ + HRESULT hr; + int i = 0; + VARIANT pvarValue; + HRESULT phrError = S_OK; + + while (data[i].name) + { + int idx = find_property_index(data[i].name, all_props, all_prop_cnt); + PROPBAG2 pb = {0}; + pb.pstrName = (LPOLESTR)data[i].name; + + hr = IPropertyBag2_Read(options, 1, &pb, NULL, &pvarValue, &phrError); + + ok(idx >= 0, "Property %s not in output of GetPropertyInfo\n", + wine_dbgstr_w(data[i].name)); + if (idx >= 0) + { + ok(all_props[idx].vt == data[i].var_type, "Property %s has unexpected vt type, vt=%i\n", + wine_dbgstr_w(data[i].name), all_props[idx].vt); + ok(all_props[idx].dwType == PROPBAG2_TYPE_DATA, "Property %s has unexpected dw type, vt=%i\n", + wine_dbgstr_w(data[i].name), all_props[idx].dwType); + ok(all_props[idx].cfType == 0, "Property %s has unexpected cf type, vt=%i\n", + wine_dbgstr_w(data[i].name), all_props[idx].cfType); + } + + ok(SUCCEEDED(hr), "Reading property %s from bag failed, hr=%x\n", + wine_dbgstr_w(data[i].name), hr); + + if (SUCCEEDED(hr)) + { + /* On XP the initial type is always VT_EMPTY */ + ok(V_VT(&pvarValue) == data[i].initial_var_type || V_VT(&pvarValue) == VT_EMPTY, + "Property %s has unexpected initial type, V_VT=%i\n", + wine_dbgstr_w(data[i].name), V_VT(&pvarValue)); + + if(V_VT(&pvarValue) == data[i].initial_var_type) + { + switch (data[i].initial_var_type) + { + case VT_BOOL: + case VT_UI1: + ok(V_UNION(&pvarValue, bVal) == data[i].i_init_val, "Property %s has an unexpected initial value, pvarValue=%i\n", + wine_dbgstr_w(data[i].name), V_UNION(&pvarValue, bVal)); + break; + case VT_R4: + ok(V_UNION(&pvarValue, fltVal) == data[i].f_init_val, "Property %s has an unexpected initial value, pvarValue=%f\n", + wine_dbgstr_w(data[i].name), V_UNION(&pvarValue, fltVal)); + break; + default: + break; + } + } + + VariantClear(&pvarValue); + } + + i++; + } +} + +static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *options) +{ + HRESULT hr; + ULONG cProperties = 0; + ULONG cProperties2 = 0; + PROPBAG2 all_props[64] = {{0}}; /* Should be enough for every encoder out there */ + int i; + + /* CountProperties */ + { + hr = IPropertyBag2_CountProperties(options, &cProperties); + ok(SUCCEEDED(hr), "Reading property count, hr=%x\n", hr); + } + + /* GetPropertyInfo */ + { + hr = IPropertyBag2_GetPropertyInfo(options, cProperties, 1, all_props, &cProperties2); + ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "IPropertyBag2::GetPropertyInfo - iProperty out of bounce handled wrong, hr=%x\n", hr); + + hr = IPropertyBag2_GetPropertyInfo(options, 0, cProperties+1, all_props, &cProperties2); + ok(hr == WINCODEC_ERR_VALUEOUTOFRANGE, "IPropertyBag2::GetPropertyInfo - cProperty out of bounce handled wrong, hr=%x\n", hr); + + if (cProperties == 0) /* GetPropertyInfo can be called for zero items on Windows 8 but not on Windows 7 (wine behaves like Win8) */ + { + cProperties2 = cProperties; + hr = S_OK; + } + else + { + hr = IPropertyBag2_GetPropertyInfo(options, 0, min(64, cProperties), all_props, &cProperties2); + ok(SUCCEEDED(hr), "Reading infos from property bag failed, hr=%x\n", hr); + } + + if (FAILED(hr)) + return; + + ok(cProperties == cProperties2, "Missmatch of property count (IPropertyBag2::CountProperties=%i, IPropertyBag2::GetPropertyInfo=%i)\n", + (int)cProperties, (int)cProperties2); + } + + if (clsid_encoder == &CLSID_WICTiffEncoder) + todo_wine test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); + + for (i=0; i < cProperties2; i++) + { + ok(all_props[i].pstrName != NULL, "Unset property name in output of IPropertyBag2::GetPropertyInfo\n"); + CoTaskMemFree(all_props[i].pstrName); + } +} + static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, const struct bitmap_data **dsts, const CLSID *clsid_decoder, const char *name) { @@ -409,6 +550,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { + ok(options != NULL, "Encoder initialization has not created an property bag"); + if(options) + test_encoder_properties(clsid_encoder, options); + hr = IWICBitmapFrameEncode_Initialize(frameencode, options); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr);

1 0