wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

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 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 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 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 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 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 RetrieveUrlCacheEntryFileW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 4345e44dbbe99eac0659b46f7d872eb68602446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4345e44dbbe99eac0659b46f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:15:15 2013 +0200 wininet: Support Punycode in RetrieveUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 207 +++++++++++++---------------------------------- 1 files changed, 57 insertions(+), 150 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 059129e..f5f86c5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2044,204 +2044,111 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return ret; } -/*********************************************************************** - * RetrieveUrlCacheEntryFileA (WININET.@) - * - */ -BOOL WINAPI RetrieveUrlCacheEntryFileA( - IN LPCSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN DWORD dwReserved - ) +static BOOL urlcache_entry_get_file(const char *url, void *entry_info, DWORD *size, BOOL unicode) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; + urlcache_header *header; + struct hash_entry *hash_entry; + entry_url *url_entry; + cache_container *container; DWORD error; - TRACE("(%s, %p, %p, 0x%08x)\n", - debugstr_a(lpszUrlName), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved); + TRACE("(%s, %p, %p, %x)\n", debugstr_a(url), entry_info, size, unicode); - if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || - (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) - { + if(!url || !size || (!entry_info && *size)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - error = cache_containers_find(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { + error = cache_containers_find(url, &container); + if(error != ERROR_SUCCESS) { SetLastError(error); return FALSE; } - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { + error = cache_container_open_index(container, MIN_BLOCK_NO); + if (error != ERROR_SUCCESS) { SetLastError(error); return FALSE; } - if (!(pHeader = cache_container_lock_index(pContainer))) + if (!(header = cache_container_lock_index(container))) return FALSE; - if (!urlcache_find_hash_entry(pHeader, lpszUrlName, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", lpszUrlName); + if (!urlcache_find_hash_entry(header, url, &hash_entry)) { + cache_container_unlock_index(container, header); + TRACE("entry %s not found!\n", url); 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))); + url_entry = (entry_url*)((LPBYTE)header + hash_entry->offset); + if(url_entry->header.signature != URL_SIGNATURE) { + cache_container_unlock_index(container, header); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPSTR)&url_entry->header.signature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - pUrlEntry = (entry_url *)pEntry; - if (!pUrlEntry->local_name_off) - { - cache_container_unlock_index(pContainer, pHeader); + if(!url_entry->local_name_off) { + cache_container_unlock_index(container, header); SetLastError(ERROR_INVALID_DATA); return FALSE; } - TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->url_off)); - TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->header_info_off, - pUrlEntry->header_info_size)); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)url_entry + url_entry->url_off)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)url_entry + url_entry->header_info_off, + url_entry->header_info_size)); - error = urlcache_copy_entry(pContainer, pHeader, lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, pUrlEntry, - FALSE); - if (error != ERROR_SUCCESS) - { - cache_container_unlock_index(pContainer, pHeader); + error = urlcache_copy_entry(container, header, entry_info, + size, url_entry, unicode); + if(error != ERROR_SUCCESS) { + cache_container_unlock_index(container, header); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->local_name_off)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)url_entry + url_entry->local_name_off)); - pUrlEntry->hit_rate++; - pUrlEntry->use_count++; - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_LOCK); - GetSystemTimeAsFileTime(&pUrlEntry->access_time); + url_entry->hit_rate++; + url_entry->use_count++; + urlcache_hash_entry_set_flags(hash_entry, HASHTABLE_LOCK); + GetSystemTimeAsFileTime(&url_entry->access_time); - cache_container_unlock_index(pContainer, pHeader); + cache_container_unlock_index(container, header); return TRUE; } /*********************************************************************** - * RetrieveUrlCacheEntryFileW (WININET.@) + * RetrieveUrlCacheEntryFileA (WININET.@) * */ -BOOL WINAPI RetrieveUrlCacheEntryFileW( - IN LPCWSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN DWORD dwReserved - ) +BOOL WINAPI RetrieveUrlCacheEntryFileA(LPCSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, DWORD dwReserved) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, %p, %p, 0x%08x)\n", - debugstr_w(lpszUrlName), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved); - - if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || - (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) - { - 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; - if (!pUrlEntry->local_name_off) - { - cache_container_unlock_index(pContainer, pHeader); - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return urlcache_entry_get_file(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, FALSE); +} - TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->url_off)); - TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->header_info_off, - pUrlEntry->header_info_size)); +/*********************************************************************** + * RetrieveUrlCacheEntryFileW (WININET.@) + * + */ +BOOL WINAPI RetrieveUrlCacheEntryFileW(LPCWSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, DWORD dwReserved) +{ + char *url; + BOOL ret; - error = urlcache_copy_entry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); - if (error != ERROR_SUCCESS) - { - cache_container_unlock_index(pContainer, pHeader); - SetLastError(error); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->local_name_off)); - pUrlEntry->hit_rate++; - pUrlEntry->use_count++; - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_LOCK); - GetSystemTimeAsFileTime(&pUrlEntry->access_time); - - cache_container_unlock_index(pContainer, pHeader); - - return TRUE; + ret = urlcache_entry_get_file(url, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, TRUE); + heap_free(url); + return ret; } static BOOL urlcache_entry_delete(const cache_container *pContainer,

1 0

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

01 Apr '13

Module: wine Branch: master Commit: f08e79ce9252c929e345ddfce2bd1f54c36b9b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08e79ce9252c929e345ddfce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:56 2013 +0200 wininet: Support Punycode in SetUrlCacheEntryInfoW. --- dlls/wininet/urlcache.c | 103 ++++++++++++++--------------------------------- 1 files changed, 30 insertions(+), 73 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9759f8d..059129e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1351,31 +1351,31 @@ static DWORD urlcache_copy_entry( * urlcache_set_entry_info (Internal) * * Helper for SetUrlCacheEntryInfo{A,W}. Sets fields in URL entry - * according to the flags set by dwFieldControl. + * according to the flags set by field_control. * * RETURNS * ERROR_SUCCESS if the buffer was big enough * ERROR_INSUFFICIENT_BUFFER if the buffer was too small * */ -static DWORD urlcache_set_entry_info(entry_url * pUrlEntry, const INTERNET_CACHE_ENTRY_INFOW * lpCacheEntryInfo, DWORD dwFieldControl) +static DWORD urlcache_set_entry_info(entry_url *url_entry, const INTERNET_CACHE_ENTRY_INFOA *entry_info, DWORD field_control) { - if (dwFieldControl & CACHE_ENTRY_ACCTIME_FC) - pUrlEntry->access_time = lpCacheEntryInfo->LastAccessTime; - if (dwFieldControl & CACHE_ENTRY_ATTRIBUTE_FC) - pUrlEntry->cache_entry_type = lpCacheEntryInfo->CacheEntryType; - if (dwFieldControl & CACHE_ENTRY_EXEMPT_DELTA_FC) - pUrlEntry->exempt_delta = lpCacheEntryInfo->u.dwExemptDelta; - if (dwFieldControl & CACHE_ENTRY_EXPTIME_FC) - file_time_to_dos_date_time(&lpCacheEntryInfo->ExpireTime, &pUrlEntry->expire_date, &pUrlEntry->expire_time); - if (dwFieldControl & CACHE_ENTRY_HEADERINFO_FC) + if (field_control & CACHE_ENTRY_ACCTIME_FC) + url_entry->access_time = entry_info->LastAccessTime; + if (field_control & CACHE_ENTRY_ATTRIBUTE_FC) + url_entry->cache_entry_type = entry_info->CacheEntryType; + if (field_control & CACHE_ENTRY_EXEMPT_DELTA_FC) + url_entry->exempt_delta = entry_info->u.dwExemptDelta; + if (field_control & CACHE_ENTRY_EXPTIME_FC) + file_time_to_dos_date_time(&entry_info->ExpireTime, &url_entry->expire_date, &url_entry->expire_time); + if (field_control & CACHE_ENTRY_HEADERINFO_FC) FIXME("CACHE_ENTRY_HEADERINFO_FC unimplemented\n"); - if (dwFieldControl & CACHE_ENTRY_HITRATE_FC) - pUrlEntry->hit_rate = lpCacheEntryInfo->dwHitRate; - if (dwFieldControl & CACHE_ENTRY_MODTIME_FC) - pUrlEntry->modification_time = lpCacheEntryInfo->LastModifiedTime; - if (dwFieldControl & CACHE_ENTRY_SYNCTIME_FC) - file_time_to_dos_date_time(&lpCacheEntryInfo->LastAccessTime, &pUrlEntry->sync_date, &pUrlEntry->sync_time); + if (field_control & CACHE_ENTRY_HITRATE_FC) + url_entry->hit_rate = entry_info->dwHitRate; + if (field_control & CACHE_ENTRY_MODTIME_FC) + url_entry->modification_time = entry_info->LastModifiedTime; + if (field_control & CACHE_ENTRY_SYNCTIME_FC) + file_time_to_dos_date_time(&entry_info->LastAccessTime, &url_entry->sync_date, &url_entry->sync_time); return ERROR_SUCCESS; } @@ -1973,10 +1973,9 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, /*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */ -BOOL WINAPI SetUrlCacheEntryInfoA( - LPCSTR lpszUrlName, - LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - DWORD dwFieldControl) +BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + DWORD dwFieldControl) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -2020,10 +2019,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( return FALSE; } - urlcache_set_entry_info( - (entry_url *)pEntry, - (const INTERNET_CACHE_ENTRY_INFOW *)lpCacheEntryInfo, - dwFieldControl); + urlcache_set_entry_info((entry_url*)pEntry, lpCacheEntryInfo, dwFieldControl); cache_container_unlock_index(pContainer, pHeader); @@ -2033,58 +2029,19 @@ BOOL WINAPI SetUrlCacheEntryInfoA( /*********************************************************************** * SetUrlCacheEntryInfoW (WININET.@) */ -BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, DWORD dwFieldControl) +BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + DWORD dwFieldControl) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - - error = cache_containers_findW(lpszUrl, &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, lpszUrl, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - WARN("entry %s not found!\n", debugstr_w(lpszUrl)); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } + char *url; + BOOL ret; - 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); + if(!urlcache_encode_url_alloc(lpszUrl, &url)) return FALSE; - } - - urlcache_set_entry_info( - (entry_url *)pEntry, - lpCacheEntryInfo, - dwFieldControl); - - cache_container_unlock_index(pContainer, pHeader); - return TRUE; + ret = SetUrlCacheEntryInfoA(url, (INTERNET_CACHE_ENTRY_INFOA*)lpCacheEntryInfo, dwFieldControl); + heap_free(url); + return ret; } /***********************************************************************

1 0

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

01 Apr '13

Module: wine Branch: master Commit: 940176d8cb270d621989d6876bc2405f5176bb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940176d8cb270d621989d6876… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:32 2013 +0200 wininet: Support Punycode in GetUrlCacheEntryInfoExW. --- dlls/wininet/urlcache.c | 338 ++++++++++++++++++++++------------------------- 1 files changed, 158 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=940176d8cb270d621989d…

1 0

Piotr Caban : cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c3a23a99a2357a6fb007d5d513091ee61e7943e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a23a99a2357a6fb007d5d51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:05 2013 +0200 cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ddfdbce..da66e66 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -957,18 +957,12 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) { SYSTEMTIME st; + FILETIME ft; DWORD len = sizeof(st); - if (HttpQueryInfoW(hHttp, - HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, - &len, NULL)) - { - FILETIME ft; - - SystemTimeToFileTime(&st, &ft); - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, - ft); - } + if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, + &st, &len, NULL) && SystemTimeToFileTime(&st, &ft)) + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft); } InternetCloseHandle(hHttp); }

1 0

← Newer
1
...
50
51
52
53
54
55
56
57
58
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 April 2013