diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c0d11b652df..befb9b77d7d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1834,6 +1834,23 @@ BOOL WINAPI GetUrlCacheEntryInfoA( BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, LPDWORD lpdwCacheEntryInfoBufferSize) +{ + return GetUrlCacheEntryInfoExW(lpszUrl, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** + * GetUrlCacheEntryInfoExW (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoExW( + LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufSize, + LPWSTR lpszReserved, + LPDWORD lpdwReserved, + LPVOID lpReserved, + DWORD dwFlags) { LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; @@ -1842,7 +1859,32 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, URLCACHECONTAINER * pContainer; DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", + debugstr_w(lpszUrl), + lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + lpszReserved, + lpdwReserved, + lpReserved, + dwFlags); + + /* Ignore GET_INSTALLED_ENTRY flag in unicode version of function */ + dwFlags &= ~GET_INSTALLED_ENTRY; + + if ((lpszReserved != NULL) || + (lpdwReserved != NULL) || + (lpReserved != NULL)) + { + ERR("Reserved value was not 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (dwFlags != 0) + { + FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1882,18 +1924,18 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + pUrlEntry, + TRUE /* UNICODE */); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1908,45 +1950,6 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return TRUE; } -/*********************************************************************** - * GetUrlCacheEntryInfoExW (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoExW( - LPCWSTR lpszUrl, - LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - LPDWORD lpdwCacheEntryInfoBufSize, - LPWSTR lpszReserved, - LPDWORD lpdwReserved, - LPVOID lpReserved, - DWORD dwFlags) -{ - TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", - debugstr_w(lpszUrl), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufSize, - lpszReserved, - lpdwReserved, - lpReserved, - dwFlags); - - if ((lpszReserved != NULL) || - (lpdwReserved != NULL) || - (lpReserved != NULL)) - { - ERR("Reserved value was not 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - /*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */